From: Paul Spooren <mail@aparcar.org>
Date: Thu, 3 Feb 2022 23:15:43 +0000 (+0100)
Subject: build: drop SIGNATURE_CHECK and SIGNED_PACKAGES
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c696695652b56e8c3a89248a0de1d347268bc8cb;p=openwrt%2Fstaging%2Faparcar.git

build: drop SIGNATURE_CHECK and SIGNED_PACKAGES

Always sign packages, security by default

Signed-off-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/config/Config-build.in b/config/Config-build.in
index 7c808bcbdb..71e66661b3 100644
--- a/config/Config-build.in
+++ b/config/Config-build.in
@@ -50,13 +50,6 @@ menu "Global build settings"
 		  - Enabling per-device rootfs support
 		  ...
 
-	config SIGNED_PACKAGES
-		bool "Cryptographically signed package lists"
-		default y
-
-	config SIGNATURE_CHECK
-		bool "Enable signature checking in opkg"
-		default SIGNED_PACKAGES
 
 	comment "General build options"
 
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index bef464fcb9..0017f6a218 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -39,7 +39,7 @@ endif
 define Package/base-files
   SECTION:=base
   CATEGORY:=Base system
-  DEPENDS:=+netifd +libc +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:openwrt-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool
+  DEPENDS:=+netifd +libc +jsonfilter usign openwrt-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool
   TITLE:=Base filesystem for OpenWrt
   URL:=http://openwrt.org/
   VERSION:=$(PKG_RELEASE)-$(REVISION)
diff --git a/target/sdk/convert-config.pl b/target/sdk/convert-config.pl
index 08189df95c..24f0ac47a9 100755
--- a/target/sdk/convert-config.pl
+++ b/target/sdk/convert-config.pl
@@ -7,7 +7,6 @@ while (<>) {
 	my $val;
 	my $type;
 	chomp;
-	next if /^CONFIG_SIGNED_PACKAGES/;
 
 	if (/^CONFIG_((BINARY)|(DOWNLOAD))_FOLDER=(.*)$/) {
 		# We don't want to preserve the build setting of
diff --git a/target/sdk/files/Config.in b/target/sdk/files/Config.in
index aab6352118..4ab8af79ba 100644
--- a/target/sdk/files/Config.in
+++ b/target/sdk/files/Config.in
@@ -14,10 +14,6 @@ menu "Global build settings"
 		bool "Select all userspace packages by default"
 		default y
 
-	config SIGNED_PACKAGES
-		bool "Cryptographically sign package lists"
-		default y
-
 	comment "Package build options"
 
 	config DEBUG