remove a broken patch that should have been nuked with the busybox upgrade (#2809)

[openwrt.git] / package / e2fsprogs / Makefile

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 83e609e..0186191 100644 (file)
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -18,28 +18,56 @@ PKG_MD5SUM:=06f7806782e357797fad1d34b7ced0c6
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

+define Package/e2fsprogs/Default
+  URL:=http://e2fsprogs.sourceforge.net/
+endef
+

 define Package/e2fsprogs
 define Package/e2fsprogs

+$(call Package/e2fsprogs/Default)

   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ext2/3 filesystem utilities
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ext2/3 filesystem utilities

-  DESCRIPTION:=\
-       This package contains essential ext2 filesystem utilities which consists of \\\
-       e2fsck, mke2fs, debugfs, dumpe2fs, tune2fs, and most of the other core ext2 \\\
-       filesystem utilities.
-  URL:=http://e2fsprogs.sourceforge.net/
+  DEPENDS:=+libblkid +libuuid
+endef
+
+define Package/e2fsprogs/description
+ This package contains essential ext2 filesystem utilities which consists of 
+ e2fsck, mke2fs, debugfs, dumpe2fs, tune2fs, and most of the other core ext2 
+ 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/libblkid
+$(call Package/e2fsprogs/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=block device id 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.

 endef
 
 define Package/tune2fs
 endef
 
 define Package/tune2fs

-  $(call Package/e2fsprogs)
+$(call Package/e2fsprogs)

   TITLE:=Ext2 Filesystem tune utility
   TITLE:=Ext2 Filesystem tune utility

-  DESCRIPTION:=Ext2 Filesystem tune utility

   DEPENDS:=e2fsprogs
 endef
 
 define Package/resize2fs
   DEPENDS:=e2fsprogs
 endef
 
 define Package/resize2fs

-  $(call Package/e2fsprogs)
+$(call Package/e2fsprogs)

   TITLE:=Ext2 Filesystem resize utility
   TITLE:=Ext2 Filesystem resize utility

-  DESCRIPTION:=Ext2 Filesystem resize utility

   DEPENDS:=e2fsprogs
 endef
 
   DEPENDS:=e2fsprogs
 endef
 


@@ -50,6 +78,11 @@ CONFIGURE_ARGS += \
        --enable-elf-shlibs \
        --enable-dynamic-e2fsck
 
        --enable-elf-shlibs \
        --enable-dynamic-e2fsck
 

+define Build/Prepare
+       $(call Build/Prepare/Default)
+       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/config/
+endef
+

 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR)/util \
                BUILDCC="$(HOSTCC)" \
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR)/util \
                BUILDCC="$(HOSTCC)" \


@@ -63,26 +96,52 @@ define Build/Compile
                all install
 endef
 
                all install
 endef
 

+define Build/InstallDev
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               BUILDCC="$(HOSTCC)" \
+               DESTDIR="$(1)" \
+               install-libs
+endef
+
+define Build/UninstallDev
+       -$(MAKE) -C $(PKG_BUILD_DIR) \
+               BUILDCC="$(HOSTCC)" \
+               DESTDIR="$(STAGING_DIR)" \
+               uninstall-libs
+endef
+

 define Package/e2fsprogs/install
        $(INSTALL_DIR) $(1)/usr/sbin
 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
        $(INSTALL_DIR) $(1)/usr/lib
        ln -sf mke2fs $(1)/usr/sbin/mkfs.ext2
        ln -sf mke2fs $(1)/usr/sbin/mkfs.ext3
        $(INSTALL_DIR) $(1)/usr/lib

-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{blkid,com_err,e2p,ext2fs,uuid}.so.* $(1)/usr/lib/
+       $(CP) $(foreach lib,com_err e2p ext2fs,$(PKG_INSTALL_DIR)/usr/lib/lib$(lib).so.*) $(1)/usr/lib/
+endef
+
+define Package/libuuid/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuuid.so.* $(1)/usr/lib/
+endef
+
+define Package/libblkid/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libblkid.so.* $(1)/usr/lib/

 endef
 
 define Package/tune2fs/install
        $(INSTALL_DIR) $(1)/usr/sbin
 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
 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
 
 $(eval $(call BuildPackage,e2fsprogs))
 endef
 
 $(eval $(call BuildPackage,e2fsprogs))

+$(eval $(call BuildPackage,libuuid))
+$(eval $(call BuildPackage,libblkid))

 $(eval $(call BuildPackage,tune2fs))
 $(eval $(call BuildPackage,resize2fs))
 $(eval $(call BuildPackage,tune2fs))
 $(eval $(call BuildPackage,resize2fs))