X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/51ffc1d58df52a26b0b386f933ad1f66c667d48f..c38283c4869eaa426735e08186218815cab2cf9e:/package/e2fsprogs/Makefile?ds=inline diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index a53e98cf1..b2c1ba306 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -9,16 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs -PKG_VERSION:=1.38 +PKG_VERSION:=1.39 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/e2fsprogs -PKG_MD5SUM:=d774d4412bfb80d12cf3a4fdfd59de5a -PKG_CAT:=zcat - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_MD5SUM:=06f7806782e357797fad1d34b7ced0c6 include $(INCLUDE_DIR)/package.mk @@ -26,10 +22,19 @@ define Package/e2fsprogs SECTION:=utils CATEGORY:=Utilities TITLE:=Ext2/3 filesystem utilities + DEPENDS:=+libuuid DESCRIPTION:=\ This package contains essential ext2 filesystem utilities which consists of \\\ e2fsck, mke2fs, debugfs, dumpe2fs, tune2fs, and most of the other core ext2 \\\ filesystem utilities. +endef + +define Package/libuuid + SECTION:=libs + CATEGORY:=Libraries + TITLE:=DCE compatible Universally Unique Identifier library + DESCRIPTION:=\ + Library for generating DCE compatible Universally Unique Identifiers URL:=http://e2fsprogs.sourceforge.net/ endef @@ -47,15 +52,12 @@ define Package/resize2fs DEPENDS:=e2fsprogs endef -define Build/Configure - $(call Build/Configure/Default, \ - --enable-shared \ - --enable-static \ - --disable-rpath \ - --enable-elf-shlibs \ - --enable-dynamic-e2fsck \ - ) -endef +CONFIGURE_ARGS += \ + --enable-shared \ + --enable-static \ + --disable-rpath \ + --enable-elf-shlibs \ + --enable-dynamic-e2fsck define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR)/util \ @@ -70,6 +72,13 @@ define Build/Compile all install endef +define Build/InstallDev + $(MAKE) -C $(PKG_BUILD_DIR) \ + BUILDCC="$(HOSTCC)" \ + DESTDIR="$(STAGING_DIR)" \ + install-libs +endef + define Package/e2fsprogs/install $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/e2fsck $(1)/usr/sbin/ @@ -77,7 +86,12 @@ define Package/e2fsprogs/install ln -sf mke2fs $(1)/usr/sbin/mkfs.ext2 ln -sf mke2fs $(1)/usr/sbin/mkfs.ext3 $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{blkid,com_err,e2p,ext2fs,uuid}.so.* $(1)/usr/lib/ + $(CP) $(foreach lib,blkid com_err e2p ext2fs,$(PKG_INSTALL_DIR)/usr/lib/lib$(lib).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/tune2fs/install @@ -91,5 +105,6 @@ define Package/resize2fs/install endef $(eval $(call BuildPackage,e2fsprogs)) +$(eval $(call BuildPackage,libuuid)) $(eval $(call BuildPackage,tune2fs)) $(eval $(call BuildPackage,resize2fs))