remove 'mke2fs' and instead add the properly named 'e2fsprogs'

5 files changed, 83 insertions, 91 deletions

diff --git a/package/Config.in b/package/Config.in
index 1cb7bc0bb..6c5afedca 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -30,12 +30,12 @@ source "package/berkeleydb/Config.in"
 source "package/bison/Config.in"
 source "package/boa/Config.in"
 source "package/bridge/Config.in"
-source "package/config/Config.in"
 source "package/customize/Config.in"
 source "package/dhcp_relay/Config.in"
 source "package/distcc/Config.in"
 source "package/dnsmasq/Config.in"
 source "package/dropbear_sshd/Config.in"
+source "package/e2fsprogs/Config.in"
 source "package/fakeroot/Config.in"
 source "package/file/Config.in"
 source "package/gettext/Config.in"
@@ -62,7 +62,6 @@ source "package/m4/Config.in"
 source "package/microcom/Config.in"
 source "package/microwin/Config.in"
 source "package/mkdosfs/Config.in"
-source "package/mke2fs/Config.in"
 source "package/mpg123/Config.in"
 source "package/mrouted/Config.in"
 source "package/nano/Config.in"
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
new file mode 100644
index 000000000..63ec3a3cc
--- /dev/null
+++ b/package/e2fsprogs/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_E2FSPROGS
+	bool "e2fsprogs"
+	default n
+	help
+	  The EXT2 file system utilities and libraries
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
new file mode 100644
index 000000000..e853d89a9
--- /dev/null
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -0,0 +1,77 @@
+#############################################################
+#
+# e2fsprogs
+#
+#############################################################
+E2FSPROGS_VER:=1.36
+E2FSPROGS_SOURCE=e2fsprogs-$(E2FSPROGS_VER).tar.gz
+E2FSPROGS_SITE=http://telia.dl.sourceforge.net/sourceforge/e2fsprogs
+E2FSPROGS_DIR=$(BUILD_DIR)/e2fsprogs-$(E2FSPROGS_VER)
+E2FSPROGS_CAT:=zcat
+E2FSPROGS_BINARY:=misc/mke2fs
+E2FSPROGS_TARGET_BINARY:=sbin/mke2fs
+
+$(DL_DIR)/$(E2FSPROGS_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(E2FSPROGS_SITE)/$(E2FSPROGS_SOURCE)
+
+e2fsprogs-source: $(DL_DIR)/$(E2FSPROGS_SOURCE)
+
+$(E2FSPROGS_DIR)/.unpacked: $(DL_DIR)/$(E2FSPROGS_SOURCE)
+	$(E2FSPROGS_CAT) $(DL_DIR)/$(E2FSPROGS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(E2FSPROGS_DIR)/.unpacked
+
+$(E2FSPROGS_DIR)/.configured: $(E2FSPROGS_DIR)/.unpacked
+	(cd $(E2FSPROGS_DIR); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--with-cc=$(TARGET_CC) \
+		--with-linker=$(TARGET_CROSS)ld \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--disable-elf-shlibs --disable-swapfs \
+		--disable-debugfs --disable-imager \
+		--disable-resizer --without-catgets $(DISABLE_NLS) \
+	);
+	touch  $(E2FSPROGS_DIR)/.configured
+
+$(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY): $(E2FSPROGS_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC) -C $(E2FSPROGS_DIR)
+	-$(STRIP) $(E2FSPROGS_DIR)/misc/*
+	touch -c $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY)
+
+$(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY): $(E2FSPROGS_DIR)/$(E2FSPROGS_BINARY)
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(E2FSPROGS_DIR) install
+	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
+		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+	touch -c $(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY)
+
+e2fsprogs: uclibc $(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY)
+
+e2fsprogs-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(E2FSPROGS_DIR) uninstall
+	-$(MAKE) -C $(E2FSPROGS_DIR) clean
+
+e2fsprogs-dirclean:
+	rm -rf $(E2FSPROGS_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_E2FSPROGS)),y)
+TARGETS+=e2fsprogs
+endif
+
diff --git a/package/mke2fs/Config.in b/package/mke2fs/Config.in
deleted file mode 100644
index 27abcc552..000000000
--- a/package/mke2fs/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_MKE2FS
-	bool "mke2fs"
-	default n
-	help
-	  Create ext2 filesystems.
-
-	  http://e2fsprogs.sourceforge.net/
diff --git a/package/mke2fs/mke2fs.mk b/package/mke2fs/mke2fs.mk
deleted file mode 100644
index af0621448..000000000
--- a/package/mke2fs/mke2fs.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#############################################################
-#
-# mke2fs
-#
-#############################################################
-MKE2FS_VER:=1.35
-MKE2FS_SOURCE:=e2fsprogs-$(MKE2FS_VER).tar.gz
-MKE2FS_SITE:=http://aleron.dl.sourceforge.net/sourceforge/e2fsprogs
-MKE2FS_DIR:=$(BUILD_DIR)/e2fsprogs-$(MKE2FS_VER)
-MKE2FS_CAT:=zcat
-MKE2FS_BINARY:=misc/mke2fs
-MKE2FS_TARGET_BINARY:=sbin/mke2fs
-
-$(DL_DIR)/$(MKE2FS_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(MKE2FS_SITE)/$(MKE2FS_SOURCE)
-
-mke2fs-source: $(DL_DIR)/$(MKE2FS_SOURCE)
-
-$(MKE2FS_DIR)/.unpacked: $(DL_DIR)/$(MKE2FS_SOURCE)
-	$(MKE2FS_CAT) $(DL_DIR)/$(MKE2FS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(MKE2FS_DIR)/.unpacked
-
-$(MKE2FS_DIR)/.configured: $(MKE2FS_DIR)/.unpacked
-	(cd $(MKE2FS_DIR); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--with-cc=$(TARGET_CC) \
-		--with-linker=$(TARGET_CROSS)ld \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		--disable-elf-shlibs --disable-swapfs \
-		--disable-debugfs --disable-imager \
-		--disable-resizer --disable-fsck \
-		--without-catgets $(DISABLE_NLS) \
-	);
-	touch  $(MKE2FS_DIR)/.configured
-
-$(MKE2FS_DIR)/$(MKE2FS_BINARY): $(MKE2FS_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(MKE2FS_DIR) \
-		PROG_SUBDIRS=misc
-	$(STRIP) $(MKE2FS_DIR)/misc/mke2fs $(MKE2FS_DIR)/misc/badblocks;
-	touch -c $(MKE2FS_DIR)/misc/mke2fs
-
-$(TARGET_DIR)/$(MKE2FS_TARGET_BINARY): $(MKE2FS_DIR)/$(MKE2FS_BINARY)
-	#$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(MKE2FS_DIR) install
-	#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
-	#	$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
-	# Only install a few selected items...
-	cp -dpf $(MKE2FS_DIR)/misc/mke2fs $(TARGET_DIR)/sbin/mke2fs;
-	cp -dpf $(MKE2FS_DIR)/misc/badblocks $(TARGET_DIR)/sbin/badblocks;
-	touch -c $(TARGET_DIR)/sbin/mke2fs
-
-mke2fs: uclibc $(TARGET_DIR)/$(MKE2FS_TARGET_BINARY)
-
-mke2fs-clean:
-	#$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(MKE2FS_DIR) uninstall
-	rm -f $(TARGET_DIR)/sbin/mke2fs $(TARGET_DIR)/sbin/badblocks;
-	-$(MAKE) -C $(MKE2FS_DIR) clean
-
-mke2fs-dirclean:
-	rm -rf $(MKE2FS_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_MKE2FS)),y)
-TARGETS+=mke2fs
-endif