aboutsummaryrefslogtreecommitdiffstats
path: root/package/e2fsprogs
diff options
context:
space:
mode:
authorMirko Vogt <mirko@openwrt.org>2012-04-28 19:54:54 +0000
committerMirko Vogt <mirko@openwrt.org>2012-04-28 19:54:54 +0000
commit90f58064bec669ccc9ddfb2db17c87f1182442be (patch)
tree654ff5a33300bfc219aa01802d8dda4cedbc1e5d /package/e2fsprogs
parent1a0ef042317fd83f0fc8cc9ffd434a3419bc5301 (diff)
downloadupstream-90f58064bec669ccc9ddfb2db17c87f1182442be.tar.gz
upstream-90f58064bec669ccc9ddfb2db17c87f1182442be.tar.bz2
upstream-90f58064bec669ccc9ddfb2db17c87f1182442be.zip
update/rename those packages
This patch makes several changes to the util-linux(-ng) package: * rename to util-linux (official name now, util-linux-ng got merged) * bump to last stable version 2.21.1 (was 2.13.0.1 before) * add several new packages * sort packages within Makefile * remove patches which got merged upstream This patch makes some changes to the e2fsprogs package: * bump to last stable version 1.42.2 * libraries moved from e2fsprogs to util-linux - take care of that Signed-off-by: Luka Perkov <openwrt@lukaperkov.net> SVN-Revision: 31499
Diffstat (limited to 'package/e2fsprogs')
-rw-r--r--package/e2fsprogs/Makefile83
-rw-r--r--package/e2fsprogs/patches/000-uclibc_compile_fix.patch15
-rw-r--r--package/e2fsprogs/patches/100-upstream_fix.patch22
3 files changed, 9 insertions, 111 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 79ab92c737..6b281c0f59 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -8,13 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=e2fsprogs
-PKG_VERSION:=1.42
-PKG_MD5SUM:=a3c4ffd7352310ab5e9412965d575610
-PKG_RELEASE:=2
+PKG_VERSION:=1.42.2
+PKG_MD5SUM:=04f4561a54ad0419248316a00c016baa
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/e2fsprogs
+PKG_BUILD_DEPENDS:=util-linux
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
@@ -38,42 +39,6 @@ define Package/e2fsprogs/description
filesystem utilities.
endef
-define Package/libuuid
-$(call Package/e2fsprogs/Default)
- SECTION:=libs
- CATEGORY:=Libraries
- TITLE:=DCE compatible Universally Unique Identifier library
-endef
-
-define Package/libuuid/description
- Library for generating DCE compatible Universally Unique Identifiers.
-endef
-
-define Package/uuidgen
-$(call Package/e2fsprogs)
- DEPENDS:=+libuuid
- TITLE:=Command line utility to create a new UUID value
-endef
-
-define Package/uuidgen/description
- uuidgen program creates a new universally unique identifier (UUID)
- using the libuuid library. The new UUID can reasonably be considered
- unique among all UUIDs created on the local system, and among UUIDs
- created on other systems in the past and in the future.
-endef
-
-define Package/libblkid
-$(call Package/e2fsprogs/Default)
- SECTION:=libs
- CATEGORY:=Libraries
- TITLE:=Block device id library
-endef
-
-define Package/libblkid/description
- The blkid library which allows system programs like fsck and mount to
- quickly and easily find block devices by filesystem UUID and LABEL.
-endef
-
define Package/libext2fs
$(call Package/e2fsprogs/Default)
SECTION:=libs
@@ -82,7 +47,7 @@ $(call Package/e2fsprogs/Default)
endef
define Package/libext2fs/description
-libext2fs is a library which can access ext2, ext3 and ext4 filesystems.
+ libext2fs is a library which can access ext2, ext3 and ext4 filesystems.
endef
define Package/libcom_err
@@ -93,7 +58,7 @@ $(call Package/e2fsprogs/Default)
endef
define Package/libcom_err/description
-libcom_err is a library providing common error descriptions
+ libcom_err is a library providing common error descriptions
endef
define Package/tune2fs
@@ -114,18 +79,12 @@ $(call Package/e2fsprogs)
DEPENDS:= +e2fsprogs
endef
-define Package/blkid
-$(call Package/e2fsprogs)
- TITLE:=Command-line utility to locate/print block device attributes
- DEPENDS:=+libuuid +libblkid +libext2fs +libcom_err +libpthread
-endef
-
TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \
- --enable-elf-shlibs \
- --disable-tls \
- --disable-nls \
+ --enable-elf-shlibs \
+ --disable-tls \
+ --disable-nls \
--disable-rpath
define Build/Prepare
@@ -177,21 +136,6 @@ define Package/libcom_err/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcom_err.so.* $(1)/usr/lib/
endef
-define Package/libuuid/install
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuuid.so.* $(1)/usr/lib/
-endef
-
-define Package/uuidgen/install
- $(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/uuidgen $(1)/usr/bin/
-endef
-
-define Package/libblkid/install
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libblkid.so.* $(1)/usr/lib/
-endef
-
define Package/libext2fs/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libext2fs.so.* $(1)/usr/lib/
@@ -212,18 +156,9 @@ define Package/badblocks/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/badblocks $(1)/usr/sbin/
endef
-define Package/blkid/install
- $(INSTALL_DIR) $(1)/usr/sbin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/blkid $(1)/usr/sbin/
-endef
-
$(eval $(call BuildPackage,e2fsprogs))
-$(eval $(call BuildPackage,libuuid))
-$(eval $(call BuildPackage,uuidgen))
-$(eval $(call BuildPackage,libblkid))
$(eval $(call BuildPackage,libext2fs))
$(eval $(call BuildPackage,libcom_err))
$(eval $(call BuildPackage,tune2fs))
$(eval $(call BuildPackage,resize2fs))
$(eval $(call BuildPackage,badblocks))
-$(eval $(call BuildPackage,blkid))
diff --git a/package/e2fsprogs/patches/000-uclibc_compile_fix.patch b/package/e2fsprogs/patches/000-uclibc_compile_fix.patch
deleted file mode 100644
index a2e8e428e1..0000000000
--- a/package/e2fsprogs/patches/000-uclibc_compile_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Without this patch compiling e2fsprogs 1.42 fails in the case the linux
-kernel headers provide linux/falloc.h but the libc is not implementing
-fallocate() as it is still the case with latest versions of uClibc.
-
---- a/lib/ext2fs/unix_io.c
-+++ b/lib/ext2fs/unix_io.c
-@@ -895,7 +895,7 @@ static errcode_t unix_discard(io_channel
- goto unimplemented;
- #endif
- } else {
--#ifdef FALLOC_FL_PUNCH_HOLE
-+#if defined HAVE_FALLOCATE && defined FALLOC_FL_PUNCH_HOLE
- /*
- * If we are not on block device, try to use punch hole
- * to reclaim free space.
diff --git a/package/e2fsprogs/patches/100-upstream_fix.patch b/package/e2fsprogs/patches/100-upstream_fix.patch
deleted file mode 100644
index 48555a5e46..0000000000
--- a/package/e2fsprogs/patches/100-upstream_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/e2fsck/pass1.c
-+++ b/e2fsck/pass1.c
-@@ -545,7 +545,7 @@ void e2fsck_pass1(e2fsck_t ctx)
- int i;
- __u64 max_sizes;
- ext2_filsys fs = ctx->fs;
-- ext2_ino_t ino;
-+ ext2_ino_t ino = 0;
- struct ext2_inode *inode;
- ext2_inode_scan scan;
- char *block_buf;
---- a/e2fsck/pass1b.c
-+++ b/e2fsck/pass1b.c
-@@ -267,7 +267,7 @@ struct process_block_struct {
- static void pass1b(e2fsck_t ctx, char *block_buf)
- {
- ext2_filsys fs = ctx->fs;
-- ext2_ino_t ino;
-+ ext2_ino_t ino = 0;
- struct ext2_inode inode;
- ext2_inode_scan scan;
- struct process_block_struct pb;