diff options
Diffstat (limited to 'package/e2fsprogs')
| -rw-r--r-- | package/e2fsprogs/Makefile | 10 | ||||
| -rw-r--r-- | package/e2fsprogs/patches/patch-debugfs_dump_c | 30 | ||||
| -rw-r--r-- | package/e2fsprogs/patches/patch-debugfs_dump_c.orig | 10 | ||||
| -rw-r--r-- | package/e2fsprogs/patches/patch-debugfs_logdump_c | 10 | ||||
| -rw-r--r-- | package/e2fsprogs/patches/patch-debugfs_set_fields_c | 10 | ||||
| -rw-r--r-- | package/e2fsprogs/patches/patch-e2fsprogs_spec | 11 | ||||
| -rw-r--r-- | package/e2fsprogs/patches/patch-misc_e2initrd_helper_c | 10 |
7 files changed, 86 insertions, 5 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 471f0fa04..783a197cf 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= e2fsprogs -PKG_VERSION:= 1.41.12 +PKG_VERSION:= 1.41.14 PKG_RELEASE:= 1 -PKG_MD5SUM:= 1b24a21fc0c2381ef420961cbfec733f +PKG_MD5SUM:= 05f70470aea2ef7efbb0845b2b116720 PKG_DESCR:= Ext2/3/4 filesystem utilities PKG_SECTION:= fs PKG_DEPENDS:= libcom-err libuuid libblkid libpthread @@ -66,9 +66,9 @@ post-install: ${CP} ${WRKINST}/usr/lib/libuuid.so* \ ${IDIR_LIBUUID}/usr/lib/ # install some headers/apps explicitely - ${INSTALL_DIR} ${STAGING_DIR}/usr/include/uuid + ${INSTALL_DIR} ${STAGING_TARGET_DIR}/usr/include/uuid ${CP} ${WRKBUILD}/lib/uuid/uuid.h \ - ${STAGING_DIR}/usr/include/uuid - ${CP} ${WRKINST}/usr/bin/compile_et ${STAGING_TOOLS}/bin + ${STAGING_TARGET_DIR}/usr/include/uuid + ${CP} ${WRKINST}/usr/bin/compile_et ${STAGING_HOST_DIR}/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/e2fsprogs/patches/patch-debugfs_dump_c b/package/e2fsprogs/patches/patch-debugfs_dump_c new file mode 100644 index 000000000..ad28d3c02 --- /dev/null +++ b/package/e2fsprogs/patches/patch-debugfs_dump_c @@ -0,0 +1,30 @@ +--- e2fsprogs-1.41.14.orig/debugfs/dump.c 2009-08-13 03:39:57.000000000 +0200 ++++ e2fsprogs-1.41.14/debugfs/dump.c 2010-12-25 22:30:02.000000000 +0100 +@@ -19,7 +19,6 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +-#include <utime.h> + #ifdef HAVE_GETOPT_H + #include <getopt.h> + #else +@@ -67,7 +66,6 @@ static mode_t mode_xlate(__u16 lmode) + static void fix_perms(const char *cmd, const struct ext2_inode *inode, + int fd, const char *name) + { +- struct utimbuf ut; + int i; + + if (fd != -1) +@@ -90,11 +88,6 @@ static void fix_perms(const char *cmd, c + + if (fd != -1) + close(fd); +- +- ut.actime = inode->i_atime; +- ut.modtime = inode->i_mtime; +- if (utime(name, &ut) == -1) +- com_err(cmd, errno, "while setting times of %s", name); + } + + static void dump_file(const char *cmdname, ext2_ino_t ino, int fd, diff --git a/package/e2fsprogs/patches/patch-debugfs_dump_c.orig b/package/e2fsprogs/patches/patch-debugfs_dump_c.orig new file mode 100644 index 000000000..7e9b233fa --- /dev/null +++ b/package/e2fsprogs/patches/patch-debugfs_dump_c.orig @@ -0,0 +1,10 @@ +--- e2fsprogs-1.41.14.orig/debugfs/dump.c 2009-08-13 03:39:57.000000000 +0200 ++++ e2fsprogs-1.41.14/debugfs/dump.c 2010-12-25 22:27:59.000000000 +0100 +@@ -19,7 +19,6 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +-#include <utime.h> + #ifdef HAVE_GETOPT_H + #include <getopt.h> + #else diff --git a/package/e2fsprogs/patches/patch-debugfs_logdump_c b/package/e2fsprogs/patches/patch-debugfs_logdump_c new file mode 100644 index 000000000..07155d7b6 --- /dev/null +++ b/package/e2fsprogs/patches/patch-debugfs_logdump_c @@ -0,0 +1,10 @@ +--- e2fsprogs-1.41.14.orig/debugfs/logdump.c 2010-12-22 16:49:20.000000000 +0100 ++++ e2fsprogs-1.41.14/debugfs/logdump.c 2010-12-25 22:31:30.000000000 +0100 +@@ -21,7 +21,6 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +-#include <utime.h> + #ifdef HAVE_GETOPT_H + #include <getopt.h> + #else diff --git a/package/e2fsprogs/patches/patch-debugfs_set_fields_c b/package/e2fsprogs/patches/patch-debugfs_set_fields_c new file mode 100644 index 000000000..985eff51e --- /dev/null +++ b/package/e2fsprogs/patches/patch-debugfs_set_fields_c @@ -0,0 +1,10 @@ +--- e2fsprogs-1.41.14.orig/debugfs/set_fields.c 2010-12-22 16:49:20.000000000 +0100 ++++ e2fsprogs-1.41.14/debugfs/set_fields.c 2010-12-25 22:25:52.000000000 +0100 +@@ -33,7 +33,6 @@ + #include <strings.h> + #endif + #include <fcntl.h> +-#include <utime.h> + + #include "debugfs.h" + #include "uuid/uuid.h" diff --git a/package/e2fsprogs/patches/patch-e2fsprogs_spec b/package/e2fsprogs/patches/patch-e2fsprogs_spec new file mode 100644 index 000000000..ad10f98dc --- /dev/null +++ b/package/e2fsprogs/patches/patch-e2fsprogs_spec @@ -0,0 +1,11 @@ +--- e2fsprogs-1.41.14.orig/e2fsprogs.spec 2010-12-13 14:57:34.000000000 +0100 ++++ e2fsprogs-1.41.14/e2fsprogs.spec 2010-12-25 22:24:46.000000000 +0100 +@@ -5,7 +5,7 @@ + + Summary: Utilities for managing ext2/ext3/ext4 filesystems + Name: e2fsprogs +-Version: 1.41.13 ++Version: 1.41.14 + Release: 0 + License: GPLv2 + Group: System Environment/Base diff --git a/package/e2fsprogs/patches/patch-misc_e2initrd_helper_c b/package/e2fsprogs/patches/patch-misc_e2initrd_helper_c new file mode 100644 index 000000000..152e4e0a2 --- /dev/null +++ b/package/e2fsprogs/patches/patch-misc_e2initrd_helper_c @@ -0,0 +1,10 @@ +--- e2fsprogs-1.41.14.orig/misc/e2initrd_helper.c 2009-08-13 03:39:57.000000000 +0200 ++++ e2fsprogs-1.41.14/misc/e2initrd_helper.c 2010-12-25 22:33:06.000000000 +0100 +@@ -23,7 +23,6 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> +-#include <utime.h> + #ifdef HAVE_GETOPT_H + #include <getopt.h> + #else |