diff options
| author | Luka Perkov <luka.perkov@sartura.hr> | 2016-06-23 13:57:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-23 13:57:21 +0200 |
| commit | 282b917e47d9ae5017e1e426face9b75cb7aabd0 (patch) | |
| tree | 3284ca2d20d9c8d7a4563c6446675c1ecf3feac2 /scripts | |
| parent | 34d432b05312de6d9575c559db8209809489096d (diff) | |
| parent | 441a9c879ba6562ea9f431cf33bbb0c0400d5fd0 (diff) | |
| download | master-187ad058-282b917e47d9ae5017e1e426face9b75cb7aabd0.tar.gz master-187ad058-282b917e47d9ae5017e1e426face9b75cb7aabd0.tar.bz2 master-187ad058-282b917e47d9ae5017e1e426face9b75cb7aabd0.zip | |
Merge pull request #11 from wigyori/master
pull req for 4.4.12, ar71xx/mediatek updates, package upgrades
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/diffconfig.sh | 1 | ||||
| -rwxr-xr-x | scripts/metadata.pl | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/scripts/diffconfig.sh b/scripts/diffconfig.sh index f195d1849b..9972a39132 100755 --- a/scripts/diffconfig.sh +++ b/scripts/diffconfig.sh @@ -2,6 +2,7 @@ grep \^CONFIG_TARGET_ .config | head -n3 > tmp/.diffconfig.head grep '^CONFIG_ALL=y' .config >> tmp/.diffconfig.head grep '^CONFIG_ALL_KMODS=y' .config >> tmp/.diffconfig.head +grep '^CONFIG_ALL_NONSHARED=y' .config >> tmp/.diffconfig.head grep '^CONFIG_DEVEL=y' .config >> tmp/.diffconfig.head grep '^CONFIG_TOOLCHAINOPTS=y' .config >> tmp/.diffconfig.head grep '^CONFIG_BUSYBOX_CUSTOM=y' .config >> tmp/.diffconfig.head diff --git a/scripts/metadata.pl b/scripts/metadata.pl index 96d5ee4208..b17403f51f 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -568,11 +568,14 @@ sub print_package_config_category($) { print "\t\t".($pkg->{tristate} ? 'tristate' : 'bool')." $title\n"; print "\t\tdefault y if DEFAULT_".$pkg->{name}."\n"; unless ($pkg->{hidden}) { + my @def = ("ALL"); + if (!exists($pkg->{repository})) { + push @def, "ALL_NONSHARED"; + } if ($pkg->{name} =~ /^kmod-/) { - $pkg->{default} ||= "m if ALL_KMODS"; - } else { - $pkg->{default} ||= "m if ALL"; + push @def, "ALL_KMODS"; } + $pkg->{default} ||= "m if " . join("||", @def); } if ($pkg->{default}) { foreach my $default (split /\s*,\s*/, $pkg->{default}) { |