X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Futils%2Fe2fsprogs%2FMakefile;h=6932a4b17ae6a8027449551ec955b28a26505a33;hp=783648cf635cf826c44ccf84803d20f9fcf20fc0;hb=192bf087d4c87b6d550290bff6841d1975e0c71b;hpb=d383212f81bd38ab9dfab83533d1d6d46ec4e36d diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index 783648cf63..6932a4b17a 100644 --- a/package/utils/e2fsprogs/Makefile +++ b/package/utils/e2fsprogs/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2014 OpenWrt.org # Copyright 2010 Vertical Communications # 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.43.3 +PKG_MD5SUM:=ce8ef1bbb0d4730f170167284fda156ac9d6bf18db2750eb94af619a81b19927 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -18,6 +18,8 @@ PKG_SOURCE_URL:=@SF/e2fsprogs PKG_BUILD_DEPENDS:=util-linux PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/package.mk define Package/e2fsprogs/Default @@ -35,15 +37,14 @@ endef define Package/e2fsprogs/description This package contains essential ext2 filesystem utilities which consists of - e2fsck, mke2fs, tune2fs, and most of the other core ext2 - filesystem utilities. + e2fsck, mke2fs and most of the other core ext2 filesystem utilities. endef define Package/libext2fs $(call Package/e2fsprogs/Default) - DEPENDS:=+libcom_err SECTION:=libs CATEGORY:=Libraries + DEPENDS:=+libuuid TITLE:=ext2/3/4 filesystem library endef @@ -51,18 +52,6 @@ define Package/libext2fs/description libext2fs is a library which can access ext2, ext3 and ext4 filesystems. endef -define Package/libcom_err -$(call Package/e2fsprogs/Default) - DEPENDS:=+libpthread - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Common error description library -endef - -define Package/libcom_err/description - libcom_err is a library providing common error descriptions -endef - define Package/tune2fs $(call Package/e2fsprogs) TITLE:=Ext2 Filesystem tune utility @@ -81,9 +70,49 @@ $(call Package/e2fsprogs) DEPENDS:= +e2fsprogs endef -TARGET_CFLAGS += $(FPIC) +define Package/dumpe2fs +$(call Package/e2fsprogs) + TITLE:=Ext2 Filesystem information dumping utility + DEPENDS:= +e2fsprogs +endef + +define Package/e2freefrag +$(call Package/e2fsprogs) + TITLE:=Ext2 Filesystem free space fragmentation information utility + DEPENDS:= +e2fsprogs +endef + +define Package/filefrag +$(call Package/e2fsprogs) + TITLE:=Ext2 Filesystem file fragmentation report utility + DEPENDS:= +e2fsprogs +endef + +define Package/debugfs +$(call Package/e2fsprogs) + TITLE:=Ext2 Filesystem debugger + DEPENDS:= +e2fsprogs +endef + +define Package/chattr +$(call Package/e2fsprogs) + TITLE:=Ext2 Filesystem chattr utility + DEPENDS:= +e2fsprogs +endef + +define Package/lsattr +$(call Package/e2fsprogs) + TITLE:=Ext2 Filesystem lsattr utility + DEPENDS:= +e2fsprogs +endef + +TARGET_CFLAGS += $(FPIC) -ffunction-sections -fdata-sections + +CONFIGURE_VARS += \ + ac_cv_lib_pthread_sem_init=no CONFIGURE_ARGS += \ + --disable-testio-debug \ --enable-elf-shlibs \ --disable-libuuid \ --enable-libblkid \ @@ -98,37 +127,53 @@ define Build/Prepare endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/util \ + +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/util \ BUILDCC="$(HOSTCC)" \ CFLAGS="" \ CPPFLAGS="" \ LDFLAGS="" \ + V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1,) \ subst - $(MAKE) -C $(PKG_BUILD_DIR) \ + +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ + LDFLAGS=-Wl,--gc-sections \ BUILDCC="$(HOSTCC)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ LIBBLKID="$(PKG_BUILD_DIR)/lib/libblkid.a -luuid" \ + ELF_OTHER_LIBS="$(TARGET_LDFLAGS) -luuid" \ + SYSLIBS="$(TARGET_LDFLAGS) -ldl -L$(PKG_BUILD_DIR)/lib/ -lcom_err" \ + V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1,) \ all endef define Build/InstallDev - $(MAKE) -C $(PKG_BUILD_DIR) \ - BUILDCC="$(HOSTCC)" \ - DESTDIR="$(1)" \ - install-libs - $(MAKE) -C $(PKG_BUILD_DIR)/lib/ext2fs \ - BUILDCC="$(HOSTCC)" \ - DESTDIR="$(1)" \ - install + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_BUILD_DIR)/lib/ext2fs/ext2fs.pc $(1)/usr/lib/pkgconfig + $(CP) $(PKG_BUILD_DIR)/lib/et/com_err.pc $(1)/usr/lib/pkgconfig + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib/libext2fs.{so,a}* $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib/libcom_err.{so,a}* $(1)/usr/lib + + $(INSTALL_DIR) $(1)/usr/include/ext2fs + $(CP) $(PKG_BUILD_DIR)/lib/ext2fs/*.h $(1)/usr/include/ext2fs + $(INSTALL_DIR) $(1)/usr/include/et + $(CP) $(PKG_BUILD_DIR)/lib/et/*.h $(1)/usr/include/et +endef + +define Package/e2fsprogs/conffiles +/etc/e2fsck.conf endef define Package/e2fsprogs/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e2fsck $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mke2fs $(1)/usr/sbin/ - ln -sf mke2fs $(1)/usr/sbin/mkfs.ext2 - ln -sf mke2fs $(1)/usr/sbin/mkfs.ext3 - ln -sf mke2fs $(1)/usr/sbin/mkfs.ext4 + $(LN) mke2fs $(1)/usr/sbin/mkfs.ext2 + $(LN) mke2fs $(1)/usr/sbin/mkfs.ext3 + $(LN) mke2fs $(1)/usr/sbin/mkfs.ext4 + $(LN) e2fsck $(1)/usr/sbin/fsck.ext2 + $(LN) e2fsck $(1)/usr/sbin/fsck.ext3 + $(LN) e2fsck $(1)/usr/sbin/fsck.ext4 $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libe2p.so.* $(1)/usr/lib/ $(INSTALL_DIR) $(1)/etc/init.d @@ -138,18 +183,25 @@ define Package/e2fsprogs/install endef define Package/libcom_err/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcom_err.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/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libext2fs.so.* \ + $(PKG_INSTALL_DIR)/usr/lib/libcom_err.so.* \ + $(1)/usr/lib/ +endef + +define Package/libext2fs/install_lib + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib/ext2fs/libext2fs.a $(1)/usr/lib/libext2fs_pic.a endef define Package/tune2fs/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/ + $(LN) tune2fs $(1)/usr/sbin/findfs endef define Package/resize2fs/install @@ -162,9 +214,46 @@ define Package/badblocks/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/badblocks $(1)/usr/sbin/ endef +define Package/dumpe2fs/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dumpe2fs $(1)/usr/sbin/ +endef + +define Package/e2freefrag/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e2freefrag $(1)/usr/sbin/ +endef + +define Package/filefrag/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/filefrag $(1)/usr/sbin/ +endef + +define Package/debugfs/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/debugfs $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libss.so.* $(1)/usr/lib/ +endef + +define Package/chattr/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/chattr $(1)/usr/bin/ +endef + +define Package/lsattr/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsattr $(1)/usr/bin/ +endef + $(eval $(call BuildPackage,e2fsprogs)) $(eval $(call BuildPackage,libext2fs)) -$(eval $(call BuildPackage,libcom_err)) $(eval $(call BuildPackage,tune2fs)) $(eval $(call BuildPackage,resize2fs)) $(eval $(call BuildPackage,badblocks)) +$(eval $(call BuildPackage,dumpe2fs)) +$(eval $(call BuildPackage,e2freefrag)) +$(eval $(call BuildPackage,filefrag)) +$(eval $(call BuildPackage,debugfs)) +$(eval $(call BuildPackage,chattr)) +$(eval $(call BuildPackage,lsattr))