X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7ef79242f34e5936567a0b6242d75d94ef49df37..51c76d8aa5224233370fa5de9cc1277f5a797a66:/package/e2fsprogs/Makefile?ds=inline diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index cab474611..d05e9d8b1 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2006-2008 OpenWrt.org -# +# Copyright 2010 Vertical Communications # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # @@ -8,13 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs -ifneq ($(CONFIG_UCLIBC_VERSION_0_9_29),y) -PKG_VERSION:=1.41.5 -PKG_MD5SUM:=e218df6c84fc17c1126d31de9472a76c -else -PKG_VERSION:=1.40.11 -PKG_MD5SUM:=004cea70d724fdc7f1a952dffe4c9db8 -endif +PKG_VERSION:=1.41.11 +PKG_MD5SUM:=fb507a40c2706bc38306f150d069e345 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -24,13 +19,14 @@ 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 + TITLE:=Ext2/3/4 filesystem utilities DEPENDS:=+libblkid +libuuid +libext2fs +libpthread endef @@ -53,7 +49,7 @@ endef define Package/uuidgen $(call Package/e2fsprogs) - DEPENDS:=libuuid + DEPENDS:=+libuuid TITLE:=Command line utility to create a new UUID value endef @@ -80,37 +76,39 @@ define Package/libext2fs $(call Package/e2fsprogs/Default) SECTION:=libs CATEGORY:=Libraries - TITLE:=ext2/ext3 filesystem library + TITLE:=ext2/3/4 filesystem library endef define Package/libext2fs/description -libext2fs is a library which can access ext2 and ext3 filesystems. +libext2fs is a library which can access ext2, ext3 and ext4 filesystems. 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 + DEPENDS:= +e2fsprogs endef define Package/blkid $(call Package/e2fsprogs) TITLE:=Command-line utility to locate/print block device attributes - DEPENDS:=libuuid libblkid + DEPENDS:=+libuuid +libblkid endef +TARGET_CFLAGS += $(FPIC) + CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ @@ -154,11 +152,13 @@ define Package/e2fsprogs/install $(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,$(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 - + $(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 @@ -178,7 +178,7 @@ 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.* $(1)/usr/lib/ endef define Package/tune2fs/install