diff options
| author | Phil Blundell <philb@gnu.org> | 2004-08-07 12:01:08 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2004-08-07 12:01:08 +0000 |
| commit | 145cc721a2791c3e032ef18d1f96daa7f5350691 (patch) | |
| tree | 0ca2e31bf2252b9b4164acda4f24b1efedb8d882 /busybox/busybox-1.00-rc2/tar.patch | |
| parent | df056f9c1d74ecf3334aec3502b0ee304be350e9 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into workhouse.nexus.co.uk:/home/pb/oe/oe-packages
2004/08/07 13:00:51+01:00 nexus.co.uk!pb
update busybox back to 1.00-rc2; add McQueen patch for modprobe
BKrev: 4114c484p-qOmdVHZV0prZBT4vb2jg
Diffstat (limited to 'busybox/busybox-1.00-rc2/tar.patch')
| -rw-r--r-- | busybox/busybox-1.00-rc2/tar.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/busybox/busybox-1.00-rc2/tar.patch b/busybox/busybox-1.00-rc2/tar.patch new file mode 100644 index 0000000000..e080275184 --- /dev/null +++ b/busybox/busybox-1.00-rc2/tar.patch @@ -0,0 +1,22 @@ +--- busybox/archival/libunarchive/data_extract_all.c 2002-11-29 01:43:46.000000000 -0500 ++++ busybox-new/archival/libunarchive/data_extract_all.c 2002-12-03 18:38:21.000000000 -0500 +@@ -69,6 +68,9 @@ + case S_IFLNK: + /* Symlink */ + res = symlink(file_header->link_name, file_header->name); ++ if ((res == -1) && (errno == EEXIST) && (unlink(file_header->name) == 0)) { ++ res = symlink(file_header->link_name, file_header->name); ++ } + if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) { + perror_msg("Cannot create symlink from %s to '%s'", file_header->name, file_header->link_name); + } +@@ -78,6 +80,9 @@ + case S_IFCHR: + case S_IFIFO: + res = mknod(file_header->name, file_header->mode, file_header->device); ++ if ((res == -1) && (errno == EEXIST) && (unlink(file_header->name) == 0)) { ++ res = mknod(file_header->name, file_header->mode, file_header->device); ++ } + if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) { + perror_msg("Cannot create node %s", file_header->name); + } |