Skip to content

Commit 941fc5e

Browse files
committed
global: introduce ALL_NONSHARED symbol
Introduce a new symbol ALL_NONSHARED which selects all non-sharable packages by default. This option is mainly intented for buildbot setups to build the target dependant software subset only. Signed-off-by: Jo-Philipp Wich <[email protected]>
1 parent bf4bfd8 commit 941fc5e

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

config/Config-build.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
# Copyright (C) 2006-2013 OpenWrt.org
2+
# Copyright (C) 2016 LEDE Project
23
#
34
# This is free software, licensed under the GNU General Public License v2.
45
# See /LICENSE for more information.
56
#
67

78
menu "Global build settings"
89

10+
config ALL_NONSHARED
11+
bool "Select all target specific packages by default"
12+
default ALL
13+
914
config ALL_KMODS
1015
bool "Select all kernel module packages by default"
1116
default ALL

scripts/diffconfig.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
grep \^CONFIG_TARGET_ .config | head -n3 > tmp/.diffconfig.head
33
grep '^CONFIG_ALL=y' .config >> tmp/.diffconfig.head
44
grep '^CONFIG_ALL_KMODS=y' .config >> tmp/.diffconfig.head
5+
grep '^CONFIG_ALL_NONSHARED=y' .config >> tmp/.diffconfig.head
56
grep '^CONFIG_DEVEL=y' .config >> tmp/.diffconfig.head
67
grep '^CONFIG_TOOLCHAINOPTS=y' .config >> tmp/.diffconfig.head
78
grep '^CONFIG_BUSYBOX_CUSTOM=y' .config >> tmp/.diffconfig.head

scripts/metadata.pl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -558,11 +558,14 @@ ($)
558558
print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." $title\n";
559559
print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n";
560560
unless ($pkg->{hidden}) {
561+
my @def = ("ALL");
562+
if (!exists($pkg->{repository})) {
563+
push @def, "ALL_NONSHARED";
564+
}
561565
if ($pkg->{name} =~ /^kmod-/) {
562-
$pkg->{default} ||= "m if ALL_KMODS";
563-
} else {
564-
$pkg->{default} ||= "m if ALL";
566+
push @def, "ALL_KMODS";
565567
}
568+
$pkg->{default} ||= "m if " . join("||", @def);
566569
}
567570
if ($pkg->{default}) {
568571
foreach my $default (split /\s*,\s*/, $pkg->{default}) {

0 commit comments

Comments
 (0)