diff options
| author | Oliver Tappe | 2007-11-29 21:38:10 +0100 |
|---|---|---|
| committer | Oliver Tappe | 2007-11-29 21:38:10 +0100 |
| commit | 8aa5fbe97bc54d3c0e9147809a812a6834f8f9b0 (patch) | |
| tree | 93296f4cb181482660030f0eba2fd2ea9816518b /tools | |
| parent | * replaced busybox.i586 with a version that actually contains the required (diff) | |
| download | core-8aa5fbe97bc54d3c0e9147809a812a6834f8f9b0.tar.gz core-8aa5fbe97bc54d3c0e9147809a812a6834f8f9b0.tar.xz core-8aa5fbe97bc54d3c0e9147809a812a6834f8f9b0.zip | |
* added the patch that had erraneously been removed
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1416 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/busybox-patches/bzip2-payload-1.7.1.diff | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/tools/busybox-patches/bzip2-payload-1.7.1.diff b/tools/busybox-patches/bzip2-payload-1.7.1.diff new file mode 100644 index 00000000..31156fd5 --- /dev/null +++ b/tools/busybox-patches/bzip2-payload-1.7.1.diff @@ -0,0 +1,63 @@ +diff -ru ./archival/Config.in ../busybox-1.6.0/archival/Config.in +--- ./archival/Config.in 2007-06-01 13:48:31.000000000 +0200 ++++ ../busybox-1.6.0/archival/Config.in 2007-06-15 12:22:16.000000000 +0200 +@@ -127,6 +127,14 @@ + help + Converts an RPM file into a CPIO archive. + ++config FEATURE_RPM2CPIO_BZIP2 ++ bool " Support bzip2 decompression" ++ default n ++ depends on RPM2CPIO ++ help ++ If you enable this option you'll be able to extract ++ rpms compressed with bzip2. ++ + config RPM + bool "rpm" + default n +diff -ru ./archival/libunarchive/Kbuild ../busybox-1.6.0/archival/libunarchive/Kbuild +--- ./archival/libunarchive/Kbuild 2007-06-01 13:48:31.000000000 +0200 ++++ ../busybox-1.6.0/archival/libunarchive/Kbuild 2007-06-15 12:22:46.000000000 +0200 +@@ -56,6 +56,7 @@ + lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES) + lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o + lib-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o ++lib-$(CONFIG_FEATURE_RPM2CPIO_BZIP2) += $(GUNZIP_FILES) decompress_bunzip2.o + lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o + lib-$(CONFIG_FEATURE_RPM_BZ2) += decompress_bunzip2.o + lib-$(CONFIG_TAR) += get_header_tar.o +diff -ru ./archival/rpm2cpio.c ../busybox-1.6.0/archival/rpm2cpio.c +--- ./archival/rpm2cpio.c 2007-06-01 13:48:31.000000000 +0200 ++++ ../busybox-1.6.0/archival/rpm2cpio.c 2007-06-15 12:22:24.000000000 +0200 +@@ -75,14 +75,24 @@ + skip_header(rpm_fd); + + xread(rpm_fd, &magic, 2); +- if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { +- bb_error_msg_and_die("invalid gzip magic"); ++ if ((magic[0] == 0x1f) && (magic[1] == 0x8b)) { ++ check_header_gzip_or_die(rpm_fd); ++ if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) { ++ bb_error_msg("error inflating (gzip)"); ++ } + } +- +- check_header_gzip_or_die(rpm_fd); +- if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) { +- bb_error_msg("error inflating"); ++ else if ((magic[0] == 'B') && (magic[1] == 'Z')) { ++#ifdef CONFIG_FEATURE_RPM2CPIO_BZIP2 ++ /* return to position before magic (eek..!) */ ++ lseek(rpm_fd, -2, SEEK_CUR); ++ if (unpack_bz2_stream(rpm_fd, fileno(stdout)) != 0) ++ bb_error_msg("error inflating (bzip2)"); ++#else ++ bb_error_msg_and_die("bzip2 not supported"); ++#endif + } ++ else ++ bb_error_msg_and_die("not gzip or bzip2 compressed"); + + close(rpm_fd); + |