Browse Source

- rename CA-BUNDLE variables

master
vanhofen 6 years ago
parent
commit
e40115f7ef
  1. 4
      make/environment.mk
  2. 2
      make/gstreamer.mk
  3. 2
      make/system-libs.mk
  4. 2
      make/system-tools.mk

4
make/environment.mk

@ -161,8 +161,8 @@ TARGET_LIB_DIR = $(TARGET_DIR)/lib
TARGET_INCLUDE_DIR = $(TARGET_DIR)/include TARGET_INCLUDE_DIR = $(TARGET_DIR)/include
# ca-certificates # ca-certificates
CA_BUNDLE = ca-certificates.crt CA-BUNDLE = ca-certificates.crt
CA_BUNDLE_DIR = /etc/ssl/certs CA-BUNDLE_DIR = /etc/ssl/certs
# create debug image # create debug image
DEBUG ?= no DEBUG ?= no

2
make/gstreamer.mk

@ -447,7 +447,7 @@ $(D)/gnutls: $(D)/nettle $(D)/ca-bundle $(ARCHIVE)/$(GNUTLS_SOURCE)
--enable-local-libopts \ --enable-local-libopts \
--with-libpthread-prefix=$(TARGET_DIR) \ --with-libpthread-prefix=$(TARGET_DIR) \
--with-included-unistring \ --with-included-unistring \
--with-default-trust-store-dir=$(CA_BUNDLE_DIR)/ \ --with-default-trust-store-dir=$(CA-BUNDLE_DIR)/ \
--disable-guile \ --disable-guile \
--disable-doc \ --disable-doc \
--without-p11-kit \ --without-p11-kit \

2
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-ntlm-wb \
--disable-ares \ --disable-ares \
--without-libidn \ --without-libidn \
--with-ca-bundle=$(CA_BUNDLE_DIR)/$(CA_BUNDLE) \ --with-ca-bundle=$(CA-BUNDLE_DIR)/$(CA-BUNDLE) \
--with-random=/dev/urandom \ --with-random=/dev/urandom \
--with-ssl=$(TARGET_DIR) \ --with-ssl=$(TARGET_DIR) \
--with-librtmp=$(TARGET_DIR)/lib \ --with-librtmp=$(TARGET_DIR)/lib \

2
make/system-tools.mk

@ -1243,5 +1243,5 @@ $(D)/popt: $(ARCHIVE)/$(POPT_SOURCE) | $(TARGET_DIR)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
$(D)/ca-bundle: $(ARCHIVE)/cacert.pem | $(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) $(TOUCH)

Loading…
Cancel
Save