[package] uhttpd: make init script less verbose

[openwrt.git] / package / e2fsprogs / Makefile

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index ee6153d..3a6a966 100644 (file)
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -1,6 +1,6 @@
 #
 #

-# Copyright (C) 2006-2008 OpenWrt.org
-#
+# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright 2010 Vertical Communications

 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #


@@ -8,29 +8,27 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs

-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_VERSION:=1.41.12
+PKG_MD5SUM:=1b24a21fc0c2381ef420961cbfec733f

 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/e2fsprogs
 
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/e2fsprogs
 

+PKG_INSTALL:=1
+

 include $(INCLUDE_DIR)/package.mk
 
 define Package/e2fsprogs/Default
   URL:=http://e2fsprogs.sourceforge.net/
 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
 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
 
   DEPENDS:=+libblkid +libuuid +libext2fs +libpthread
 endef
 


@@ -53,7 +51,7 @@ endef
 
 define Package/uuidgen
 $(call Package/e2fsprogs)
 
 define Package/uuidgen
 $(call Package/e2fsprogs)

-  DEPENDS:=libuuid
+  DEPENDS:=+libuuid

   TITLE:=Command line utility to create a new UUID value
 endef
 
   TITLE:=Command line utility to create a new UUID value
 endef
 


@@ -68,7 +66,7 @@ define Package/libblkid
 $(call Package/e2fsprogs/Default)
   SECTION:=libs
   CATEGORY:=Libraries
 $(call Package/e2fsprogs/Default)
   SECTION:=libs
   CATEGORY:=Libraries

-  TITLE:=block device id library
+  TITLE:=Block device id library

 endef
 
 define Package/libblkid/description
 endef
 
 define Package/libblkid/description


@@ -80,37 +78,39 @@ define Package/libext2fs
 $(call Package/e2fsprogs/Default)
   SECTION:=libs
   CATEGORY:=Libraries
 $(call Package/e2fsprogs/Default)
   SECTION:=libs
   CATEGORY:=Libraries

-  TITLE:=ext2/ext3 filesystem library
+  TITLE:=ext2/3/4 filesystem library

 endef
 
 define Package/libext2fs/description
 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
 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
 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
 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
 endef
 
 define Package/blkid
 $(call Package/e2fsprogs)
   TITLE:=Command-line utility to locate/print block device attributes

-  DEPENDS:=libuuid libblkid
+  DEPENDS:=+libuuid +libblkid

 endef
 
 endef
 

+TARGET_CFLAGS += $(FPIC)
+

 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \


@@ -134,7 +134,7 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                BUILDCC="$(HOSTCC)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                BUILDCC="$(HOSTCC)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \

-               all install
+               all

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev


@@ -154,11 +154,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
        $(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_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
 endef
 
 define Package/libuuid/install


@@ -178,7 +180,7 @@ endef
 
 define Package/libext2fs/install
        $(INSTALL_DIR) $(1)/usr/lib
 
 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
 endef
 
 define Package/tune2fs/install