Skip to contentSkip to conversation

busybox: update 1.18.0 to 1.18.1

PATCH In review Eric Bénard 2 participants 2 messages Dec 23, 2010 – Dec 24, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 busybox: update 1.18.0 to 1.18.1

1.18.1 is considered as the latest stable version

---
 recipes/busybox/busybox-1.18.0/B921600.patch       |   13 -
 .../busybox-1.18.0/busybox-1.18.0-buildsys.patch   |   21 -
 .../busybox-1.18.0/busybox-1.18.0-runsvdir.patch   |   17 -
 .../busybox-1.18.0/busybox-1.18.0-sha.patch        |  118 ---
 recipes/busybox/busybox-1.18.0/defconfig           |  873 --------------------
 recipes/busybox/busybox-1.18.0/fdisk_nios2.patch   |   13 -
 .../busybox/busybox-1.18.0/get_header_tar.patch    |   13 -
 .../busybox-1.18.0/udhcpc-fix-nfsroot.patch        |   47 --
 recipes/busybox/busybox-1.18.0/udhcpscript.patch   |   13 -
 recipes/busybox/busybox-1.18.1/B921600.patch       |   13 +
 .../busybox-1.18.1/busybox-1.18.1-hush.patch       |  241 ++++++
 recipes/busybox/busybox-1.18.1/defconfig           |  873 ++++++++++++++++++++
 recipes/busybox/busybox-1.18.1/fdisk_nios2.patch   |   13 +
 .../busybox/busybox-1.18.1/get_header_tar.patch    |   13 +
 .../busybox-1.18.1/udhcpc-fix-nfsroot.patch        |   47 ++
 recipes/busybox/busybox-1.18.1/udhcpscript.patch   |   13 +
 recipes/busybox/busybox_1.18.0.bb                  |   14 -
 recipes/busybox/busybox_1.18.1.bb                  |   12 +
 18 files changed, 1225 insertions(+), 1142 deletions(-)
 delete mode 100644 recipes/busybox/busybox-1.18.0/B921600.patch
 delete mode 100644 recipes/busybox/busybox-1.18.0/busybox-1.18.0-buildsys.patch
 delete mode 100644 recipes/busybox/busybox-1.18.0/busybox-1.18.0-runsvdir.patch
 delete mode 100644 recipes/busybox/busybox-1.18.0/busybox-1.18.0-sha.patch
 delete mode 100644 recipes/busybox/busybox-1.18.0/defconfig
 delete mode 100644 recipes/busybox/busybox-1.18.0/fdisk_nios2.patch
 delete mode 100644 recipes/busybox/busybox-1.18.0/get_header_tar.patch
 delete mode 100644 recipes/busybox/busybox-1.18.0/udhcpc-fix-nfsroot.patch
 delete mode 100644 recipes/busybox/busybox-1.18.0/udhcpscript.patch
 create mode 100644 recipes/busybox/busybox-1.18.1/B921600.patch
 create mode 100644 recipes/busybox/busybox-1.18.1/busybox-1.18.1-hush.patch
 create mode 100644 recipes/busybox/busybox-1.18.1/defconfig
 create mode 100644 recipes/busybox/busybox-1.18.1/fdisk_nios2.patch
 create mode 100644 recipes/busybox/busybox-1.18.1/get_header_tar.patch
 create mode 100644 recipes/busybox/busybox-1.18.1/udhcpc-fix-nfsroot.patch
 create mode 100644 recipes/busybox/busybox-1.18.1/udhcpscript.patch
 delete mode 100644 recipes/busybox/busybox_1.18.0.bb
 create mode 100644 recipes/busybox/busybox_1.18.1.bb
