aboutsummaryrefslogtreecommitdiffstats
path: root/package/system
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-06-16 10:51:38 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-06-16 10:51:38 +0000
commitba8670db3dddf444cc1bb0e3ce61526022ff6f13 (patch)
tree5dc8ff2ebf4e3c2ac1af2b189aede18923a54a5d /package/system
parenta0b734b45dfd7dc4ce9d75e67e1947a2511fff69 (diff)
downloadupstream-ba8670db3dddf444cc1bb0e3ce61526022ff6f13.tar.gz
upstream-ba8670db3dddf444cc1bb0e3ce61526022ff6f13.tar.bz2
upstream-ba8670db3dddf444cc1bb0e3ce61526022ff6f13.zip
opkg: fix duplicate check_signature line for smime variant (#19863)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Backport of r45999 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46000 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/system')
-rw-r--r--package/system/opkg/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile
index d313c442dd..d38ed52314 100644
--- a/package/system/opkg/Makefile
+++ b/package/system/opkg/Makefile
@@ -112,9 +112,6 @@ define Package/opkg/Default/install
$(INSTALL_DIR) $(1)/bin
$(INSTALL_DIR) $(1)/etc
$(INSTALL_DATA) ./files/opkg$(2).conf $(1)/etc/opkg.conf
- ifneq ($(CONFIG_SIGNED_PACKAGES),)
- echo "option check_signature 1" >> $(1)/etc/opkg.conf
- endif
$(call FeedSourcesAppend,$(1)/etc/opkg.conf)
$(VERSION_SED) $(1)/etc/opkg.conf
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
@@ -122,6 +119,9 @@ endef
define Package/opkg/install
$(call Package/opkg/Default/install,$(1),)
+ ifneq ($(CONFIG_SIGNED_PACKAGES),)
+ echo "option check_signature 1" >> $(1)/etc/opkg.conf
+ endif
mkdir $(1)/usr/sbin
$(INSTALL_BIN) ./files/opkg-key $(1)/usr/sbin/
endef