diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-07-28 23:27:29 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-07-28 23:27:29 +0000 |
| commit | 7cea65c80ac9256475989bb4d101b4f3532d47a3 (patch) | |
| tree | 70a228e11e7067c7535a2524e716fc6492fef94a /package/utils/e2fsprogs | |
| parent | ad59c4e6460ecbb889ceadc57358e51b0804d026 (diff) | |
| download | upstream-7cea65c80ac9256475989bb4d101b4f3532d47a3.tar.gz upstream-7cea65c80ac9256475989bb4d101b4f3532d47a3.tar.bz2 upstream-7cea65c80ac9256475989bb4d101b4f3532d47a3.zip | |
e2fsprogs: update to 1.42.8 and add e4defrag
Signed-off-by: Peter Wagner <tripolar@gmx.at>
SVN-Revision: 37588
Diffstat (limited to 'package/utils/e2fsprogs')
4 files changed, 18 insertions, 29 deletions
diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index 0dca9808dd..49e53f4588 100644 --- a/package/utils/e2fsprogs/Makefile +++ b/package/utils/e2fsprogs/Makefile @@ -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 @@ -56,6 +56,12 @@ $(call Package/e2fsprogs) DEPENDS:= +e2fsprogs endef +define Package/e4defrag +$(call Package/e2fsprogs) + TITLE:=Ext4 Filesystem defrag utility + DEPENDS:= +e2fsprogs +endef + define Package/resize2fs $(call Package/e2fsprogs) TITLE:=Ext2 Filesystem resize utility @@ -139,6 +145,11 @@ define Package/tune2fs/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/ endef +define Package/e4defrag/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e4defrag $(1)/usr/sbin/ +endef + define Package/resize2fs/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/resize2fs $(1)/usr/sbin/ @@ -152,5 +163,6 @@ endef $(eval $(call BuildPackage,e2fsprogs)) $(eval $(call BuildPackage,libext2fs)) $(eval $(call BuildPackage,tune2fs)) +$(eval $(call BuildPackage,e4defrag)) $(eval $(call BuildPackage,resize2fs)) $(eval $(call BuildPackage,badblocks)) diff --git a/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch b/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch index e0564dc355..2c84d95008 100644 --- a/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch +++ b/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -5038,7 +5038,7 @@ if test "${ac_cv_lib_blkid_blkid_get_cac +@@ -5111,7 +5111,7 @@ if ${ac_cv_lib_blkid_blkid_get_cache+:} $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11,7 +11,7 @@ --- a/misc/Makefile.in +++ b/misc/Makefile.in -@@ -146,10 +146,10 @@ partinfo: partinfo.o +@@ -147,10 +147,10 @@ partinfo: partinfo.o $(E) " LD $@" $(Q) $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o @@ -24,7 +24,7 @@ tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \ $(DEPLIBUUID) $(DEPLIBQUOTA) $(LIBEXT2FS) -@@ -289,9 +289,9 @@ dumpe2fs.profiled: $(PROFILED_DUMPE2FS_O +@@ -290,9 +290,9 @@ dumpe2fs.profiled: $(DUMPE2FS_OBJS) $(PR $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \ $(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL) @@ -34,5 +34,5 @@ - $(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL) + $(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBUUID) $(LIBINTL) - fsck.profiled: $(PROFILED_FSCK_OBJS) $(PROFILED_DEPLIBBLKID) + fsck.profiled: $(FSCK_OBJS) $(PROFILED_DEPLIBBLKID) $(E) " LD $@" diff --git a/package/utils/e2fsprogs/patches/002-no_malloc_h.patch b/package/utils/e2fsprogs/patches/002-no_malloc_h.patch deleted file mode 100644 index 209b47c1cc..0000000000 --- a/package/utils/e2fsprogs/patches/002-no_malloc_h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/util/symlinks.c -+++ b/util/symlinks.c -@@ -8,7 +8,6 @@ - #endif - #include <stdio.h> - #include <stdlib.h> --#include <malloc.h> - #include <string.h> - #include <fcntl.h> - #include <sys/param.h> diff --git a/package/utils/e2fsprogs/patches/003-com_err_version.patch b/package/utils/e2fsprogs/patches/003-com_err_version.patch deleted file mode 100644 index 62f1e08e71..0000000000 --- a/package/utils/e2fsprogs/patches/003-com_err_version.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/lib/et/Makefile.in -+++ b/lib/et/Makefile.in -@@ -25,8 +25,8 @@ SHARE_FILES= et_c.awk et_h.awk - LIBRARY= libcom_err - LIBDIR= et - --ELF_VERSION = 2.1 --ELF_SO_VERSION = 2 -+ELF_VERSION = 0.0 -+ELF_SO_VERSION = 0 - ELF_IMAGE = libcom_err - ELF_MYDIR = et - ELF_INSTALL_DIR = $(root_libdir) |