X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fe2fsprogs%2FMakefile;h=6b281c0f59b8b61c8a4d556967b50edb4b2b36b9;hp=1bcb6592c92c17bf76a6605d60332fb3f02d2a80;hb=90f58064bec669ccc9ddfb2db17c87f1182442be;hpb=347d4d2c4a88f2c12472382b451a6c2f735daff1 diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 1bcb6592c9..6b281c0f59 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -1,33 +1,36 @@ -# -# Copyright (C) 2006 OpenWrt.org # +# Copyright (C) 2006-2012 OpenWrt.org +# Copyright 2010 Vertical Communications # 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 +PKG_VERSION:=1.42.2 +PKG_MD5SUM:=04f4561a54ad0419248316a00c016baa PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/e2fsprogs -PKG_MD5SUM:=06f7806782e357797fad1d34b7ced0c6 + +PKG_BUILD_DEPENDS:=util-linux +PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk define Package/e2fsprogs/Default URL:=http://e2fsprogs.sourceforge.net/ + SUBMENU:=Filesystem endef define Package/e2fsprogs $(call Package/e2fsprogs/Default) SECTION:=utils CATEGORY:=Utilities - TITLE:=Ext2/3 filesystem utilities - DEPENDS:=+libblkid +libuuid + TITLE:=Ext2/3/4 filesystem utilities + DEPENDS:=+libblkid +libuuid +libext2fs +libpthread +libcom_err endef define Package/e2fsprogs/description @@ -36,47 +39,53 @@ define Package/e2fsprogs/description filesystem utilities. endef -define Package/libuuid +define Package/libext2fs $(call Package/e2fsprogs/Default) SECTION:=libs CATEGORY:=Libraries - TITLE:=DCE compatible Universally Unique Identifier library + TITLE:=ext2/3/4 filesystem library endef -define Package/libuuid/description - Library for generating DCE compatible Universally Unique Identifiers. +define Package/libext2fs/description + libext2fs is a library which can access ext2, ext3 and ext4 filesystems. endef -define Package/libblkid +define Package/libcom_err $(call Package/e2fsprogs/Default) SECTION:=libs CATEGORY:=Libraries - TITLE:=block device id library + TITLE:=Common error description library endef -define Package/libblkid/description - The blkid library which allows system programs like fsck and mount to - quickly and easily find block devices by filesystem UUID and LABEL. +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 - DEPENDS:=e2fsprogs + DEPENDS:= +e2fsprogs endef define Package/resize2fs $(call Package/e2fsprogs) TITLE:=Ext2 Filesystem resize utility - DEPENDS:=e2fsprogs + DEPENDS:= +e2fsprogs endef +define Package/badblocks +$(call Package/e2fsprogs) + TITLE:=Ext2 Filesystem badblocks utility + DEPENDS:= +e2fsprogs +endef + +TARGET_CFLAGS += $(FPIC) + CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static \ - --disable-rpath \ - --enable-elf-shlibs \ - --enable-dynamic-e2fsck + --enable-elf-shlibs \ + --disable-tls \ + --disable-nls \ + --disable-rpath define Build/Prepare $(call Build/Prepare/Default) @@ -93,57 +102,63 @@ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ BUILDCC="$(HOSTCC)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - all install + all 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 + ln -sf mke2fs $(1)/usr/sbin/mkfs.ext4 $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(foreach lib,com_err e2p ext2fs,$(PKG_INSTALL_DIR)/usr/lib/lib$(lib).so.*) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libe2p.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_DIR) $(1)/lib/functions/fsck + $(INSTALL_DATA) ./files/e2fsck.sh $(1)/lib/functions/fsck/ + $(INSTALL_DATA) ./files/e2fsck.conf $(1)/etc/e2fsck.conf endef -define Package/libuuid/install +define Package/libcom_err/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuuid.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcom_err.so.* $(1)/usr/lib/ endef -define Package/libblkid/install +define Package/libext2fs/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libblkid.so.* $(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 $(eval $(call BuildPackage,e2fsprogs)) -$(eval $(call BuildPackage,libuuid)) -$(eval $(call BuildPackage,libblkid)) +$(eval $(call BuildPackage,libext2fs)) +$(eval $(call BuildPackage,libcom_err)) $(eval $(call BuildPackage,tune2fs)) $(eval $(call BuildPackage,resize2fs)) +$(eval $(call BuildPackage,badblocks))