diff options
author | Lars Müller | 2007-04-29 15:23:25 +0200 |
---|---|---|
committer | Lars Müller | 2007-04-29 15:23:25 +0200 |
commit | 04b4c1b60b3934ccd1d07a03f54890aea30a2bb0 (patch) | |
tree | b0e0b8d0e243fd69c326888137bc15bed6272cb6 /tools/busybox-patches/bzip2-payload.diff | |
parent | Ensure to have the subversion revision included into the OpenSLX version (diff) | |
download | core-04b4c1b60b3934ccd1d07a03f54890aea30a2bb0.tar.gz core-04b4c1b60b3934ccd1d07a03f54890aea30a2bb0.tar.xz core-04b4c1b60b3934ccd1d07a03f54890aea30a2bb0.zip |
Updated busybox.i586 and busybox.config to version 1.4.2.
busybox.i586 was compiled on a chrooted suse 10.1 system.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@953 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'tools/busybox-patches/bzip2-payload.diff')
-rw-r--r-- | tools/busybox-patches/bzip2-payload.diff | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/busybox-patches/bzip2-payload.diff b/tools/busybox-patches/bzip2-payload.diff index 65863ad9..3f0aebc5 100644 --- a/tools/busybox-patches/bzip2-payload.diff +++ b/tools/busybox-patches/bzip2-payload.diff @@ -4,10 +4,10 @@ URL: http://www.busybox.net/lists/busybox/2004-May/011669.html CVS: http://www.busybox.net/cgi-bin/viewcvs.cgi/trunk/busybox/patches/rpm2cpio_bzip2.patch?rev=9001 BugID: 1141 -Index: busybox-1.3.1/archival/Config.in +Index: busybox-1.4.2/archival/Config.in =================================================================== ---- busybox-1.3.1.orig/archival/Config.in -+++ busybox-1.3.1/archival/Config.in +--- busybox-1.4.2.orig/archival/Config.in ++++ busybox-1.4.2/archival/Config.in @@ -127,6 +127,14 @@ config RPM2CPIO help Converts an RPM file into a CPIO archive. @@ -23,10 +23,10 @@ Index: busybox-1.3.1/archival/Config.in config RPM bool "rpm" default n -Index: busybox-1.3.1/archival/libunarchive/Kbuild +Index: busybox-1.4.2/archival/libunarchive/Kbuild =================================================================== ---- busybox-1.3.1.orig/archival/libunarchive/Kbuild -+++ busybox-1.3.1/archival/libunarchive/Kbuild +--- busybox-1.4.2.orig/archival/libunarchive/Kbuild ++++ busybox-1.4.2/archival/libunarchive/Kbuild @@ -48,6 +48,7 @@ lib-$(CONFIG_FEATURE_DEB_TAR_LZMA) += de lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES) lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o @@ -35,10 +35,10 @@ Index: busybox-1.3.1/archival/libunarchive/Kbuild lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o lib-$(CONFIG_TAR) += get_header_tar.o lib-$(CONFIG_FEATURE_TAR_BZIP2) += decompress_bunzip2.o get_header_tar_bz2.o -Index: busybox-1.3.1/archival/rpm2cpio.c +Index: busybox-1.4.2/archival/rpm2cpio.c =================================================================== ---- busybox-1.3.1.orig/archival/rpm2cpio.c -+++ busybox-1.3.1/archival/rpm2cpio.c +--- busybox-1.4.2.orig/archival/rpm2cpio.c ++++ busybox-1.4.2/archival/rpm2cpio.c @@ -74,14 +74,24 @@ int rpm2cpio_main(int argc, char **argv) skip_header(rpm_fd); |