summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Sapkin2025-12-25 15:16:18 +0000
committerRobert Marko2026-01-02 17:11:03 +0000
commit832d373272623de19eb1f1e0af2844e34b90f7b3 (patch)
tree4cc8774aa1ff08e046f4941e7ff96cf2dcd476cc
parentd1b08c2d82a86f1958137b22fc6ec0991ee9df9c (diff)
downloadopenwrt-832d373272623de19eb1f1e0af2844e34b90f7b3.tar.gz
ca-certificates: provide a virtual package
Switch ca-certs provides to use the new virtual provides semantic that enables ca-bundle and ca-certificates to be installed side-by-side. Provide the new format virtual ca-certificates-any in ca-bundle. Fixes: https://github.com/openwrt/openwrt/issues/21257 Signed-off-by: George Sapkin <george@sapk.in> Link: https://github.com/openwrt/openwrt/pull/21288 (cherry picked from commit d75a6bed7a520c7a556e04b9270b0a3dc41e0d10) Link: https://github.com/openwrt/openwrt/pull/21355 Signed-off-by: Robert Marko <robimarko@gmail.com>
-rw-r--r--package/system/ca-certificates/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/package/system/ca-certificates/Makefile b/package/system/ca-certificates/Makefile
index 4febb647ac..be9a00f367 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:=20250419
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0-or-later MPL-2.0
@@ -24,12 +24,14 @@ include $(INCLUDE_DIR)/package.mk
TAR_OPTIONS+= --strip-components 1
TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
+# ca-certs is deprecated and new packages should use ca-certificates-any if
+# they don't need a specific package
define Package/ca-certificates
SECTION:=base
CATEGORY:=Base system
TITLE:=System CA certificates
PKGARCH:=all
- PROVIDES:=ca-certs
+ PROVIDES:=@ca-certs
endef
define Package/ca-bundle
@@ -37,7 +39,7 @@ define Package/ca-bundle
CATEGORY:=Base system
TITLE:=System CA certificates as a bundle
PKGARCH:=all
- PROVIDES:=ca-certs
+ PROVIDES:=@ca-certs @ca-certificates-any
endef
define Build/Install