ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-04 04:54:18 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

ca-certificates: provide ca-certs by both ca-certificates and ca-bundle

Browse Source 
- 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 dd299805ad)
This commit is contained in:
Maxim Storchak 2019-12-25 17:46:27 +02:00 committed by Hauke Mehrtens
parent e9929ebeea
commit abb0665bec
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/system/ca-certificates/Makefile
View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ca-certificates PKG_NAME:=ca-certificates
PKG_VERSION:=20190110 PKG_VERSION:=20190110
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MAINTAINER:= PKG_MAINTAINER:=
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz
@ -24,6 +24,7 @@ define Package/ca-certificates
CATEGORY:=Base system CATEGORY:=Base system
TITLE:=System CA certificates TITLE:=System CA certificates
PKGARCH:=all PKGARCH:=all
PROVIDES:=ca-certs
endef endef
define Package/ca-bundle define Package/ca-bundle
@ -31,6 +32,7 @@ define Package/ca-bundle
CATEGORY:=Base system CATEGORY:=Base system
TITLE:=System CA certificates as a bundle TITLE:=System CA certificates as a bundle
PKGARCH:=all PKGARCH:=all
PROVIDES:=ca-certs
endef endef
define Build/Install 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 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 $(LN) /etc/ssl/certs/ca-certificates.crt $(1)/etc/ssl/cert.pem
endef endef
$(eval $(call BuildPackage,ca-certificates))
$(eval $(call BuildPackage,ca-bundle)) $(eval $(call BuildPackage,ca-bundle))
$(eval $(call BuildPackage,ca-certificates))