diff options
| author | Lars Müller | 2007-01-07 16:26:18 +0100 |
|---|---|---|
| committer | Lars Müller | 2007-01-07 16:26:18 +0100 |
| commit | 80622baa8d5f18dd4fdbb34d6bc9d178681095a8 (patch) | |
| tree | c69b4947597431f749564f34dcbfbba8626807ed /tools | |
| parent | Hacky workaround for this busybox bug case. (diff) | |
| download | core-80622baa8d5f18dd4fdbb34d6bc9d178681095a8.tar.gz core-80622baa8d5f18dd4fdbb34d6bc9d178681095a8.tar.xz core-80622baa8d5f18dd4fdbb34d6bc9d178681095a8.zip | |
Wrap bzip part of rpm2cpio into an else statement as we else can't
unpack RPMs with a gzip payload.
The busybox bug tracking system was updated before.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@598 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/busybox-patches/bzip2-payload.diff | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/busybox-patches/bzip2-payload.diff b/tools/busybox-patches/bzip2-payload.diff index 1749d8a9..be2bb883 100644 --- a/tools/busybox-patches/bzip2-payload.diff +++ b/tools/busybox-patches/bzip2-payload.diff @@ -54,7 +54,7 @@ Index: busybox-1.2.2/archival/rpm2cpio.c - check_header_gzip(rpm_fd); - if (inflate_gunzip(rpm_fd, STDOUT_FILENO) != 0) { - bb_error_msg("Error inflating"); -+ if ((magic[0] == 'B') && (magic[1] == 'Z')) { ++ 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); @@ -67,7 +67,7 @@ Index: busybox-1.2.2/archival/rpm2cpio.c + else + bb_error_msg_and_die("not gzip or bzip2 compressed"); -+ ++ + close(rpm_fd); |