busybox: add 1.15.0

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2009-09-01 13:25:57 +02:00
parent 49c47f55a8
commit 01f783dc09
2 changed files with 20 additions and 2 deletions

View File

@ -12,7 +12,7 @@ config BR2_PACKAGE_BUSYBOX
choice
prompt "BusyBox Version"
depends on BR2_PACKAGE_BUSYBOX
default BR2_BUSYBOX_VERSION_1_14_X
default BR2_BUSYBOX_VERSION_1_15_X
help
Select the version of BusyBox you wish to use.
@ -22,10 +22,14 @@ choice
config BR2_BUSYBOX_VERSION_1_13_X
bool "BusyBox 1.13.x"
depends on BR2_DEPRECATED || BR2_RECENT
depends on BR2_RECENT
config BR2_BUSYBOX_VERSION_1_14_X
bool "BusyBox 1.14.x"
depends on BR2_DEPRECATED || BR2_RECENT
config BR2_BUSYBOX_VERSION_1_15_X
bool "BusyBox 1.15.x"
config BR2_PACKAGE_BUSYBOX_SNAPSHOT
bool "daily snapshot"
@ -37,6 +41,7 @@ config BR2_BUSYBOX_VERSION
default "1.12.4" if BR2_BUSYBOX_VERSION_1_12_X
default "1.13.4" if BR2_BUSYBOX_VERSION_1_13_X
default "1.14.3" if BR2_BUSYBOX_VERSION_1_14_X
default "1.15.0" if BR2_BUSYBOX_VERSION_1_15_X
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
bool "Run BusyBox's own full installation"
@ -58,6 +63,7 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_12_X
default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_13_X
default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_14_X
default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_15_X
help
Some people may wish to use their own modified BusyBox configuration
file, and will specify their config file location with this option.

View File

@ -0,0 +1,12 @@
diff -urpN busybox-1.15.0/archival/libunarchive/data_extract_all.c busybox-1.15.0-unpack/archival/libunarchive/data_extract_all.c
--- busybox-1.15.0/archival/libunarchive/data_extract_all.c 2009-08-21 00:26:13.000000000 +0200
+++ busybox-1.15.0-unpack/archival/libunarchive/data_extract_all.c 2009-08-30 01:05:39.000000000 +0200
@@ -132,7 +132,7 @@ void FAST_FUNC data_extract_all(archive_
#endif
lchown(file_header->name, file_header->uid, file_header->gid);
}
- if (S_ISLNK(file_header->mode)) {
+ if (!S_ISLNK(file_header->mode)) {
/* uclibc has no lchmod, glibc is even stranger -
* it has lchmod which seems to do nothing!
* so we use chmod... */