summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-04 15:52:11 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-04 17:54:52 +0200
commitbe42d3971c7e816d4ceec9fd3230982d2c1870ab (patch)
treef8aaca90f9782e22361c739136a9789baabe3c43
parentc6a70fc7146123491f82e9f0f05bf991878a709c (diff)
update to latest upstream
-rw-r--r--package/e2fsprogs/Makefile19
-rw-r--r--package/e2fsprogs/patches/patch-lib_ext2fs_unix_io_c26
2 files changed, 8 insertions, 37 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index a93185c31..210921acd 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= e2fsprogs
-PKG_VERSION:= 1.42.9
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 3f8e41e63b432ba114b33f58674563f7
+PKG_VERSION:= 1.42.10
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 62bfe2fe0a194c5c37165789ac2825a8
PKG_DESCR:= ext2/3/4 filesystem utilities
PKG_SECTION:= sys/fs
PKG_DEPENDS:= libpthread
@@ -53,13 +53,12 @@ CONFIGURE_ARGS+= --enable-elf-shlibs \
--disable-libuuid \
--disable-libblkid \
--disable-defrag
-INSTALL_TARGET+= install-libs
-TARGET_LDFLAGS+= -lpthread
-TARGET_CFLAGS+= $(TARGET_CPPFLAGS) -I$(STAGING_TARGET_DIR)/usr/include
+#INSTALL_TARGET+= install-libs
+#TARGET_LDFLAGS+= -lpthread
+#TARGET_CFLAGS+= $(TARGET_CPPFLAGS) -I$(STAGING_TARGET_DIR)/usr/include
MAKE_FLAGS+= BUILD_CC="${CC_FOR_BUILD}" \
- BUILD_CFLAGS="${CFLAGS_FOR_BUILD}" \
- BUILD_LDFLAGS="${LDFLAGS_FOR_BUILD}" \
- BUILD_CPPFLAGS="${CPPFLAGS_FOR_BUILD}"
+ BUILD_CFLAGS="${CFLAGS_FOR_BUILD} ${CPPFLAGS_FOR_BUILD} -I${WRKSRC}/lib -I." \
+ BUILD_LDFLAGS="${LDFLAGS_FOR_BUILD}"
libe2fs-install:
${INSTALL_DIR} ${IDIR_LIBE2FS}/etc
@@ -94,12 +93,10 @@ libcom-err-install:
${INSTALL_DIR} ${IDIR_LIBCOM_ERR}/usr/lib
${CP} ${WRKINST}/usr/lib/libcom_err.so* \
${IDIR_LIBCOM_ERR}/usr/lib
- ${INSTALL_BIN} ${WRKINST}/usr/bin/compile_et ${STAGING_HOST_DIR}/usr/bin
libss-install:
${INSTALL_DIR} ${IDIR_LIBSS}/usr/lib
${CP} ${WRKINST}/usr/lib/libss.so* \
${IDIR_LIBSS}/usr/lib
- ${INSTALL_BIN} ${WRKINST}/usr/bin/mk_cmds ${STAGING_HOST_DIR}/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/e2fsprogs/patches/patch-lib_ext2fs_unix_io_c b/package/e2fsprogs/patches/patch-lib_ext2fs_unix_io_c
deleted file mode 100644
index d0f348b81..000000000
--- a/package/e2fsprogs/patches/patch-lib_ext2fs_unix_io_c
+++ /dev/null
@@ -1,26 +0,0 @@
---- e2fsprogs-1.42.8.orig/lib/ext2fs/unix_io.c 2013-04-22 01:05:50.000000000 +0200
-+++ e2fsprogs-1.42.8/lib/ext2fs/unix_io.c 2013-08-14 13:31:40.000000000 +0200
-@@ -22,6 +22,9 @@
- #endif
-
- #include "config.h"
-+#if HAVE_STDINT_H
-+#include <stdint.h>
-+#endif
- #include <stdio.h>
- #include <string.h>
- #if HAVE_UNISTD_H
-@@ -931,10 +934,10 @@ static errcode_t unix_discard(io_channel
-
- if (channel->flags & CHANNEL_FLAGS_BLOCK_DEVICE) {
- #ifdef BLKDISCARD
-- __uint64_t range[2];
-+ uint64_t range[2];
-
-- range[0] = (__uint64_t)(block) * channel->block_size;
-- range[1] = (__uint64_t)(count) * channel->block_size;
-+ range[0] = (uint64_t)(block) * channel->block_size;
-+ range[1] = (uint64_t)(count) * channel->block_size;
-
- ret = ioctl(data->dev, BLKDISCARD, &range);
- #else