X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/57526713444c2046999884ca1cd1b16c376396b0..6c5121c214fe1a011b6ecabe22dc1372021eda44:/package/e2fsprogs/Makefile

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 6bb89078c..b2c1ba306 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -1,79 +1,110 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# 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.38
+PKG_VERSION:=1.39
 PKG_RELEASE:=1
-PKG_MD5SUM:=d774d4412bfb80d12cf3a4fdfd59de5a
 
-PKG_SOURCE_URL:=@SF/e2fsprogs
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(TOPDIR)/package/rules.mk
-
-$(eval $(call PKG_template,E2FSPROGS,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured:
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--with-gnu-ld \
-			--enable-elf-shlibs \
-			--enable-dynamic-e2fsck \
-	);
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
+PKG_SOURCE_URL:=@SF/e2fsprogs
+PKG_MD5SUM:=06f7806782e357797fad1d34b7ced0c6
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/e2fsprogs
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Ext2/3 filesystem utilities
+  DEPENDS:=+libuuid
+  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
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=DCE compatible Universally Unique Identifier library
+  DESCRIPTION:=\
+		Library for generating DCE compatible Universally Unique Identifiers
+  URL:=http://e2fsprogs.sourceforge.net/
+endef
+
+define Package/tune2fs
+  $(call Package/e2fsprogs)
+  TITLE:=Ext2 Filesystem tune utility
+  DESCRIPTION:=Ext2 Filesystem tune utility
+  DEPENDS:=e2fsprogs
+endef
+
+define Package/resize2fs
+  $(call Package/e2fsprogs)
+  TITLE:=Ext2 Filesystem resize utility
+  DESCRIPTION:=Ext2 Filesystem resize utility
+  DEPENDS:=e2fsprogs
+endef
+
+CONFIGURE_ARGS += \
+	--enable-shared \
+	--enable-static \
+	--disable-rpath \
+	--enable-elf-shlibs \
+	--enable-dynamic-e2fsck
+
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)/util \
 		BUILDCC="$(HOSTCC)" \
 		CFLAGS="" \
+		CPPFLAGS="" \
+		LDFLAGS="" \
 		subst
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		BUILDCC="$(HOSTCC)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
-	touch $@
-	touch $@
-
-$(IPKG_E2FSPROGS):
-	mkdir -p $(IDIR_E2FSPROGS)/sbin
-	cp -fpR $(PKG_INSTALL_DIR)/sbin/e2fsck $(IDIR_E2FSPROGS)/sbin/
-	cp -fpR $(PKG_INSTALL_DIR)/sbin/mke2fs $(IDIR_E2FSPROGS)/sbin/
-	cp -fpR $(PKG_INSTALL_DIR)/sbin/mkfs.ext{2,3} $(IDIR_E2FSPROGS)/sbin/
-	cp -fpR $(PKG_INSTALL_DIR)/sbin/tune2fs $(IDIR_E2FSPROGS)/sbin/
-	mkdir -p $(IDIR_E2FSPROGS)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{blkid,com_err,e2p,ext2fs,uuid}.so.* $(IDIR_E2FSPROGS)/usr/lib/
-	$(RSTRIP) $(IDIR_E2FSPROGS)
-	$(IPKG_BUILD) $(IDIR_E2FSPROGS) $(PACKAGE_DIR)
+endef
+
+define Build/InstallDev
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		BUILDCC="$(HOSTCC)" \
+		DESTDIR="$(STAGING_DIR)" \
+		install-libs
+endef
+
+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/
+	ln -sf mke2fs $(1)/usr/sbin/mkfs.ext2
+	ln -sf mke2fs $(1)/usr/sbin/mkfs.ext3
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(foreach lib,blkid 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/tune2fs/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/tune2fs $(1)/usr/sbin/
+endef
+
+define Package/resize2fs/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/resize2fs $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,e2fsprogs))
+$(eval $(call BuildPackage,libuuid))
+$(eval $(call BuildPackage,tune2fs))
+$(eval $(call BuildPackage,resize2fs))