#
-# Copyright (C) 2006-2008 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.41.3
-PKG_RELEASE:=3
+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:=b21d26fc46c584021dc9c444933ee1c2
+
+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 +libext2fs
+ TITLE:=Ext2/3/4 filesystem utilities
+ DEPENDS:=+libblkid +libuuid +libext2fs +libpthread +libcom_err
endef
define Package/e2fsprogs/description
filesystem utilities.
endef
-define Package/libuuid
-$(call Package/e2fsprogs/Default)
- SECTION:=libs
- CATEGORY:=Libraries
- TITLE:=DCE compatible Universally Unique Identifier library
-endef
-
-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
+define Package/libext2fs
$(call Package/e2fsprogs/Default)
SECTION:=libs
CATEGORY:=Libraries
- TITLE:=block device id library
+ TITLE:=ext2/3/4 filesystem 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/libext2fs/description
+ libext2fs is a library which can access ext2, ext3 and ext4 filesystems.
endef
-define Package/libext2fs
+define Package/libcom_err
$(call Package/e2fsprogs/Default)
SECTION:=libs
CATEGORY:=Libraries
- TITLE:=ext2/ext3 filesystem library
+ TITLE:=Common error description library
endef
-define Package/libext2fs/description
-libext2fs is a library which can access ext2 and ext3 filesystems.
+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
+ DEPENDS:= +e2fsprogs
endef
-define Package/blkid
-$(call Package/e2fsprogs)
- TITLE:=Command-line utility to locate/print block device attributes
- DEPENDS:=e2fsprogs
-endef
+TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \
- --enable-shared \
- --enable-static \
- --disable-rpath \
- --enable-elf-shlibs \
- --enable-dynamic-e2fsck \
- --disable-tls
+ --enable-elf-shlibs \
+ --disable-tls \
+ --disable-nls \
+ --disable-rpath
define Build/Prepare
$(call Build/Prepare/Default)
$(MAKE) -C $(PKG_BUILD_DIR) \
BUILDCC="$(HOSTCC)" \
DESTDIR="$(PKG_INSTALL_DIR)" \
- all install
+ all
endef
define Build/InstallDev
$(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/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libe2p.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
- $(INSTALL_DIR) $(1)/usr/lib
- $(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/
+ $(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/libblkid/install
+define Package/libcom_err/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libblkid.so.* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcom_err.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/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libext2fs.so.* $(1)/usr/lib/
endef
define Package/tune2fs/install
$(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,libcom_err))
$(eval $(call BuildPackage,tune2fs))
$(eval $(call BuildPackage,resize2fs))
$(eval $(call BuildPackage,badblocks))
-$(eval $(call BuildPackage,blkid))
projects / openwrt / openwrt.git / blobdiff