[PATCH 2/3] build: add option to mark devices as BROKEN

Adrian Schmutzler freifunk at adrianschmutzler.de
Tue Jul 28 14:47:34 EDT 2020


By specifying "BROKEN := 1" or "BROKEN := y" for a device, it will be
hidden (and deselected) by default. By that, it provides a stronger
option to "disable" a device beyond just using DEFAULT := n.

To make these devices visible, just enable the BROKEN option in
developer settings as already implemented for targets and packages.

Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 config/Config-devel.in     | 2 +-
 include/image.mk           | 2 ++
 scripts/metadata.pm        | 4 ++++
 scripts/target-metadata.pl | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/config/Config-devel.in b/config/Config-devel.in
index 11741c7070..6447a79db2 100644
--- a/config/Config-devel.in
+++ b/config/Config-devel.in
@@ -9,7 +9,7 @@ menuconfig DEVEL
 	default n
 
 	config BROKEN
-		bool "Show broken platforms / packages" if DEVEL
+		bool "Show broken platforms / packages / devices" if DEVEL
 		default n
 
 	config BINARY_FOLDER
diff --git a/include/image.mk b/include/image.mk
index 300f7a6619..be934e94d3 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -426,6 +426,7 @@ define Device/Init
 
   UBOOT_PATH :=  $(STAGING_DIR_IMAGE)/uboot-$(1)
 
+  BROKEN :=
   DEFAULT :=
 endef
 
@@ -638,6 +639,7 @@ Target-Profile-Name: $(DEVICE_DISPLAY)
 Target-Profile-Packages: $(DEVICE_PACKAGES)
 Target-Profile-hasImageMetadata: $(if $(foreach image,$(IMAGES),$(findstring append-metadata,$(IMAGE/$(image)))),1,0)
 Target-Profile-SupportedDevices: $(SUPPORTED_DEVICES)
+$(if $(BROKEN),Target-Profile-Broken: $(BROKEN))
 $(if $(DEFAULT),Target-Profile-Default: $(DEFAULT))
 Target-Profile-Description:
 $(DEVICE_DESCRIPTION)
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index 1826a040a1..f6dce39662 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -158,6 +158,10 @@ sub parse_target_metadata($) {
 		};
 		/^Target-Profile-Packages:\s*(.*)\s*$/ and $profile->{packages} = [ split(/\s+/, $1) ];
 		/^Target-Profile-Description:\s*(.*)\s*/ and $profile->{desc} = get_multiline(*FILE);
+		/^Target-Profile-Broken:\s*(.+)\s*$/ and do {
+			$profile->{broken} = 1;
+			$profile->{default} = "n";
+		};
 		/^Target-Profile-Default:\s*(.+)\s*$/ and $profile->{default} = $1;
 	}
 	close FILE;
diff --git a/scripts/target-metadata.pl b/scripts/target-metadata.pl
index ee0ab5a718..c58f096573 100755
--- a/scripts/target-metadata.pl
+++ b/scripts/target-metadata.pl
@@ -239,6 +239,7 @@ config TARGET_$target->{conf}_$profile->{id}
 	bool "$profile->{name}"
 	depends on TARGET_$target->{conf}
 EOF
+			$profile->{broken} and print "\tdepends on BROKEN\n";
 			my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
 			foreach my $pkg (@pkglist) {
 				print "\tselect DEFAULT_$pkg\n";
@@ -298,6 +299,7 @@ menuconfig TARGET_DEVICE_$target->{conf}_$profile->{id}
 	depends on TARGET_$target->{conf}
 	default $profile->{default}
 EOF
+			$profile->{broken} and print "\tdepends on BROKEN\n";
 			my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
 			foreach my $pkg (@pkglist) {
 				print "\tselect DEFAULT_$pkg if !TARGET_PER_DEVICE_ROOTFS\n";
-- 
2.20.1




More information about the openwrt-devel mailing list