more cleanup

[openwrt.git] / package / e2fsprogs / Makefile

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 6dbae74..633b555 100644 (file)
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -38,6 +38,16 @@ define Package/libuuid
   URL:=http://e2fsprogs.sourceforge.net/
 endef
 
   URL:=http://e2fsprogs.sourceforge.net/
 endef
 

+define Package/libblkid
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=block device id library
+  DESCRIPTION:=\
+       The blkid library which allows system programs like fsck and mount to quickly\\\
+       and easily find block devices by filesystem UUID and LABEL.
+  URL:=http://e2fsprogs.sourceforge.net/
+endef
+

 define Package/tune2fs
   $(call Package/e2fsprogs)
   TITLE:=Ext2 Filesystem tune utility
 define Package/tune2fs
   $(call Package/e2fsprogs)
   TITLE:=Ext2 Filesystem tune utility


@@ -59,6 +69,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)" \


@@ -90,9 +105,15 @@ define Package/e2fsprogs/install
 endef
 
 define Package/libuuid/install
 endef
 
 define Package/libuuid/install

+       $(INSTALL_DIR) $(1)/usr/lib

        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuuid.so.* $(1)/usr/lib/
 endef
 
        $(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
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/
 define Package/tune2fs/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/


@@ -105,5 +126,6 @@ endef
 
 $(eval $(call BuildPackage,e2fsprogs))
 $(eval $(call BuildPackage,libuuid))
 
 $(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))