From c20663efdd830511553d4d34a2d4ffc263e5341d Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Tue, 24 Oct 2017 12:12:16 +0200
Subject: [PATCH] - simplify ca-bundle target

---
 make/archives.mk     | 6 ++----
 make/environment.mk  | 5 ++---
 make/system-tools.mk | 5 ++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/make/archives.mk b/make/archives.mk
index af73e39e..592e9c86 100644
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -376,7 +376,5 @@ MTOOLS_VER=4.0.18
 $(ARCHIVE)/mtools-$(MTOOLS_VER).tar.gz:
 	$(WGET) ftp://ftp.gnu.org/gnu/mtools/mtools-$(MTOOLS_VER).tar.gz
 
-$(ARCHIVE)/curl-ca-bundle.crt:
-	cd $(ARCHIVE); \
-		wget https://curl.haxx.se/ca/cacert.pem; \
-		mv cacert.pem $(CA_BUNDLE)
+$(ARCHIVE)/cacert.pem:
+	$(WGET) https://curl.haxx.se/ca/cacert.pem
diff --git a/make/environment.mk b/make/environment.mk
index 530faeae..828bb3f2 100644
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -162,9 +162,8 @@ CCACHE_DIR    = $(HOME)/.ccache-ni-buildsystem-$(BOXARCH)-$(BOXSERIES)
 export CCACHE_DIR
 
 # certificates
-CA_BUNDLE		= ca-certificates.crt
-CA_BUNDLE_DIR		= /etc/ssl/certs
-CA_BUNDLE_TARGET_DIR	= $(TARGETPREFIX)$(CA_BUNDLE_DIR)
+CA_BUNDLE	= ca-certificates.crt
+CA_BUNDLE_DIR	= /etc/ssl/certs
 
 # create debug image
 DEBUG ?= no
diff --git a/make/system-tools.mk b/make/system-tools.mk
index 36c9aa7a..a2fc0e39 100644
--- a/make/system-tools.mk
+++ b/make/system-tools.mk
@@ -1002,7 +1002,6 @@ $(D)/aio-grab: $(D)/zlib $(D)/libpng $(D)/libjpeg | $(TARGETPREFIX)
 	$(REMOVE)/aio-grab
 	touch $@
 
-$(D)/ca-bundle: $(ARCHIVE)/curl-ca-bundle.crt | $(TARGETPREFIX)
-	mkdir -p $(CA_BUNDLE_TARGET_DIR) && \
-	cp -a $(ARCHIVE)/$(CA_BUNDLE) $(CA_BUNDLE_TARGET_DIR)
+$(D)/ca-bundle: $(ARCHIVE)/cacert.pem | $(TARGETPREFIX)
+	install -D -m 644 $(ARCHIVE)/cacert.pem $(TARGETPREFIX)/$(CA_BUNDLE_DIR)/$(CA_BUNDLE)
 	touch $@