summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-04-04 16:11:28 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-04-04 16:11:28 +0000
commit0f073b8e20919a8813737cc04caeb55975800c39 (patch)
tree9e9d1f708112b9a82a58b28744e943fd7c366950
parentc3831d028457ff1c106fa9a89e3b07712255d838 (diff)
replace gen_busybox_config.pl with a simple sed command
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6864 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/busybox/Makefile2
-rwxr-xr-xscripts/gen_busybox_config.pl29
2 files changed, 1 insertions, 30 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 90e3af060..03a0ebd54 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -51,7 +51,7 @@ endef
define Build/Configure
rm -f $(PKG_BUILD_DIR)/.configured*
- $(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config
+ grep 'CONFIG_BUSYBOX_' $(TOPDIR)/.config | sed -e "s,\\(# \)\\?CONFIG_BUSYBOX_\\(.*\\),\\1\\2,g" > $(PKG_BUILD_DIR)/.config
yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
diff --git a/scripts/gen_busybox_config.pl b/scripts/gen_busybox_config.pl
deleted file mode 100755
index 9360052d2..000000000
--- a/scripts/gen_busybox_config.pl
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/perl
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-use strict;
-
-my $line;
-my $l1 = '';
-my $l2 = '=y';
-while (<>) {
- chomp;
- /^(# )CONFIG_LARGEFILE(.+)$/ and do {
- $l1 = $1;
- $l2 = $2;
- };
- /^(# )?CONFIG_BUSYBOX_(.+)/ and do {
- my $p1 = $1;
- my $p2 = $2;
- $p2 =~ /(CONFIG_LFS|FDISK_SUPPORT_LARGE_DISKS)/ and do {
- $p1 = $l1;
- $p2 = "$1$l2";
- };
- print "$p1$p2\n";
- }
-}