Skip to content

Commit

Permalink
opkg: drop argument from check_signature in opkg.conf
Browse files Browse the repository at this point in the history
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: beca028 ("build: add integration for managing opkg package feed keys")
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  • Loading branch information
KanjiMonster committed Dec 30, 2018
1 parent a01568f commit d3bf5ff
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions package/system/opkg/Makefile
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk


PKG_NAME:=opkg PKG_NAME:=opkg
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_FLAGS:=essential PKG_FLAGS:=essential


PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
Expand Down Expand Up @@ -89,7 +89,7 @@ define Package/opkg/install
$(INSTALL_BIN) ./files/20_migrate-feeds $(1)/etc/uci-defaults/ $(INSTALL_BIN) ./files/20_migrate-feeds $(1)/etc/uci-defaults/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
ifneq ($(CONFIG_SIGNED_PACKAGES),) ifneq ($(CONFIG_SIGNED_PACKAGES),)
echo "option check_signature 1" >> $(1)/etc/opkg.conf echo "option check_signature" >> $(1)/etc/opkg.conf
endif endif
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) ./files/opkg-key $(1)/usr/sbin/ $(INSTALL_BIN) ./files/opkg-key $(1)/usr/sbin/
Expand Down

0 comments on commit d3bf5ff

Please sign in to comment.