diff options
Diffstat (limited to 'package/busybox')
-rw-r--r-- | package/busybox/Config.in | 6 | ||||
-rw-r--r-- | package/busybox/busybox-1.17.0/busybox-1.17.0-dos2unix.patch | 12 | ||||
-rw-r--r-- | package/busybox/busybox.mk | 8 |
3 files changed, 12 insertions, 14 deletions
diff --git a/package/busybox/Config.in b/package/busybox/Config.in index a513380b6..001640651 100644 --- a/package/busybox/Config.in +++ b/package/busybox/Config.in @@ -79,12 +79,6 @@ config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS Show packages in menuconfig that are potentially also provided by busybox. -config BR2_PACKAGE_BUSYBOX_SKELETON - bool "use minimal target skeleton" - help - Use a minimal target skeleton. Make sure to select mdev - which is used to populate /dev/. - endif if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else diff --git a/package/busybox/busybox-1.17.0/busybox-1.17.0-dos2unix.patch b/package/busybox/busybox-1.17.0/busybox-1.17.0-dos2unix.patch new file mode 100644 index 000000000..dde59e046 --- /dev/null +++ b/package/busybox/busybox-1.17.0/busybox-1.17.0-dos2unix.patch @@ -0,0 +1,12 @@ +diff -urpN busybox-1.17.0/coreutils/dos2unix.c busybox-1.17.0-dos2unix/coreutils/dos2unix.c +--- busybox-1.17.0/coreutils/dos2unix.c 2010-06-24 04:40:43.000000000 +0200 ++++ busybox-1.17.0-dos2unix/coreutils/dos2unix.c 2010-07-17 22:40:21.021422169 +0200 +@@ -92,7 +92,7 @@ int dos2unix_main(int argc UNUSED_PARAM, + do { + /* might be convert(NULL) if there is no filename given */ + convert(*argv, conv_type); +- } while (*++argv); ++ } while (*argv && *++argv); + + return 0; + } diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 78bf21a40..d7b86cbd2 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -85,13 +85,6 @@ define BUSYBOX_PREFER_STATIC endef endif -# Enable mdev for busybox skeleton -ifeq ($(BR2_PACKAGE_BUSYBOX_SKELETON),y) -define BUSYBOX_SKELETON - $(call KCONFIG_ENABLE_OPT,CONFIG_MDEV,$(BUSYBOX_BUILD_CONFIG)) -endef -endif - # Disable usage of inetd if netkit-base package is selected ifeq ($(BR2_PACKAGE_NETKITBASE),y) define BUSYBOX_NETKITBASE @@ -120,7 +113,6 @@ define BUSYBOX_CONFIGURE_CMDS $(BUSYBOX_SET_IPV6) $(BUSYBOX_SET_RPC) $(BUSYBOX_PREFER_STATIC) - $(BUSYBOX_SKELETON) $(BUSYBOX_NETKITBASE) $(BUSYBOX_NETKITTELNET) @yes "" | $(MAKE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE="$(TARGET_CROSS)" \ |