From 248ec063994565517e95774b037f4b7750a73bb4 Mon Sep 17 00:00:00 2001
From: Lars Müller
Date: Sun, 7 Jan 2007 14:47:16 +0000
Subject: Hacky workaround for this busybox bug case.

This problem looks solved in bb 1.3.1.


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@597 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 .../busybox-patches/libunarchive_get_header_cpio.c.diff  | 16 ++++++++++++++++
 tools/busybox-patches/series                             |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 tools/busybox-patches/libunarchive_get_header_cpio.c.diff

(limited to 'tools')

diff --git a/tools/busybox-patches/libunarchive_get_header_cpio.c.diff b/tools/busybox-patches/libunarchive_get_header_cpio.c.diff
new file mode 100644
index 00000000..4166c669
--- /dev/null
+++ b/tools/busybox-patches/libunarchive_get_header_cpio.c.diff
@@ -0,0 +1,16 @@
+Author: Lars Mueller <lm at openslx dot com>
+Subject: Do not return with an error in this particular case.
+Fixed upstream: Yes; at least in 1.3.1
+
+Index: busybox-1.2.2/archival/libunarchive/get_header_cpio.c
+===================================================================
+--- busybox-1.2.2.orig/archival/libunarchive/get_header_cpio.c
++++ busybox-1.2.2/archival/libunarchive/get_header_cpio.c
+@@ -35,7 +35,6 @@ char get_header_cpio(archive_handle_t *a
+ 		oldtmp = NULL;
+ 
+ 		while (tmp) {
+-			bb_error_msg_and_die("need to fix this\n");
+ 			if (tmp->entry->link_name) { /* Found a hardlink ready to be extracted */
+ 				file_header = tmp->entry;
+ 				if (oldtmp) {
diff --git a/tools/busybox-patches/series b/tools/busybox-patches/series
index 87dc1896..c5c45f77 100644
--- a/tools/busybox-patches/series
+++ b/tools/busybox-patches/series
@@ -1,3 +1,4 @@
 # series file useable by quilt
 bzip2-payload.diff
 unionfs-run-init.diff
+libunarchive_get_header_cpio.c.diff
-- 
cgit v1.2.3-55-g7522