فهرست منبع

- add busybox-1.4.2

Bernhard Reutner-Fischer 18 سال پیش
والد
کامیت
d9ae4dd945

+ 8 - 0
package/busybox/Config.in

@@ -18,18 +18,25 @@ choice
 
 
 	config BR2_BUSYBOX_VERSION_1_0_1
 	config BR2_BUSYBOX_VERSION_1_0_1
 		bool "BusyBox 1.0.1"
 		bool "BusyBox 1.0.1"
+		depends on BR2_DEPRECATED
 
 
 	config BR2_BUSYBOX_VERSION_1_1_3
 	config BR2_BUSYBOX_VERSION_1_1_3
 		bool "BusyBox 1.1.3"
 		bool "BusyBox 1.1.3"
+		depends on BR2_DEPRECATED
 
 
 	config BR2_BUSYBOX_VERSION_1_2_2_1
 	config BR2_BUSYBOX_VERSION_1_2_2_1
 		bool "BusyBox 1.2.2.1"
 		bool "BusyBox 1.2.2.1"
 
 
 	config BR2_BUSYBOX_VERSION_1_4_0
 	config BR2_BUSYBOX_VERSION_1_4_0
 		bool "BusyBox 1.4.0"
 		bool "BusyBox 1.4.0"
+		depends on BR2_DEPRECATED
 
 
 	config BR2_BUSYBOX_VERSION_1_4_1
 	config BR2_BUSYBOX_VERSION_1_4_1
 		bool "BusyBox 1.4.1"
 		bool "BusyBox 1.4.1"
+		depends on BR2_DEPRECATED
+
+	config BR2_BUSYBOX_VERSION_1_4_2
+		bool "BusyBox 1.4.2"
 
 
 	config BR2_PACKAGE_BUSYBOX_SNAPSHOT
 	config BR2_PACKAGE_BUSYBOX_SNAPSHOT
 		bool "daily snapshot"
 		bool "daily snapshot"
@@ -60,6 +67,7 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
 	default "package/busybox/busybox-1.2.2.1.config" if BR2_BUSYBOX_VERSION_1_2_2_1
 	default "package/busybox/busybox-1.2.2.1.config" if BR2_BUSYBOX_VERSION_1_2_2_1
 	default "package/busybox/busybox-1.4.0.config" if BR2_BUSYBOX_VERSION_1_4_0
 	default "package/busybox/busybox-1.4.0.config" if BR2_BUSYBOX_VERSION_1_4_0
 	default "package/busybox/busybox-1.4.1.config" if BR2_BUSYBOX_VERSION_1_4_1
 	default "package/busybox/busybox-1.4.1.config" if BR2_BUSYBOX_VERSION_1_4_1
+	default "package/busybox/busybox-1.4.1.config" if BR2_BUSYBOX_VERSION_1_4_2
 	help
 	help
 	  Some people may wish to use their own modified BusyBox configuration
 	  Some people may wish to use their own modified BusyBox configuration
 	  file, and will specify their config file location with this option.
 	  file, and will specify their config file location with this option.

+ 0 - 11
package/busybox/busybox.fix-ptr_to_globals.patch

@@ -1,11 +0,0 @@
-Index: busybox/libbb/messages.c
-===================================================================
---- busybox/libbb/messages.c	(revision 18097)
-+++ busybox/libbb/messages.c	(working copy)
-@@ -56,4 +56,5 @@ WTMP_FILE;
- 
- char bb_common_bufsiz1[BUFSIZ+1];
- 
--void *ptr_to_globals;
-+struct global1;
-+struct global1 *ptr_to_globals;

+ 0 - 13
package/busybox/busybox.mdev-just-read-9-bytes.patch

@@ -1,13 +0,0 @@
-Index: busybox/util-linux/mdev.c
-===================================================================
---- busybox/util-linux/mdev.c	(revision 17891)
-+++ busybox/util-linux/mdev.c	(working copy)
-@@ -39,7 +39,7 @@
- 
- 	if (!delete) {
- 		strcat(path, "/dev");
--		len = open_read_close(path, temp + 1, 64);
-+		len = open_read_close(path, temp + 1, 9);
- 		*temp++ = 0;
- 		if (len < 1) return;
- 	}

+ 5 - 0
package/busybox/busybox.mk

@@ -24,6 +24,11 @@ ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_4_1)),y)
 BUSYBOX_VER:=1.4.1
 BUSYBOX_VER:=1.4.1
 endif
 endif
 
 
+ifeq ($(strip $(BR2_BUSYBOX_VERSION_1_4_2)),y)
+BUSYBOX_VER:=1.4.2
+endif
+
+
 ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
 ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
 # Be aware that this changes daily....
 # Be aware that this changes daily....
 BUSYBOX_DIR:=$(BUILD_DIR)/busybox
 BUSYBOX_DIR:=$(BUILD_DIR)/busybox