diff options
Diffstat (limited to 'package/e2fsprogs/Makefile')
| -rw-r--r-- | package/e2fsprogs/Makefile | 39 |
1 files changed, 14 insertions, 25 deletions
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index d3e9567e2..b47fe75ed 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= e2fsprogs -PKG_VERSION:= 1.44.2 +PKG_VERSION:= 1.47.2 PKG_RELEASE:= 1 -PKG_HASH:= 8324cf0b6e81805a741d94087b00e99f7e16144f1ee5a413709a1fa6948b126c +PKG_HASH:= 08242e64ca0e8194d9c1caad49762b19209a06318199b63ce74ae4ef2d74e63c PKG_DESCR:= ext2/3/4 filesystem utilities PKG_SECTION:= sys/fs PKG_BUILDDEP:= util-linux @@ -14,23 +14,17 @@ PKG_NEEDS:= threads PKG_URL:= http://e2fsprogs.sourceforge.net/ PKG_SITES:= https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/ PKG_OPTS:= dev -PKG_NOPARALLEL:= 1 PKG_CFLINE_E2FSPROGS:= select BUSYBOX_FSCK PKG_SUBPKGS:= LIBE2FS LIBCOM_ERR LIBSS -PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS -PKG_SUBPKGS+= E2FSCK_STATIC TUNE2FS_STATIC +PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS E4DEFRAG PKGSD_LIBE2FS:= e2fsprogs library PKGSC_LIBE2FS:= libs/misc PKGSD_LIBCOM_ERR:= common error library PKGSC_LIBCOM_ERR:= libs/misc PKGSD_LIBSS:= subsystem command parsing library PKGSC_LIBSS:= libs/misc -PKGSD_E2FSCK_STATIC:= static build of e2fsck -PKGSC_E2FSCK_STATIC:= sys/fs -PKGSD_TUNE2FS_STATIC:= static build of tune2fs -PKGSC_TUNE2FS_STATIC:= sys/fs PKGSD_RESIZE2FS:= ext2/3/4 resize utility PKGSC_RESIZE2FS:= sys/fs PKGSS_RESIZE2FS:= libe2fs libcom-err libblkid @@ -40,6 +34,9 @@ PKGSS_TUNE2FS:= libe2fs libcom-err libblkid libuuid PKGSD_E2FSCK:= ext2/3/4 filesystem check utility PKGSC_E2FSCK:= sys/fs PKGSS_E2FSCK:= libe2fs libcom-err libblkid libuuid +PKGSD_E4DEFRAG:= ext4 filesystem defragmentation utility +PKGSC_E4DEFRAG:= sys/fs +PKGSS_E4DEFRAG:= libe2fs libcom-err libblkid libuuid PKGSD_MKE2FS:= ext2/3/4 filesystem creation utility PKGSC_MKE2FS:= sys/fs PKGSS_MKE2FS:= libe2fs libcom-err libblkid libuuid libncurses @@ -55,14 +52,14 @@ $(eval $(call PKG_template,TUNE2FS,tune2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS $(eval $(call PKG_template,RESIZE2FS,resize2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_RESIZE2FS),$(PKGSD_RESIZE2FS),$(PKGSC_RESIZE2FS))) $(eval $(call PKG_template,MKE2FS,mke2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MKE2FS),$(PKGSD_MKE2FS),$(PKGSC_MKE2FS))) $(eval $(call PKG_template,E2FSCK,e2fsck,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_E2FSCK),$(PKGSD_E2FSCK),$(PKGSC_E2FSCK))) -$(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC})) -$(eval $(call PKG_template,TUNE2FS_STATIC,tune2fs-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC})) +$(eval $(call PKG_template,E4DEFRAG,e4defrag,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_E4DEFRAG),$(PKGSD_E4DEFRAG),$(PKGSC_E4DEFRAG))) HOST_CONFIGURE_ARGS+= --disable-rpath \ --disable-nls \ --disable-uuidd \ --disable-defrag \ - --disable-debugfs + --disable-debugfs \ + --with-crond-dir="$(STAGING_HOST_DIR)/etc" ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) CONFIGURE_ARGS+= --disable-elf-shlibs @@ -73,7 +70,7 @@ endif CONFIGURE_ARGS+= --disable-rpath \ --disable-uuidd \ --disable-testio-debug \ - --disable-defrag \ + --enable-defrag \ --disable-libblkid \ --disable-libuuid \ --disable-debugfs @@ -98,6 +95,10 @@ libe2fs-install: $(CP) $(WRKINST)/usr/lib/lib{e2p,ext2fs}.so.* \ $(IDIR_LIBE2FS)/usr/lib +e4defrag-install: + $(INSTALL_DIR) $(IDIR_E4DEFRAG)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/e4defrag $(IDIR_E4DEFRAG)/usr/sbin + e2fsck-install: $(INSTALL_DIR) $(IDIR_E2FSCK)/usr/sbin $(INSTALL_BIN) $(WRKINST)/usr/sbin/e2fsck $(IDIR_E2FSCK)/usr/sbin @@ -130,17 +131,5 @@ libss-install: $(CP) $(WRKINST)/usr/lib/libss.so* \ $(IDIR_LIBSS)/usr/lib -e2fsck-static-install: - ${MAKE} -C ${WRKBUILD}/e2fsck e2fsck.static - ${INSTALL_DIR} ${IDIR_E2FSCK_STATIC}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static \ - ${IDIR_E2FSCK_STATIC}/usr/sbin/e2fsck - -tune2fs-static-install: - ${MAKE} -C ${WRKBUILD}/misc tune2fs.static - ${INSTALL_DIR} ${IDIR_TUNE2FS_STATIC}/usr/sbin - ${INSTALL_BIN} ${WRKBUILD}/misc/tune2fs.static \ - ${IDIR_TUNE2FS_STATIC}/usr/sbin/tune2fs - include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk |