Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: add option to mark devices as BROKEN

Browse Source 
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@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2020-07-28 20:47:34 +02:00
parent 504000d520
commit 1d5260cf72
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/Config-devel.in
View File

@ -9,7 +9,7 @@ menuconfig DEVEL
default n default n
config BROKEN config BROKEN
bool "Show broken platforms / packages" if DEVEL bool "Show broken platforms / packages / devices" if DEVEL
default n default n
config BINARY_FOLDER config BINARY_FOLDER

2
include/image.mk
View File

@ -426,6 +426,7 @@ define Device/Init
UBOOT_PATH := $(STAGING_DIR_IMAGE)/uboot-$(1) UBOOT_PATH := $(STAGING_DIR_IMAGE)/uboot-$(1)
BROKEN :=
DEFAULT := DEFAULT :=
endef endef
@ -638,6 +639,7 @@ Target-Profile-Name: $(DEVICE_DISPLAY)
Target-Profile-Packages: $(DEVICE_PACKAGES) Target-Profile-Packages: $(DEVICE_PACKAGES)
Target-Profile-hasImageMetadata: $(if $(foreach image,$(IMAGES),$(findstring append-metadata,$(IMAGE/$(image)))),1,0) Target-Profile-hasImageMetadata: $(if $(foreach image,$(IMAGES),$(findstring append-metadata,$(IMAGE/$(image)))),1,0)
Target-Profile-SupportedDevices: $(SUPPORTED_DEVICES) Target-Profile-SupportedDevices: $(SUPPORTED_DEVICES)
$(if $(BROKEN),Target-Profile-Broken: $(BROKEN))
$(if $(DEFAULT),Target-Profile-Default: $(DEFAULT)) $(if $(DEFAULT),Target-Profile-Default: $(DEFAULT))
Target-Profile-Description: Target-Profile-Description:
$(DEVICE_DESCRIPTION) $(DEVICE_DESCRIPTION)

4
scripts/metadata.pm
View File

@ -158,6 +158,10 @@ sub parse_target_metadata($) {
}; };
/^Target-Profile-Packages:\s*(.*)\s*$/ and $profile->{packages} = [ split(/\s+/, $1) ]; /^Target-Profile-Packages:\s*(.*)\s*$/ and $profile->{packages} = [ split(/\s+/, $1) ];
/^Target-Profile-Description:\s*(.*)\s*/ and $profile->{desc} = get_multiline(*FILE); /^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; /^Target-Profile-Default:\s*(.+)\s*$/ and $profile->{default} = $1;
} }
close FILE; close FILE;

2
scripts/target-metadata.pl
View File

@ -239,6 +239,7 @@ config TARGET_$target->{conf}_$profile->{id}
bool "$profile->{name}" bool "$profile->{name}"
depends on TARGET_$target->{conf} depends on TARGET_$target->{conf}
EOF EOF
$profile->{broken} and print "\tdepends on BROKEN\n";
my @pkglist = merge_package_lists($target->{packages}, $profile->{packages}); my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
foreach my $pkg (@pkglist) { foreach my $pkg (@pkglist) {
print "\tselect DEFAULT_$pkg\n"; print "\tselect DEFAULT_$pkg\n";
@ -298,6 +299,7 @@ menuconfig TARGET_DEVICE_$target->{conf}_$profile->{id}
depends on TARGET_$target->{conf} depends on TARGET_$target->{conf}
default $profile->{default} default $profile->{default}
EOF EOF
$profile->{broken} and print "\tdepends on BROKEN\n";
my @pkglist = merge_package_lists($target->{packages}, $profile->{packages}); my @pkglist = merge_package_lists($target->{packages}, $profile->{packages});
foreach my $pkg (@pkglist) { foreach my $pkg (@pkglist) {
print "\tselect DEFAULT_$pkg if !TARGET_PER_DEVICE_ROOTFS\n"; print "\tselect DEFAULT_$pkg if !TARGET_PER_DEVICE_ROOTFS\n";