X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2Futils%2Fe2fsprogs%2FMakefile;h=b10ba8a8624f28b21e3a5c61f01ea84b3ebdf6a7;hb=89f8a01daba938e77e94ef311233be49c23a7a55;hp=0dca9808dd731f1900850f02a02e1650db802799;hpb=6dbc1bb24de47ec2c6fbb154d1a5ee6a04c6a86f;p=librecmc%2Flibrecmc.git diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index 0dca9808dd..b10ba8a862 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,16 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs -PKG_VERSION:=1.42.4 -PKG_MD5SUM:=b6e296f210d642361b7394437ff0f318 +PKG_VERSION:=1.43.5 +PKG_HASH:=261f3d9ade383fbf032a19140c9c25e998cc0f71a1ae686614fb3ae0eb955a17 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/e2fsprogs +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/tytso/e2fsprogs/v$(PKG_VERSION)/ +PKG_LICENSE:=GPL-2.0 PKG_BUILD_DEPENDS:=util-linux PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/package.mk define Package/e2fsprogs/Default @@ -35,14 +38,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) SECTION:=libs CATEGORY:=Libraries + DEPENDS:=+libuuid TITLE:=ext2/3/4 filesystem library endef @@ -68,6 +71,42 @@ $(call Package/e2fsprogs) DEPENDS:= +e2fsprogs endef +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 += \ @@ -89,27 +128,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/ -l:libcom_err.so.0.0" \ + V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1,) \ all endef +define Build/InstallDev + $(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 @@ -137,6 +202,7 @@ 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 @@ -149,8 +215,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,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))