recipes/busybox/busybox-1.18.0/B921600.patch deleted +0 -13
deleted file mode 100644
index 61cc32b..0000000
@@ -1,13 +0,0 @@
-diff -upNr busybox-1.7.2/libbb/speed_table.c busybox-1.7.2-921600/libbb/speed_table.c
---- busybox-1.7.2/libbb/speed_table.c	2007-09-03 13:48:41.000000000 +0200
-+++ busybox-1.7.2-921600/libbb/speed_table.c	2008-10-09 16:23:26.269592899 +0200
-@@ -52,6 +52,9 @@ static const struct speed_map speeds[] =
- #ifdef B460800
- 	{B460800, 460800/256 + 0x8000U},
- #endif
-+#ifdef B921600
-+	{B921600, 921600/256 + 0x8000U},
-+#endif
- };
- 
- enum { NUM_SPEEDS = ARRAY_SIZE(speeds) };
recipes/busybox/busybox-1.18.0/busybox-1.18.0-buildsys.patch deleted +0 -21
deleted file mode 100644
index c72e4d3..0000000
@@ -1,21 +0,0 @@
-diff -urpN busybox-1.18.0/scripts/gen_build_files.sh busybox-1.18.0-buildsys/scripts/gen_build_files.sh
---- busybox-1.18.0/scripts/gen_build_files.sh	2010-11-22 21:43:22.000000000 +0100
-+++ busybox-1.18.0-buildsys/scripts/gen_build_files.sh	2010-11-24 14:59:47.732712663 +0100
-@@ -18,14 +18,14 @@ generate()
- 	local src="$1" dst="$2" header="$3" insert="$4"
- 	#chk "${dst}"
- 	(
--		echo "${header}"
-+		printf "%s\n" "${header}"
- 		if grep -qs '^INSERT$' "${src}"; then
- 			sed -n '1,/^INSERT$/p' "${src}"
--			echo "${insert}"
-+			printf "%s\n" "${insert}"
- 			sed -n '/^INSERT$/,$p' "${src}"
- 		else
- 			if [ -n "${insert}" ]; then
--				echo "ERROR: INSERT line missing in: ${src}" 1>&2
-+				printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2
- 			fi
- 			cat "${src}"
- 		fi
recipes/busybox/busybox-1.18.0/busybox-1.18.0-runsvdir.patch deleted +0 -17
deleted file mode 100644
index 41ad570..0000000
@@ -1,17 +0,0 @@
-diff -urpN busybox-1.18.0/runit/runsvdir.c busybox-1.18.0-runsvdir/runit/runsvdir.c
---- busybox-1.18.0/runit/runsvdir.c	2010-11-22 21:43:22.000000000 +0100
-+++ busybox-1.18.0-runsvdir/runit/runsvdir.c	2010-12-06 01:27:56.926036992 +0100
-@@ -312,8 +312,11 @@ int runsvdir_main(int argc UNUSED_PARAM,
- 						last_mtime = s.st_mtime;
- 						last_dev = s.st_dev;
- 						last_ino = s.st_ino;
--						//if (now <= mtime)
--						//	sleep(1);
-+						/* if the svdir changed this very second, wait until the
-+						 * next second, because we won't be able to detect more
-+						 * changes within this second */
-+						while (time(NULL) == last_mtime)
-+							usleep(100000);
- 						need_rescan = do_rescan();
- 						while (fchdir(curdir) == -1) {
- 							warn2_cannot("change directory, pausing", "");
recipes/busybox/busybox-1.18.0/busybox-1.18.0-sha.patch deleted +0 -118

118 lines not on this page · raw message

recipes/busybox/busybox-1.18.0/defconfig deleted +0 -873

873 lines not on this page · raw message

recipes/busybox/busybox-1.18.0/fdisk_nios2.patch deleted +0 -13
deleted file mode 100644
index 648e68e..0000000
@@ -1,13 +0,0 @@
-Index: busybox-1.15.3/util-linux/fdisk_osf.c
-===================================================================
---- busybox-1.15.3.orig/util-linux/fdisk_osf.c
-+++ busybox-1.15.3/util-linux/fdisk_osf.c
-@@ -44,7 +44,7 @@
- #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
- 
- #if defined(i386) || defined(__sparc__) || defined(__arm__) \
-- || defined(__m68k__) || defined(__mips__) || defined(__s390__) \
-+ || defined(__m68k__) || defined(__mips__) || defined(__nios2__) \
-  || defined(__s390__) || defined(__s390x__) \
-  || defined(__sh__) || defined(__x86_64__) || defined(__avr32__)
- # define BSD_LABELSECTOR   1
recipes/busybox/busybox-1.18.0/get_header_tar.patch deleted +0 -13
deleted file mode 100644
index 62b55af..0000000
@@ -1,13 +0,0 @@
-diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
-index 78b0ae2..58b15c1 100644
---- a/archival/libarchive/get_header_tar.c
-+++ b/archival/libarchive/get_header_tar.c
-@@ -314,6 +314,8 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
- 			file_header->name = concat_path_file(tar.prefix, tar.name);
- 		} else
- 			file_header->name = xstrdup(tar.name);
-+		if (strlen(file_header->name) > 100)
-+			file_header->name[100] = 0;
- 	}
- 
- 	/* Set bits 12-15 of the files mode */
recipes/busybox/busybox-1.18.0/udhcpc-fix-nfsroot.patch deleted +0 -47

47 lines not on this page · raw message

recipes/busybox/busybox-1.18.0/udhcpscript.patch deleted +0 -13
deleted file mode 100644
index 2ffba95..0000000
@@ -1,13 +0,0 @@
-Index: busybox-1.15.1/examples/udhcp/simple.script
-===================================================================
---- busybox-1.15.1.orig/examples/udhcp/simple.script	2009-09-12 17:55:36.000000000 +0200
-+++ busybox-1.15.1/examples/udhcp/simple.script	2009-09-16 22:51:06.599693412 +0200
-@@ -22,7 +22,7 @@ case "$1" in
- 
- 		if [ -n "$router" ] ; then
- 			echo "Deleting routers"
--			while route del default gw 0.0.0.0 dev $interface ; do
-+			while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
- 				:
- 			done
- 
recipes/busybox/busybox-1.18.1/B921600.patch new file +13 -0
new file mode 100644
index 0000000..61cc32b
@@ -0,0 +1,13 @@
+diff -upNr busybox-1.7.2/libbb/speed_table.c busybox-1.7.2-921600/libbb/speed_table.c
+--- busybox-1.7.2/libbb/speed_table.c	2007-09-03 13:48:41.000000000 +0200
++++ busybox-1.7.2-921600/libbb/speed_table.c	2008-10-09 16:23:26.269592899 +0200
+@@ -52,6 +52,9 @@ static const struct speed_map speeds[] =
+ #ifdef B460800
+ 	{B460800, 460800/256 + 0x8000U},
+ #endif
++#ifdef B921600
++	{B921600, 921600/256 + 0x8000U},
++#endif
+ };
+ 
+ enum { NUM_SPEEDS = ARRAY_SIZE(speeds) };
recipes/busybox/busybox-1.18.1/busybox-1.18.1-hush.patch new file +241 -0

