From: Daniel Dickinson <[email protected]> Because opkg rejects package lists that are not signed of use of signed lists is enabled, make the default for signing SDK packages the same as for the base build (that is is base was signed, also sign SDK, only with a new key).
To facilitate this we duplicate the and rename the signing-key package, in addition to keeping the CONFIG_SIGNING_KEY setting. Signed-off-by: Daniel Dickinson <[email protected]> --- package/signing-key/Makefile | 4 ++-- target/sdk/Makefile | 8 ++++++++ target/sdk/convert-config.pl | 1 - 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/package/signing-key/Makefile b/package/signing-key/Makefile index 3108e36..7c711a5 100644 --- a/package/signing-key/Makefile +++ b/package/signing-key/Makefile @@ -37,9 +37,9 @@ define Build/Prepare true endef -NOT_SDK_KEY=$(if $(SDK),,1) +NOT_SDK_OR_IS_SDK_KEY=$(if $(SDK),$(if $(filter Signing-key-sdk,$(PKG_NAME)),1),1) -ifeq ($(NOT_SDK_KEY),1) +ifeq ($(NOT_SDK_OR_IS_SDK_KEY),1) define Build/Configure [ -s $(BUILD_KEY) -a -s $(BUILD_KEY).pub ] || \ $(STAGING_DIR_HOST)/bin/usign -G -s $(BUILD_KEY) -p $(BUILD_KEY).pub -c "Local build key" diff --git a/target/sdk/Makefile b/target/sdk/Makefile index 857a6b7..1d63cf7 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -106,6 +106,14 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean $(TOPDIR)/package/Makefile \ $(SDK_BUILD_DIR)/package/ + rm -rf $(SDK_BUILD_DIR)/package/signing-key-sdk + $(CP) \ + $(TOPDIR)/package/signing-key \ + $(SDK_BUILD_DIR)/package/signing-key-sdk + + $(SED) 's/signing-key/signing-key-sdk/g' $(SDK_BUILD_DIR)/package/signing-key-sdk/Makefile + $(SED) 's/Signing-key-sdk/signing-key-sdk/g' $(SDK_BUILD_DIR)/package/signing-key-sdk/Makefile + -rm -f $(SDK_BUILD_DIR)/feeds.conf.default $(if $(BASE_FEED),echo "$(BASE_FEED)" > $(SDK_BUILD_DIR)/feeds.conf.default) if [ -f $(TOPDIR)/feeds.conf ]; then \ diff --git a/target/sdk/convert-config.pl b/target/sdk/convert-config.pl index e701b42..243de0b 100755 --- a/target/sdk/convert-config.pl +++ b/target/sdk/convert-config.pl @@ -10,7 +10,6 @@ EOF while (<>) { chomp; - next if /^CONFIG_SIGNED_PACKAGES/; next unless /^CONFIG_([^=]+)=(.*)$/; my $var = $1; -- 2.4.3 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
