wok rev 644

busybox/cpio: do not assume -m always
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Apr 22 14:53:34 2008 +0000 (2008-04-22)
parents b2edc3caa9ec
children 9f83f08ab2b7
files busybox/receipt busybox/stuff/busybox-1.10.1-cpio-mtime.u
line diff
     1.1 --- a/busybox/receipt	Tue Apr 22 16:25:57 2008 +0200
     1.2 +++ b/busybox/receipt	Tue Apr 22 14:53:34 2008 +0000
     1.3 @@ -20,6 +20,7 @@
     1.4      patch -p1 < ../stuff/$PACKAGE-$VERSION-cpio.u
     1.5      patch -p1 < ../stuff/$PACKAGE-$VERSION-dhcpc.u
     1.6      patch -p1 < ../stuff/$PACKAGE-$VERSION-cpio-mkdir.u
     1.7 +    patch -p1 < ../stuff/$PACKAGE-$VERSION-cpio-mtime.u
     1.8      cp ../stuff/$PACKAGE-$VERSION.config .config
     1.9      make oldconfig
    1.10      make && make install
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/busybox/stuff/busybox-1.10.1-cpio-mtime.u	Tue Apr 22 14:53:34 2008 +0000
     2.3 @@ -0,0 +1,21 @@
     2.4 +--- busybox-1.10.0/archival/cpio.c	
     2.5 ++++ busybox-1.10.0/archival/cpio.c	
     2.6 +@@ -167,7 +167,7 @@
     2.7 + 	archive_handle = init_handle();
     2.8 + 	archive_handle->src_fd = STDIN_FILENO;
     2.9 + 	archive_handle->seek = seek_by_read;
    2.10 +-	archive_handle->flags = ARCHIVE_EXTRACT_NEWER | ARCHIVE_PRESERVE_DATE;
    2.11 ++	archive_handle->flags = ARCHIVE_EXTRACT_NEWER;
    2.12 + 
    2.13 + #if ENABLE_FEATURE_CPIO_O
    2.14 + 	opt = getopt32(argv, "ituvF:dmoH:", &cpio_filename,&cpio_fmt);
    2.15 +@@ -220,6 +220,9 @@
    2.16 + 	if (opt & CPIO_OPT_CREATE_LEADING_DIR) {
    2.17 + 		archive_handle->flags |= ARCHIVE_CREATE_LEADING_DIRS;
    2.18 + 	}
    2.19 ++	if (opt & CPIO_OPT_PRESERVE_MTIME) {
    2.20 ++		archive_handle->flags |= ARCHIVE_PRESERVE_DATE;
    2.21 ++	}
    2.22 + 
    2.23 + 	while (optind < argc) {
    2.24 + 		archive_handle->filter = filter_accept_list;