busybox: adjust convert_menuconfig.pl to emit relative path references for Config...

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 48078

diff --git a/package/utils/busybox/config/Config.in b/package/utils/busybox/config/Config.in
index 6a205f6c0c9dd453d255cd6176d2d19c5e4d214a..113eb62067c73496fc5e6fa4a2ebabcf07dea597 100644 (file)
--- a/package/utils/busybox/config/Config.in
+++ b/package/utils/busybox/config/Config.in
@@ -815,29 +815,29 @@ config BUSYBOX_CONFIG_PREFIX
 
 endmenu
 
-source package/utils/busybox/config/libbb/Config.in
+source libbb/Config.in
 
 endmenu
 
 comment "Applets"
 
-source package/utils/busybox/config/archival/Config.in
-source package/utils/busybox/config/coreutils/Config.in
-source package/utils/busybox/config/console-tools/Config.in
-source package/utils/busybox/config/debianutils/Config.in
-source package/utils/busybox/config/editors/Config.in
-source package/utils/busybox/config/findutils/Config.in
-source package/utils/busybox/config/init/Config.in
-source package/utils/busybox/config/loginutils/Config.in
-source package/utils/busybox/config/e2fsprogs/Config.in
-source package/utils/busybox/config/modutils/Config.in
-source package/utils/busybox/config/util-linux/Config.in
-source package/utils/busybox/config/miscutils/Config.in
-source package/utils/busybox/config/networking/Config.in
-source package/utils/busybox/config/printutils/Config.in
-source package/utils/busybox/config/mailutils/Config.in
-source package/utils/busybox/config/procps/Config.in
-source package/utils/busybox/config/runit/Config.in
-source package/utils/busybox/config/selinux/Config.in
-source package/utils/busybox/config/shell/Config.in
-source package/utils/busybox/config/sysklogd/Config.in
+source archival/Config.in
+source coreutils/Config.in
+source console-tools/Config.in
+source debianutils/Config.in
+source editors/Config.in
+source findutils/Config.in
+source init/Config.in
+source loginutils/Config.in
+source e2fsprogs/Config.in
+source modutils/Config.in
+source util-linux/Config.in
+source miscutils/Config.in
+source networking/Config.in
+source printutils/Config.in
+source mailutils/Config.in
+source procps/Config.in
+source runit/Config.in
+source selinux/Config.in
+source shell/Config.in
+source sysklogd/Config.in

diff --git a/package/utils/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in
index 40b3c68975c41b5d343411f71b821201417b51cd..7e5a414a68bbf558c401f5ba1f27731a33efa929 100644 (file)
--- a/package/utils/busybox/config/networking/Config.in
+++ b/package/utils/busybox/config/networking/Config.in
@@ -1111,7 +1111,7 @@ config BUSYBOX_CONFIG_FEATURE_TUNCTL_UG
          Allow to specify owner and group of newly created interface.
          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
        string "ifup udhcpc command line options"

diff --git a/package/utils/busybox/config/util-linux/Config.in b/package/utils/busybox/config/util-linux/Config.in
index 8c87f53ed24052f7bc8257e4171b2ab8ddbbcb6f..017b1196a010107f8de230d2b3627f66bfcf809e 100644 (file)
--- a/package/utils/busybox/config/util-linux/Config.in
+++ b/package/utils/busybox/config/util-linux/Config.in
@@ -800,6 +800,6 @@ config BUSYBOX_CONFIG_FEATURE_MTAB_SUPPORT
          About the only reason to use this is if you've removed /proc from
          your kernel.
 
-source package/utils/busybox/config/util-linux/volume_id/Config.in
+source volume_id/Config.in
 
 endmenu

diff --git a/package/utils/busybox/convert_menuconfig.pl b/package/utils/busybox/convert_menuconfig.pl
index 7342fbd8a1bd7385694277bb24036f4a2cdd2de8..70518809aaed22a9fc707a3069ad1cd86e0d4edd 100755 (executable)
--- a/package/utils/busybox/convert_menuconfig.pl
+++ b/package/utils/busybox/convert_menuconfig.pl
@@ -41,7 +41,7 @@ while (<FIND>) {
                        undef $cur;
                        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*$/) {
                        my $prefix = $1;
                        my $r1 = $2;