summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2018-09-10 11:42:53 +0200
committerJo-Philipp Wich <jo@mein.io>2019-01-22 13:14:14 +0100
commite789bd2243d029ffd8b2f85c0eac9e65f5716909 (patch)
tree57bc41b222964dc09cad537ba8c135ac0cd17340
parent3603c2321d675b7086d9413a68bcfdf1da3cccb5 (diff)
downloadopenwrt-e789bd2243d029ffd8b2f85c0eac9e65f5716909.tar.gz
openwrt-e789bd2243d029ffd8b2f85c0eac9e65f5716909.tar.bz2
openwrt-e789bd2243d029ffd8b2f85c0eac9e65f5716909.zip
opkg: drop argument from check_signature in opkg.conf
check_signature is a bool option and doesn't take any arguments. The presence of the 1 falsely suggests setting it to 0 disables the check, while the option actually needs to be removed or commented out to be disabled. So remove the argument to make it more clear. Fixes: beca028bd6bb ("build: add integration for managing opkg package feed keys") Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> (cherry picked from commit d3bf5ff9bc7b55b2a3dab93853b33a0cd2c4ca47)
-rw-r--r--package/system/opkg/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile
index f00e574de0..67105675e8 100644
--- a/package/system/opkg/Makefile
+++ b/package/system/opkg/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=opkg
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_FLAGS:=essential
PKG_SOURCE_PROTO:=git
@@ -89,7 +89,7 @@ define Package/opkg/install
$(INSTALL_BIN) ./files/20_migrate-feeds $(1)/etc/uci-defaults/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
ifneq ($(CONFIG_SIGNED_PACKAGES),)
- echo "option check_signature 1" >> $(1)/etc/opkg.conf
+ echo "option check_signature" >> $(1)/etc/opkg.conf
endif
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) ./files/opkg-key $(1)/usr/sbin/