diff options
Diffstat (limited to 'package/busybox')
| -rw-r--r-- | package/busybox/busybox-1.16.1-sed.patch | 47 | ||||
| -rw-r--r-- | package/busybox/initramfs.mk | 141 |
2 files changed, 47 insertions, 141 deletions
diff --git a/package/busybox/busybox-1.16.1-sed.patch b/package/busybox/busybox-1.16.1-sed.patch new file mode 100644 index 000000000..56d2304d2 --- /dev/null +++ b/package/busybox/busybox-1.16.1-sed.patch @@ -0,0 +1,47 @@ +diff -urpN busybox-1.16.1/editors/sed.c busybox-1.16.1-sed/editors/sed.c +--- busybox-1.16.1/editors/sed.c 2010-03-28 13:43:35.000000000 -0400 ++++ busybox-1.16.1-sed/editors/sed.c 2010-04-20 13:33:26.301975462 -0400 +@@ -936,7 +936,15 @@ static void process_files(void) + /* Skip blocks of commands we didn't match */ + if (sed_cmd->cmd == '{') { + if (sed_cmd->invert ? matched : !matched) { +- while (sed_cmd->cmd != '}') { ++ unsigned nest_cnt = 0; ++ while (1) { ++ if (sed_cmd->cmd == '{') ++ nest_cnt++; ++ if (sed_cmd->cmd == '}') { ++ nest_cnt--; ++ if (nest_cnt == 0) ++ break; ++ } + sed_cmd = sed_cmd->next; + if (!sed_cmd) + bb_error_msg_and_die("unterminated {"); +@@ -1031,7 +1039,7 @@ static void process_files(void) + case 'c': + /* Only triggers on last line of a matching range. */ + if (!sed_cmd->in_match) +- sed_puts(sed_cmd->string, NO_EOL_CHAR); ++ sed_puts(sed_cmd->string, '\n'); + goto discard_line; + + /* Read file, append contents to output */ +diff -urpN busybox-1.16.1/testsuite/sed.tests busybox-1.16.1-sed/testsuite/sed.tests +--- busybox-1.16.1/testsuite/sed.tests 2010-03-19 22:58:07.000000000 -0400 ++++ busybox-1.16.1-sed/testsuite/sed.tests 2010-04-20 13:33:26.301975462 -0400 +@@ -248,4 +248,14 @@ testing "sed beginning (^) matches only + ">/usr</>lib<\n" "" \ + "/usr/lib\n" + ++testing "sed c" \ ++ "sed 'crepl'" \ ++ "repl\nrepl\n" "" \ ++ "first\nsecond\n" ++ ++testing "sed nested {}s" \ ++ "sed '/asd/ { p; /s/ { s/s/c/ }; p; q }'" \ ++ "qwe\nasd\nacd\nacd\n" "" \ ++ "qwe\nasd\nzxc\n" ++ + exit $FAILCOUNT diff --git a/package/busybox/initramfs.mk b/package/busybox/initramfs.mk deleted file mode 100644 index 2f1e34cdc..000000000 --- a/package/busybox/initramfs.mk +++ /dev/null @@ -1,141 +0,0 @@ -############################################################# -# -# busybox image for initramfs -# -############################################################# -ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y) - -BUSYBOX_INITRAMFS_DIR:=$(BUSYBOX_DIR)-initramfs -BR2_INITRAMFS_DIR:=$(BUILD_DIR)/initramfs -BB_INITRAMFS_TARGET:=rootfs.initramfs_lst - -$(BUSYBOX_INITRAMFS_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) - rm -rf $(BUILD_DIR)/tmp $(BUSYBOX_INITRAMFS_DIR) - mkdir -p $(BUILD_DIR)/tmp - $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR)/tmp $(TAR_OPTIONS) - -ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y) - mv $(BUILD_DIR)/tmp/busybox $(BUSYBOX_INITRAMFS_DIR) -else - mv $(BUILD_DIR)/tmp/busybox-$(BUSYBOX_VERSION) $(BUSYBOX_INITRAMFS_DIR) -endif - touch $@ - -$(BUSYBOX_INITRAMFS_DIR)/.config $(BUSYBOX_INITRAMFS_DIR)/.configured: $(BUSYBOX_INITRAMFS_DIR)/.unpacked - $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \ - CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_INITRAMFS_DIR) \ - allnoconfig - mv $(BUSYBOX_INITRAMFS_DIR)/.config $(BUSYBOX_INITRAMFS_DIR)/.config.no - (echo CONFIG_PREFIX=\"$(BR2_INITRAMFS_DIR)\"; \ - echo CONFIG_NITPICK=y; \ - echo CONFIG_FEATURE_BUFFERS_USE_MALLOC=y; \ - echo CONFIG_INCLUDE_SUSv2=n; \ - echo CONFIG_CAT=y; \ - echo CONFIG_CHROOT=y; \ - echo CONFIG_DD=y; \ - echo CONFIG_FEATURE_DD_IBS_OBS=y; \ - echo CONFIG_FALSE=y; \ - echo CONFIG_GUNZIP=y; \ - echo CONFIG_HALT=y; \ - echo CONFIG_INIT=y; \ - echo CONFIG_INSMOD=y; \ - echo CONFIG_KILL=y; \ - echo CONFIG_LN=y; \ - echo CONFIG_MDEV=y; \ - echo CONFIG_MKDIR=y; \ - echo CONFIG_MKFIFO=y; \ - echo CONFIG_MKNOD=y; \ - echo CONFIG_MODPROBE=y; \ - echo CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y; \ - echo CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y; \ - echo CONFIG_FEATURE_CHECK_TAINTED_MODULE=n; \ - echo CONFIG_FEATURE_2_4_MODULES=n; \ - echo CONFIG_MOUNT=y; \ - echo CONFIG_MSH=y; \ - echo CONFIG_FEATURE_SH_IS_MSH=y; \ - echo CONFIG_PS=y; \ - echo CONFIG_READLINK=y; \ - echo CONFIG_RMMOD=y; \ - echo CONFIG_STATIC=y; \ - echo CONFIG_SWITCH_ROOT=y; \ - echo CONFIG_SYNC=y; \ - echo CONFIG_TFTP=y; \ - echo CONFIG_FEATURE_TFTP_GET=y; \ - echo CONFIG_FEATURE_TFTP_PUT=y; \ - echo CONFIG_TRUE=y; \ - echo CONFIG_UMOUNT=y; \ - echo CONFIG_FEATURE_UMOUNT_ALL=y; \ - echo CONFIG_UNAME=y; \ - ) > $(BUSYBOX_INITRAMFS_DIR)/.config - cp -f $(BUSYBOX_INITRAMFS_DIR)/.config \ - $(BUSYBOX_INITRAMFS_DIR)/.config.prune - $(SED) 's|\([^=]*\)=.*|/\1[^_]*/d|g' \ - $(BUSYBOX_INITRAMFS_DIR)/.config.prune - $(SED) '' -f $(BUSYBOX_INITRAMFS_DIR)/.config.prune \ - $(BUSYBOX_INITRAMFS_DIR)/.config.no - cat $(BUSYBOX_INITRAMFS_DIR)/.config.no >> \ - $(BUSYBOX_INITRAMFS_DIR)/.config - yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \ - CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_INITRAMFS_DIR) \ - oldconfig - touch $@ - - -$(BUSYBOX_INITRAMFS_DIR)/busybox: $(BUSYBOX_INITRAMFS_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \ - CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \ - ARCH=$(KERNEL_ARCH) \ - EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \ - busybox.links busybox - -$(BR2_INITRAMFS_DIR)/bin/busybox: $(BUSYBOX_INITRAMFS_DIR)/busybox - $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \ - CROSS="$(TARGET_CROSS)" \ - ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \ - install - $(STRIPCMD) $(STRIP_STRIP_ALL) $@ - - -$(BB_INITRAMFS_TARGET): host-fakeroot $(BR2_INITRAMFS_DIR)/bin/busybox - ln -fs bin/busybox $(BUILD_DIR)/initramfs/init - mkdir -p $(BUILD_DIR)/initramfs/etc - cat target/generic/target_busybox_skeleton/etc/inittab > \ - $(BUILD_DIR)/initramfs/etc/inittab - rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) - (echo "chown -R 0:0 $(BUILD_DIR)/initramfs"; \ - echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(BUILD_DIR)/initramfs"; \ - echo "$(SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(BUILD_DIR)/initramfs > $(BB_INITRAMFS_TARGET)"; \ - ) > $(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) - chmod +x $(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- \ - $(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) - rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET)) - touch -c $@ - -$(BUILD_DIR)/.initramfs_done: $(BR2_INITRAMFS_DIR)/bin/busybox \ - $(BB_INITRAMFS_TARGET) - touch $@ - -busybox-initramfs-source: -busybox-initramfs: $(BUILD_DIR)/.initramfs_done - -busybox-initramfs-menuconfig: host-sed $(BUILD_DIR) busybox-source $(BUSYBOX_INITRAMFS_DIR)/.configured - $(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_INITRAMFS_DIR) menuconfig - -busybox-initramfs-clean: - rm -f $(BUSYBOX_INITRAMFS_DIR)/busybox $(BUILD_DIR)/.initramfs_* - rm -rf $(BR2_INITRAMFS_DIR) $(BB_INITRAMFS_TARGET) - -$(MAKE) -C $(BUSYBOX_INITRAMFS_DIR) clean - -busybox-initramfs-dirclean: - rm -rf $(BUSYBOX_INITRAMFS_DIR) $(BR2_INITRAMFS_DIR) \ - $(BUILD_DIR)/.initramfs_* -endif -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y) -TARGETS+=busybox-initramfs -endif |