241 lines not on this page · raw message

recipes/busybox/busybox-1.18.1/defconfig new file +873 -0

873 lines not on this page · raw message

recipes/busybox/busybox-1.18.1/fdisk_nios2.patch new file +13 -0
new file mode 100644
index 0000000..648e68e
@@ -0,0 +1,13 @@
+Index: busybox-1.15.3/util-linux/fdisk_osf.c
+===================================================================
+--- busybox-1.15.3.orig/util-linux/fdisk_osf.c
++++ busybox-1.15.3/util-linux/fdisk_osf.c
+@@ -44,7 +44,7 @@
+ #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
+ 
+ #if defined(i386) || defined(__sparc__) || defined(__arm__) \
+- || defined(__m68k__) || defined(__mips__) || defined(__s390__) \
++ || defined(__m68k__) || defined(__mips__) || defined(__nios2__) \
+  || defined(__s390__) || defined(__s390x__) \
+  || defined(__sh__) || defined(__x86_64__) || defined(__avr32__)
+ # define BSD_LABELSECTOR   1
recipes/busybox/busybox-1.18.1/get_header_tar.patch new file +13 -0
new file mode 100644
index 0000000..62b55af
@@ -0,0 +1,13 @@
+diff --git a/archival/libarchive/get_header_tar.c b/archival/libarchive/get_header_tar.c
+index 78b0ae2..58b15c1 100644
+--- a/archival/libarchive/get_header_tar.c
++++ b/archival/libarchive/get_header_tar.c
+@@ -314,6 +314,8 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
+ 			file_header->name = concat_path_file(tar.prefix, tar.name);
+ 		} else
+ 			file_header->name = xstrdup(tar.name);
++		if (strlen(file_header->name) > 100)
++			file_header->name[100] = 0;
+ 	}
+ 
+ 	/* Set bits 12-15 of the files mode */
recipes/busybox/busybox-1.18.1/udhcpc-fix-nfsroot.patch new file +47 -0

47 lines not on this page · raw message

