kernel: modules names changed with kernel 2.6.35

[openwrt.git] / package / e2fsprogs / Makefile

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 90866a8..d05e9d8 100644 (file)
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2006-2008 OpenWrt.org
 #
 # 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.
 #
 # 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
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=e2fsprogs

-ifneq ($(findstring "0.9.29",$(CONFIG_UCLIBC_VERSION)),"0.9.29")
-PKG_VERSION:=1.41.9
-PKG_MD5SUM:=52f60a9e19a02f142f5546f1b5681927
-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
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz


@@ -54,7 +49,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
 


@@ -91,27 +86,29 @@ endef
 define Package/tune2fs
 $(call Package/e2fsprogs)
   TITLE:=Ext2 Filesystem tune utility
 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 \


@@ -159,8 +156,9 @@ define Package/e2fsprogs/install
        $(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


@@ -180,7 +178,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