aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxim Storchak <m.storchak@gmail.com>2019-12-25 17:46:27 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-01-05 20:05:33 +0100
commitabb0665bec43315c0bda58556024cc531d4ec7bb (patch)
treeda31f764595a17727821f9de3963193790354164
parente9929ebeeaef5f59d56b93ebe96c9fc0bd363521 (diff)
downloadupstream-abb0665bec43315c0bda58556024cc531d4ec7bb.tar.gz
upstream-abb0665bec43315c0bda58556024cc531d4ec7bb.tar.bz2
upstream-abb0665bec43315c0bda58556024cc531d4ec7bb.zip
ca-certificates: provide ca-certs by both ca-certificates and ca-bundle
- both packages provide ca-certs - make ca-bundle the default provider This should allow easy transition between these two forms of CA certificates storage Signed-off-by: Maxim Storchak <m.storchak@gmail.com> (cherry picked from commit dd299805ad18472a8245b4524a25e4381e166057)
-rw-r--r--package/system/ca-certificates/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/package/system/ca-certificates/Makefile b/package/system/ca-certificates/Makefile
index f449645c77..ea7d253fa2 100644
--- a/package/system/ca-certificates/Makefile
+++ b/package/system/ca-certificates/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ca-certificates
PKG_VERSION:=20190110
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_MAINTAINER:=
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz
@@ -24,6 +24,7 @@ define Package/ca-certificates
CATEGORY:=Base system
TITLE:=System CA certificates
PKGARCH:=all
+ PROVIDES:=ca-certs
endef
define Package/ca-bundle
@@ -31,6 +32,7 @@ define Package/ca-bundle
CATEGORY:=Base system
TITLE:=System CA certificates as a bundle
PKGARCH:=all
+ PROVIDES:=ca-certs
endef
define Build/Install
@@ -59,5 +61,5 @@ define Package/ca-bundle/install
cat $(PKG_INSTALL_DIR)/usr/share/ca-certificates/*/*.crt >$(1)/etc/ssl/certs/ca-certificates.crt
$(LN) /etc/ssl/certs/ca-certificates.crt $(1)/etc/ssl/cert.pem
endef
-$(eval $(call BuildPackage,ca-certificates))
$(eval $(call BuildPackage,ca-bundle))
+$(eval $(call BuildPackage,ca-certificates))