From e40115f7efe4ff6a1d2d07a4fd9dde6de290e883 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 30 Oct 2018 00:09:23 +0100 Subject: [PATCH] - rename CA-BUNDLE variables --- make/environment.mk | 4 ++-- make/gstreamer.mk | 2 +- make/system-libs.mk | 2 +- make/system-tools.mk | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/make/environment.mk b/make/environment.mk index 83d23c56..ea77d0b4 100644 --- a/make/environment.mk +++ b/make/environment.mk @@ -161,8 +161,8 @@ TARGET_LIB_DIR = $(TARGET_DIR)/lib TARGET_INCLUDE_DIR = $(TARGET_DIR)/include # ca-certificates -CA_BUNDLE = ca-certificates.crt -CA_BUNDLE_DIR = /etc/ssl/certs +CA-BUNDLE = ca-certificates.crt +CA-BUNDLE_DIR = /etc/ssl/certs # create debug image DEBUG ?= no diff --git a/make/gstreamer.mk b/make/gstreamer.mk index d473a39d..fe3f9269 100644 --- a/make/gstreamer.mk +++ b/make/gstreamer.mk @@ -447,7 +447,7 @@ $(D)/gnutls: $(D)/nettle $(D)/ca-bundle $(ARCHIVE)/$(GNUTLS_SOURCE) --enable-local-libopts \ --with-libpthread-prefix=$(TARGET_DIR) \ --with-included-unistring \ - --with-default-trust-store-dir=$(CA_BUNDLE_DIR)/ \ + --with-default-trust-store-dir=$(CA-BUNDLE_DIR)/ \ --disable-guile \ --disable-doc \ --without-p11-kit \ diff --git a/make/system-libs.mk b/make/system-libs.mk index 27876c6c..2ae96943 100644 --- a/make/system-libs.mk +++ b/make/system-libs.mk @@ -147,7 +147,7 @@ $(D)/libcurl: $(D)/zlib $(D)/openssl $(D)/librtmp $(D)/ca-bundle $(ARCHIVE)/curl --disable-ntlm-wb \ --disable-ares \ --without-libidn \ - --with-ca-bundle=$(CA_BUNDLE_DIR)/$(CA_BUNDLE) \ + --with-ca-bundle=$(CA-BUNDLE_DIR)/$(CA-BUNDLE) \ --with-random=/dev/urandom \ --with-ssl=$(TARGET_DIR) \ --with-librtmp=$(TARGET_DIR)/lib \ diff --git a/make/system-tools.mk b/make/system-tools.mk index 7d42a545..7710de34 100644 --- a/make/system-tools.mk +++ b/make/system-tools.mk @@ -1243,5 +1243,5 @@ $(D)/popt: $(ARCHIVE)/$(POPT_SOURCE) | $(TARGET_DIR) # ----------------------------------------------------------------------------- $(D)/ca-bundle: $(ARCHIVE)/cacert.pem | $(TARGET_DIR) - install -D -m 644 $(ARCHIVE)/cacert.pem $(TARGET_DIR)/$(CA_BUNDLE_DIR)/$(CA_BUNDLE) + install -D -m 644 $(ARCHIVE)/cacert.pem $(TARGET_DIR)/$(CA-BUNDLE_DIR)/$(CA-BUNDLE) $(TOUCH)