KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

busybox: adjust convert_menuconfig.pl to emit relative path references for Config.in files and refresh generated files

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48078
This commit is contained in:
Felix Fietkau 2016-01-03 11:38:31 +00:00
parent 182dd0db16
commit 23953244a8
4 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
package/utils/busybox/config/Config.in
View file

@ -815,29 +815,29 @@ config BUSYBOX_CONFIG_PREFIX
endmenu endmenu
source package/utils/busybox/config/libbb/Config.in source libbb/Config.in
endmenu endmenu
comment "Applets" comment "Applets"
source package/utils/busybox/config/archival/Config.in source archival/Config.in
source package/utils/busybox/config/coreutils/Config.in source coreutils/Config.in
source package/utils/busybox/config/console-tools/Config.in source console-tools/Config.in
source package/utils/busybox/config/debianutils/Config.in source debianutils/Config.in
source package/utils/busybox/config/editors/Config.in source editors/Config.in
source package/utils/busybox/config/findutils/Config.in source findutils/Config.in
source package/utils/busybox/config/init/Config.in source init/Config.in
source package/utils/busybox/config/loginutils/Config.in source loginutils/Config.in
source package/utils/busybox/config/e2fsprogs/Config.in source e2fsprogs/Config.in
source package/utils/busybox/config/modutils/Config.in source modutils/Config.in
source package/utils/busybox/config/util-linux/Config.in source util-linux/Config.in
source package/utils/busybox/config/miscutils/Config.in source miscutils/Config.in
source package/utils/busybox/config/networking/Config.in source networking/Config.in
source package/utils/busybox/config/printutils/Config.in source printutils/Config.in
source package/utils/busybox/config/mailutils/Config.in source mailutils/Config.in
source package/utils/busybox/config/procps/Config.in source procps/Config.in
source package/utils/busybox/config/runit/Config.in source runit/Config.in
source package/utils/busybox/config/selinux/Config.in source selinux/Config.in
source package/utils/busybox/config/shell/Config.in source shell/Config.in
source package/utils/busybox/config/sysklogd/Config.in source sysklogd/Config.in

2
package/utils/busybox/config/networking/Config.in
View file

@ -1111,7 +1111,7 @@ config BUSYBOX_CONFIG_FEATURE_TUNCTL_UG
Allow to specify owner and group of newly created interface. Allow to specify owner and group of newly created interface.
340 bytes of pure bloat. Say no here. 340 bytes of pure bloat. Say no here.
source package/utils/busybox/config/networking/udhcp/Config.in source udhcp/Config.in
config BUSYBOX_CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS config BUSYBOX_CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS
string "ifup udhcpc command line options" string "ifup udhcpc command line options"

2
package/utils/busybox/config/util-linux/Config.in
View file

@ -800,6 +800,6 @@ config BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT
About the only reason to use this is if you've removed /proc from About the only reason to use this is if you've removed /proc from
your kernel. your kernel.
source package/utils/busybox/config/util-linux/volume_id/Config.in source volume_id/Config.in
endmenu endmenu

2
package/utils/busybox/convert_menuconfig.pl
View file

@ -41,7 +41,7 @@ while (<FIND>) {
undef $cur; undef $cur;
undef $default_set; undef $default_set;
} }
$line =~ s/^(\s*source\s+)/$1package\/utils\/busybox\/config\//; $line =~ s/^(\s*source\s+)([^\/]+\/)*([^\/]+\/[^\/]+)$/$1$3/;
if ($line =~ /^(\s*range\s*)(\w+)(\s+)(\w+)\s*$/) { if ($line =~ /^(\s*range\s*)(\w+)(\s+)(\w+)\s*$/) {
my $prefix = $1; my $prefix = $1;
my $r1 = $2; my $r1 = $2;