aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2019-10-21 16:26:07 +0200
committerJohn Crispin <john@phrozen.org>2019-10-21 16:26:24 +0200
commitf4aaee01faea1998b2403ffe951fe6100fb4e587 (patch)
tree1b01f1928f7ac84054b7560bc93f03cbd25e630c /package/base-files
parent4408723d42e0d717a0643422690686187cc7c2b1 (diff)
downloadupstream-f4aaee01faea1998b2403ffe951fe6100fb4e587.tar.gz
upstream-f4aaee01faea1998b2403ffe951fe6100fb4e587.tar.bz2
upstream-f4aaee01faea1998b2403ffe951fe6100fb4e587.zip
Revert "build: separate signing logic"
This reverts commit 4a45e69d190f72ed94878487b271ed7651dd9efa. This broke the buildbots Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/Makefile17
1 files changed, 8 insertions, 9 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 588c958f80..f105d2cd27 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -37,7 +37,7 @@ endif
define Package/base-files
SECTION:=base
CATEGORY:=Base system
- DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNATURE_CHECK:usign +SIGNATURE_CHECK:openwrt-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool
+ DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:openwrt-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool
TITLE:=Base filesystem for OpenWrt
URL:=http://openwrt.org/
VERSION:=$(PKG_RELEASE)-$(REVISION)
@@ -116,6 +116,12 @@ ifdef CONFIG_SIGNED_PACKAGES
$(STAGING_DIR_HOST)/bin/ucert -I -c $(BUILD_KEY).ucert -p $(BUILD_KEY).pub -s $(BUILD_KEY)
endef
+
+ define Package/base-files/install-key
+ mkdir -p $(1)/etc/opkg/keys
+ $(CP) $(BUILD_KEY).pub $(1)/etc/opkg/keys/`$(STAGING_DIR_HOST)/bin/usign -F -p $(BUILD_KEY).pub`
+
+ endef
endif
ifeq ($(CONFIG_NAND_SUPPORT),)
@@ -124,16 +130,9 @@ ifeq ($(CONFIG_NAND_SUPPORT),)
endef
endif
-ifdef CONFIG_INSTALL_LOCAL_KEY
- define Package/base-files/install-local-key
- mkdir -p $(1)/etc/opkg/keys
- $(CP) $(BUILD_KEY).pub $(1)/etc/opkg/keys/`$(STAGING_DIR_HOST)/bin/usign \
- -F -p $(BUILD_KEY).pub`
-endef
-
define Package/base-files/install
$(CP) ./files/* $(1)/
- $(Package/base-files/install-local-key)
+ $(Package/base-files/install-key)
$(Package/base-files/nand-support)
if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \
$(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \