# HG changeset patch # User Pascal Bellard # Date 1208876014 0 # Node ID 3c49a36cd5e3ad707a7678a62de8ece68dea58af # Parent b2edc3caa9ec6fad47ec4aaa063a1ce52b5a366d busybox/cpio: do not assume -m always diff -r b2edc3caa9ec -r 3c49a36cd5e3 busybox/receipt --- a/busybox/receipt Tue Apr 22 16:25:57 2008 +0200 +++ b/busybox/receipt Tue Apr 22 14:53:34 2008 +0000 @@ -20,6 +20,7 @@ patch -p1 < ../stuff/$PACKAGE-$VERSION-cpio.u patch -p1 < ../stuff/$PACKAGE-$VERSION-dhcpc.u patch -p1 < ../stuff/$PACKAGE-$VERSION-cpio-mkdir.u + patch -p1 < ../stuff/$PACKAGE-$VERSION-cpio-mtime.u cp ../stuff/$PACKAGE-$VERSION.config .config make oldconfig make && make install diff -r b2edc3caa9ec -r 3c49a36cd5e3 busybox/stuff/busybox-1.10.1-cpio-mtime.u --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/busybox/stuff/busybox-1.10.1-cpio-mtime.u Tue Apr 22 14:53:34 2008 +0000 @@ -0,0 +1,21 @@ +--- busybox-1.10.0/archival/cpio.c ++++ busybox-1.10.0/archival/cpio.c +@@ -167,7 +167,7 @@ + archive_handle = init_handle(); + archive_handle->src_fd = STDIN_FILENO; + archive_handle->seek = seek_by_read; +- archive_handle->flags = ARCHIVE_EXTRACT_NEWER | ARCHIVE_PRESERVE_DATE; ++ archive_handle->flags = ARCHIVE_EXTRACT_NEWER; + + #if ENABLE_FEATURE_CPIO_O + opt = getopt32(argv, "ituvF:dmoH:", &cpio_filename,&cpio_fmt); +@@ -220,6 +220,9 @@ + if (opt & CPIO_OPT_CREATE_LEADING_DIR) { + archive_handle->flags |= ARCHIVE_CREATE_LEADING_DIRS; + } ++ if (opt & CPIO_OPT_PRESERVE_MTIME) { ++ archive_handle->flags |= ARCHIVE_PRESERVE_DATE; ++ } + + while (optind < argc) { + archive_handle->filter = filter_accept_list;