Author: nbd Date: 2016-01-03 12:38:31 +0100 (Sun, 03 Jan 2016) New Revision: 48078
Modified: trunk/package/utils/busybox/config/Config.in trunk/package/utils/busybox/config/networking/Config.in trunk/package/utils/busybox/config/util-linux/Config.in trunk/package/utils/busybox/convert_menuconfig.pl Log: busybox: adjust convert_menuconfig.pl to emit relative path references for Config.in files and refresh generated files Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/package/utils/busybox/config/Config.in =================================================================== --- trunk/package/utils/busybox/config/Config.in 2016-01-03 11:36:38 UTC (rev 48077) +++ trunk/package/utils/busybox/config/Config.in 2016-01-03 11:38:31 UTC (rev 48078) @@ -815,29 +815,29 @@ 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 Modified: trunk/package/utils/busybox/config/networking/Config.in =================================================================== --- trunk/package/utils/busybox/config/networking/Config.in 2016-01-03 11:36:38 UTC (rev 48077) +++ trunk/package/utils/busybox/config/networking/Config.in 2016-01-03 11:38:31 UTC (rev 48078) @@ -1111,7 +1111,7 @@ 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" Modified: trunk/package/utils/busybox/config/util-linux/Config.in =================================================================== --- trunk/package/utils/busybox/config/util-linux/Config.in 2016-01-03 11:36:38 UTC (rev 48077) +++ trunk/package/utils/busybox/config/util-linux/Config.in 2016-01-03 11:38:31 UTC (rev 48078) @@ -800,6 +800,6 @@ 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 Modified: trunk/package/utils/busybox/convert_menuconfig.pl =================================================================== --- trunk/package/utils/busybox/convert_menuconfig.pl 2016-01-03 11:36:38 UTC (rev 48077) +++ trunk/package/utils/busybox/convert_menuconfig.pl 2016-01-03 11:38:31 UTC (rev 48078) @@ -41,7 +41,7 @@ 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; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
