From 19d97b40e86b1cac97c1a6f14d23aabbdc195acf Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 3 Jul 2010 18:31:59 +0200
Subject: [PATCH] e2fsprogs: complete rework of package 'e2fsprogs' needed for
 upcoming installer, move to tools group

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/e2fsprogs/build   | 22 ----------------
 packages/sysutils/e2fsprogs/install | 17 ------------
 packages/sysutils/e2fsprogs/url     |  1 -
 packages/tools/e2fsprogs/build      | 41 +++++++++++++++++++++++++++++
 packages/tools/e2fsprogs/install    | 20 ++++++++++++++
 packages/tools/e2fsprogs/url        |  1 +
 6 files changed, 62 insertions(+), 40 deletions(-)
 delete mode 100755 packages/sysutils/e2fsprogs/build
 delete mode 100755 packages/sysutils/e2fsprogs/install
 delete mode 100644 packages/sysutils/e2fsprogs/url
 create mode 100755 packages/tools/e2fsprogs/build
 create mode 100755 packages/tools/e2fsprogs/install
 create mode 100644 packages/tools/e2fsprogs/url

diff --git a/packages/sysutils/e2fsprogs/build b/packages/sysutils/e2fsprogs/build
deleted file mode 100755
index ecd4b0308f..0000000000
--- a/packages/sysutils/e2fsprogs/build
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-$SCRIPTS/build toolchain
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --disable-libuuid \
-            --disable-libblkid \
-            --disable-debugfs \
-            --disable-imager \
-            --disable-resizer \
-            --disable-uuidd \
-
-make -C lib/et
-make -C lib/ext2fs
-
-$MAKEINSTALL -C lib/et
-$MAKEINSTALL -C lib/ext2fs
diff --git a/packages/sysutils/e2fsprogs/install b/packages/sysutils/e2fsprogs/install
deleted file mode 100755
index 5c6656c51c..0000000000
--- a/packages/sysutils/e2fsprogs/install
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-mkdir -p $INSTALL/bin
-  cp $PKG_BUILD/mount/.libs/mount $INSTALL/bin
-  cp $PKG_BUILD/mount/.libs/umount $INSTALL/bin
-
-mkdir -p $INSTALL/sbin
-  cp $PKG_BUILD/fdisk/sfdisk $INSTALL/sbin
-  cp $PKG_BUILD/misc-utils/.libs/blkid $INSTALL/sbin
-
-mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/shlibs/blkid/src/.libs/libblkid.so* $INSTALL/usr/lib
-  rm -rf $INSTALL/usr/lib/libblkid.so*T
-  cp -PR $PKG_BUILD/shlibs/uuid/src/.libs/libuuid.so* $INSTALL/usr/lib
-  rm -rf $INSTALL/usr/lib/libuuid.so*T
diff --git a/packages/sysutils/e2fsprogs/url b/packages/sysutils/e2fsprogs/url
deleted file mode 100644
index 775aa96da0..0000000000
--- a/packages/sysutils/e2fsprogs/url
+++ /dev/null
@@ -1 +0,0 @@
-http://prdownloads.sourceforge.net/e2fsprogs/e2fsprogs-1.41.11.tar.gz
\ No newline at end of file
diff --git a/packages/tools/e2fsprogs/build b/packages/tools/e2fsprogs/build
new file mode 100755
index 0000000000..d05443f5a0
--- /dev/null
+++ b/packages/tools/e2fsprogs/build
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build toolchain
+$SCRIPTS/build util-linux-ng
+
+cd $PKG_BUILD
+
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --enable-static \
+            --disable-shared \
+            --enable-verbose-makecmds \
+            --enable-symlink-install \
+            --enable-symlink-build \
+            --disable-compression \
+            --disable-htree \
+            --enable-elf-shlibs \
+            --disable-bsd-shlibs \
+            --disable-profile \
+            --disable-jbd-debug \
+            --disable-blkid-debug \
+            --disable-testio-debug \
+            --disable-libuuid \
+            --disable-libblkid \
+            --disable-debugfs \
+            --disable-imager \
+            --disable-resizer \
+            --disable-fsck \
+            --disable-e2initrd-helper \
+            --enable-tls \
+            --disable-uuidd \
+            --disable-nls \
+            --disable-rpath \
+            --with-gnu-ld \
+
+make
+
diff --git a/packages/tools/e2fsprogs/install b/packages/tools/e2fsprogs/install
new file mode 100755
index 0000000000..0de96545ee
--- /dev/null
+++ b/packages/tools/e2fsprogs/install
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/install util-linux-ng
+
+mkdir -p $INSTALL/etc
+  cp $PKG_BUILD/misc/mke2fs.conf $INSTALL/etc
+
+mkdir -p $INSTALL/usr/sbin
+  cp $PKG_BUILD/misc/mke2fs $INSTALL/usr/sbin
+  cp $PKG_BUILD/misc/tune2fs $INSTALL/usr/sbin
+  cp $PKG_BUILD/e2fsck/e2fsck $INSTALL/usr/sbin
+
+mkdir -p $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/*.so.[0-9] $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/e2p/libe2p.so.* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/et/libcom_err.so.* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/ext2fs/libext2fs.so.* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/ss/libss.so.* $INSTALL/usr/lib
diff --git a/packages/tools/e2fsprogs/url b/packages/tools/e2fsprogs/url
new file mode 100644
index 0000000000..edcf5deeab
--- /dev/null
+++ b/packages/tools/e2fsprogs/url
@@ -0,0 +1 @@
+http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/1.41.12/e2fsprogs-1.41.12.tar.gz
\ No newline at end of file