recipes/busybox/busybox-1.18.1/udhcpscript.patch new file +13 -0
new file mode 100644
index 0000000..2ffba95
@@ -0,0 +1,13 @@
+Index: busybox-1.15.1/examples/udhcp/simple.script
+===================================================================
+--- busybox-1.15.1.orig/examples/udhcp/simple.script	2009-09-12 17:55:36.000000000 +0200
++++ busybox-1.15.1/examples/udhcp/simple.script	2009-09-16 22:51:06.599693412 +0200
+@@ -22,7 +22,7 @@ case "$1" in
+ 
+ 		if [ -n "$router" ] ; then
+ 			echo "Deleting routers"
+-			while route del default gw 0.0.0.0 dev $interface ; do
++			while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
+ 				:
+ 			done
+ 
recipes/busybox/busybox_1.18.0.bb deleted +0 -14
deleted file mode 100644
index d11dffe..0000000
@@ -1,14 +0,0 @@
-require busybox_1.1x.inc
-PR = "${INC_PR}.3"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI += " \
-	file://busybox-1.18.0-buildsys.patch \
-	file://busybox-1.18.0-sha.patch \
-	file://busybox-1.18.0-runsvdir.patch \
-	"
-
-SRC_URI[md5sum] = "7a8150a10558a5292fa1f52f1c65b0f5"
-SRC_URI[sha256sum] = "3a9d5e6929045440ec3d0c9987376cbbb78e98886d6c5fa58fc2306d2662eb00"
-
recipes/busybox/busybox_1.18.1.bb new file +12 -0
new file mode 100644
index 0000000..fb21741
@@ -0,0 +1,12 @@
+require busybox_1.1x.inc
+PR = "${INC_PR}.0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += " \
+	file://busybox-1.18.1-hush.patch \
+	"
+
+SRC_URI[md5sum] = "f15fe752d8b7012aa5e59f83b88ccb1c"
+SRC_URI[sha256sum] = "33eb25ea7b20c727c3af769256b21408a1ac1f927ff9f89a1f1e3767c18c9967"
+
Signature · 1 line
1.6.3.3
Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · Eric Bénard

1.18.1 is considered as the latest stable version

Quoted 38 lines

---
 recipes/busybox/busybox-1.18.0/B921600.patch       |   13 - .../busybox-1.18.0/busybox-1.18.0-buildsys.patch   |   21 - .../busybox-1.18.0/busybox-1.18.0-runsvdir.patch   |   17 - .../busybox-1.18.0/busybox-1.18.0-sha.patch        |  118 --- recipes/busybox/busybox-1.18.0/defconfig           |  873 -------------------- recipes/busybox/busybox-1.18.0/fdisk_nios2.patch   |   13 - .../busybox/busybox-1.18.0/get_header_tar.patch    |   13 - .../busybox-1.18.0/udhcpc-fix-nfsroot.patch        |   47 -- recipes/busybox/busybox-1.18.0/udhcpscript.patch   |   13 - recipes/busybox/busybox-1.18.1/B921600.patch       |   13 + .../busybox-1.18.1/busybox-1.18.1-hush.patch       |  241 ++++++ recipes/busybox/busybox-1.18.1/defconfig           |  873 ++++++++++++++++++++ recipes/busybox/busybox-1.18.1/fdisk_nios2.patch   |   13 + .../busybox/busybox-1.18.1/get_header_tar.patch    |   13 + .../busybox-1.18.1/udhcpc-fix-nfsroot.patch        |   47 ++ recipes/busybox/busybox-1.18.1/udhcpscript.patch   |   13 + recipes/busybox/busybox_1.18.0.bb                  |   14 - recipes/busybox/busybox_1.18.1.bb                  |   12 +

 18 files changed, 1225 insertions(+), 1142 deletions(-)

 delete mode 100644 recipes/busybox/busybox-1.18.0/B921600.patch delete mode 100644 recipes/busybox/busybox-1.18.0/busybox-1.18.0-buildsys.patch delete mode 100644 recipes/busybox/busybox-1.18.0/busybox-1.18.0-runsvdir.patch delete mode 100644 recipes/busybox/busybox-1.18.0/busybox-1.18.0-sha.patch delete mode 100644 recipes/busybox/busybox-1.18.0/defconfig
 delete mode 100644 recipes/busybox/busybox-1.18.0/fdisk_nios2.patch delete mode 100644 recipes/busybox/busybox-1.18.0/get_header_tar.patch delete mode 100644 recipes/busybox/busybox-1.18.0/udhcpc-fix-nfsroot.patch delete mode 100644 recipes/busybox/busybox-1.18.0/udhcpscript.patch create mode 100644 recipes/busybox/busybox-1.18.1/B921600.patch create mode 100644 recipes/busybox/busybox-1.18.1/busybox-1.18.1-hush.patch create mode 100644 recipes/busybox/busybox-1.18.1/defconfig
 create mode 100644 recipes/busybox/busybox-1.18.1/fdisk_nios2.patch create mode 100644 recipes/busybox/busybox-1.18.1/get_header_tar.patch create mode 100644 recipes/busybox/busybox-1.18.1/udhcpc-fix-nfsroot.patch create mode 100644 recipes/busybox/busybox-1.18.1/udhcpscript.patch delete mode 100644 recipes/busybox/busybox_1.18.0.bb
 create mode 100644 recipes/busybox/busybox_1.18.1.bb