From: Felix Fietkau Date: Tue, 16 Jun 2015 10:51:16 +0000 (+0000) Subject: opkg: fix duplicate check_signature line for smime variant (#19863) X-Git-Tag: reboot~2766 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=278add2ab11065677cc56d72c64904abb594a81d;p=oweals%2Fopenwrt.git opkg: fix duplicate check_signature line for smime variant (#19863) Signed-off-by: Felix Fietkau SVN-Revision: 45999 --- 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