diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-10-30 21:47:06 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-10-30 21:47:06 +0000 |
| commit | 7323edfecd5aacefde59daaa869716f79ae8e01c (patch) | |
| tree | 8e88ed3e5009d524a401cdfdf88cee839ad03f46 | |
| parent | 8eed6f271ba7c24dcb3b451be99efe7ca91969ad (diff) | |
| download | upstream-7323edfecd5aacefde59daaa869716f79ae8e01c.tar.gz upstream-7323edfecd5aacefde59daaa869716f79ae8e01c.tar.bz2 upstream-7323edfecd5aacefde59daaa869716f79ae8e01c.zip | |
e2fsprogs: update to 1.42.8, fixes a build error
Includes previous changes from trunk
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Backport of r38564
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@38617 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | tools/e2fsprogs/Makefile | 11 | ||||
| -rw-r--r-- | tools/e2fsprogs/patches/003-openbsd-compat.patch | 24 | ||||
| -rw-r--r-- | tools/e2fsprogs/patches/004-freebsd-compat.patch | 13 |
3 files changed, 45 insertions, 3 deletions
diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile index 9f5bcc4b80..60047c763a 100644 --- a/tools/e2fsprogs/Makefile +++ b/tools/e2fsprogs/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2012 OpenWrt.org +# Copyright (C) 2010-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs -PKG_VERSION:=1.42.4 -PKG_MD5SUM:=b6e296f210d642361b7394437ff0f318 +PKG_VERSION:=1.42.8 +PKG_MD5SUM:=8ef664b6eb698aa6b733df59b17b9ed4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -30,6 +30,11 @@ HOST_CONFIGURE_ARGS += \ --disable-tls \ --disable-nls +define Host/Prepare + $(call Host/Prepare/Default) + rm -rf $(HOST_BUILD_DIR)/doc +endef + define Host/Install $(Host/Install/Default) $(MAKE) -C $(HOST_BUILD_DIR)/lib/uuid install diff --git a/tools/e2fsprogs/patches/003-openbsd-compat.patch b/tools/e2fsprogs/patches/003-openbsd-compat.patch new file mode 100644 index 0000000000..1f7cdca0e5 --- /dev/null +++ b/tools/e2fsprogs/patches/003-openbsd-compat.patch @@ -0,0 +1,24 @@ +diff -Nur e2fsprogs-1.42.7.orig/lib/blkid/getsize.c e2fsprogs-1.42.7/lib/blkid/getsize.c +--- e2fsprogs-1.42.7.orig/lib/blkid/getsize.c Fri Nov 30 03:40:18 2012 ++++ e2fsprogs-1.42.7/lib/blkid/getsize.c Thu Mar 7 14:21:59 2013 +@@ -26,6 +26,9 @@ + #include <fcntl.h> + #ifdef HAVE_SYS_IOCTL_H + #include <sys/ioctl.h> ++#ifdef __OpenBSD__ ++#include <sys/dkio.h> ++#endif + #endif + #ifdef HAVE_LINUX_FD_H + #include <linux/fd.h> +diff -Nur e2fsprogs-1.42.7.orig/lib/quota/mkquota.c e2fsprogs-1.42.7/lib/quota/mkquota.c +--- e2fsprogs-1.42.7.orig/lib/quota/mkquota.c Wed Jan 2 01:47:20 2013 ++++ e2fsprogs-1.42.7/lib/quota/mkquota.c Thu Mar 7 14:21:59 2013 +@@ -8,6 +8,7 @@ + #include <sys/stat.h> + #include <unistd.h> + #include <errno.h> ++#include <stdint.h> + #include <string.h> + #include <fcntl.h> + diff --git a/tools/e2fsprogs/patches/004-freebsd-compat.patch b/tools/e2fsprogs/patches/004-freebsd-compat.patch new file mode 100644 index 0000000000..5eff49999e --- /dev/null +++ b/tools/e2fsprogs/patches/004-freebsd-compat.patch @@ -0,0 +1,13 @@ +diff -Nur e2fsprogs-1.42.7.orig/lib/ext2fs/tdb.c e2fsprogs-1.42.7/lib/ext2fs/tdb.c +--- e2fsprogs-1.42.7.orig/lib/ext2fs/tdb.c 2012-07-06 15:37:27.000000000 +0200 ++++ e2fsprogs-1.42.7/lib/ext2fs/tdb.c 2013-03-07 14:54:59.000000000 +0100 +@@ -56,7 +56,9 @@ + #include <utime.h> + #endif + #include <sys/stat.h> ++#ifndef __FreeBSD__ + #include <sys/file.h> ++#endif + #include <fcntl.h> + + #ifdef HAVE_SYS_MMAN_H |