X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c4b73fa154ce47702ee9b3bbe621d8f079eb7fa5..8a2403d370f2aa920ea3c9ec17a30d09c8169db0:/package/e2fsprogs/Makefile diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index bb6e20aee..ee6153d5f 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -1,20 +1,24 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs -PKG_VERSION:=1.39 +ifneq ($(findstring "0.9.29",$(CONFIG_UCLIBC_VERSION)),"0.9.29") +PKG_VERSION:=1.41.5 +PKG_MD5SUM:=e218df6c84fc17c1126d31de9472a76c +else +PKG_VERSION:=1.40.11 +PKG_MD5SUM:=004cea70d724fdc7f1a952dffe4c9db8 +endif PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/e2fsprogs -PKG_MD5SUM:=06f7806782e357797fad1d34b7ced0c6 include $(INCLUDE_DIR)/package.mk @@ -27,11 +31,7 @@ $(call Package/e2fsprogs/Default) SECTION:=utils CATEGORY:=Utilities TITLE:=Ext2/3 filesystem utilities - DEPENDS:=+libblkid +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. + DEPENDS:=+libblkid +libuuid +libext2fs +libpthread endef define Package/e2fsprogs/description @@ -51,6 +51,19 @@ define Package/libuuid/description Library for generating DCE compatible Universally Unique Identifiers. endef +define Package/uuidgen +$(call Package/e2fsprogs) + DEPENDS:=libuuid + TITLE:=Command line utility to create a new UUID value +endef + +define Package/uuidgen/description + uuidgen program creates a new universally unique identifier (UUID) + using the libuuid library. The new UUID can reasonably be considered + unique among all UUIDs created on the local system, and among UUIDs + created on other systems in the past and in the future. +endef + define Package/libblkid $(call Package/e2fsprogs/Default) SECTION:=libs @@ -63,6 +76,17 @@ define Package/libblkid/description quickly and easily find block devices by filesystem UUID and LABEL. endef +define Package/libext2fs +$(call Package/e2fsprogs/Default) + SECTION:=libs + CATEGORY:=Libraries + TITLE:=ext2/ext3 filesystem library +endef + +define Package/libext2fs/description +libext2fs is a library which can access ext2 and ext3 filesystems. +endef + define Package/tune2fs $(call Package/e2fsprogs) TITLE:=Ext2 Filesystem tune utility @@ -75,12 +99,25 @@ $(call Package/e2fsprogs) DEPENDS:=e2fsprogs endef +define Package/badblocks +$(call Package/e2fsprogs) + TITLE:=Ext2 Filesystem badblocks utility + DEPENDS:=e2fsprogs +endef + +define Package/blkid +$(call Package/e2fsprogs) + TITLE:=Command-line utility to locate/print block device attributes + DEPENDS:=libuuid libblkid +endef + CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ --disable-rpath \ --enable-elf-shlibs \ - --enable-dynamic-e2fsck + --enable-dynamic-e2fsck \ + --disable-tls define Build/Prepare $(call Build/Prepare/Default) @@ -103,27 +140,25 @@ endef define Build/InstallDev $(MAKE) -C $(PKG_BUILD_DIR) \ BUILDCC="$(HOSTCC)" \ - DESTDIR="$(STAGING_DIR)" \ + DESTDIR="$(1)" \ install-libs - $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/{blkid,com_err,e2p,ext2fs,ss,uuid}.pc - $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/{blkid,com_err,e2p,ext2fs,ss,uuid}.pc -endef - -define Build/UninstallDev - -$(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE) -C $(PKG_BUILD_DIR)/lib/ext2fs \ BUILDCC="$(HOSTCC)" \ - DESTDIR="$(STAGING_DIR)" \ - uninstall-libs + DESTDIR="$(1)" \ + install endef define Package/e2fsprogs/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/e2fsck $(1)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mke2fs $(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 $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(foreach lib,com_err e2p ext2fs,$(PKG_INSTALL_DIR)/usr/lib/lib$(lib).so.*) $(1)/usr/lib/ + $(CP) $(foreach lib,com_err e2p,$(PKG_INSTALL_DIR)/usr/lib/lib$(lib).so.*) $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/e2fsck.init $(1)/etc/init.d/e2fsck + endef define Package/libuuid/install @@ -131,23 +166,47 @@ define Package/libuuid/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuuid.so.* $(1)/usr/lib/ endef +define Package/uuidgen/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/uuidgen $(1)/usr/bin/ +endef + define Package/libblkid/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libblkid.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/ +endef + define Package/tune2fs/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/ endef define Package/resize2fs/install $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/resize2fs $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/resize2fs $(1)/usr/sbin/ +endef + +define Package/badblocks/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/badblocks $(1)/usr/sbin/ +endef + +define Package/blkid/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/blkid $(1)/usr/sbin/ endef $(eval $(call BuildPackage,e2fsprogs)) $(eval $(call BuildPackage,libuuid)) +$(eval $(call BuildPackage,uuidgen)) $(eval $(call BuildPackage,libblkid)) +$(eval $(call BuildPackage,libext2fs)) $(eval $(call BuildPackage,tune2fs)) $(eval $(call BuildPackage,resize2fs)) +$(eval $(call BuildPackage,badblocks)) +$(eval $(call BuildPackage,blkid))