e2fsprogs: dont build shared librarys, install to /sbin, enable internal libuuid and libblkid, build and install applet 'fsck', install from busybox package

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/sysutils/busybox/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.busybox.net"
 PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="bash kexec-tools hdparm dosfstools speedcontrol zip pciutils usbutils less procps-ng"
+PKG_DEPENDS="bash kexec-tools hdparm dosfstools e2fsprogs speedcontrol zip pciutils usbutils less procps-ng"
 PKG_BUILD_DEPENDS="toolchain busybox-hosttools"
 PKG_PRIORITY="required"
 PKG_SECTION="system"

packages/sysutils/e2fsprogs/build

@@ -35,18 +35,18 @@ cd $PKG_BUILD
             --enable-symlink-build \
             --enable-compression \
             --enable-htree \
-            --enable-elf-shlibs \
+            --disable-elf-shlibs \
             --disable-bsd-shlibs \
             --disable-profile \
             --disable-jbd-debug \
             --disable-blkid-debug \
             --disable-testio-debug \
-            --disable-libuuid \
-            --disable-libblkid \
+            --enable-libuuid \
+            --enable-libblkid \
             --disable-debugfs \
             --disable-imager \
             --enable-resizer \
-            --disable-fsck \
+            --enable-fsck \
             --disable-e2initrd-helper \
             --enable-tls \
             --disable-uuidd \
@@ -55,5 +55,3 @@ cd $PKG_BUILD
             --with-gnu-ld \
 
 make
-$MAKEINSTALL -C lib/et
-$MAKEINSTALL -C lib/ext2fs

packages/sysutils/e2fsprogs/install

@@ -25,23 +25,17 @@
 mkdir -p $INSTALL/etc
   cp $PKG_BUILD/misc/mke2fs.conf $INSTALL/etc
 
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/e2fsck/e2fsck $INSTALL/usr/bin
-    ln -sf e2fsck $INSTALL/usr/bin/fsck.ext2
-    ln -sf e2fsck $INSTALL/usr/bin/fsck.ext3
-    ln -sf e2fsck $INSTALL/usr/bin/fsck.ext4
-    ln -sf e2fsck $INSTALL/usr/bin/fsck.ext4dev
-  cp $PKG_BUILD/misc/mke2fs $INSTALL/usr/bin
-    ln -sf mke2fs $INSTALL/usr/bin/mkfs.ext2
-    ln -sf mke2fs $INSTALL/usr/bin/mkfs.ext3
-    ln -sf mke2fs $INSTALL/usr/bin/mkfs.ext4
-    ln -sf mke2fs $INSTALL/usr/bin/mkfs.ext4dev
-  cp $PKG_BUILD/resize/resize2fs $INSTALL/usr/bin
-  cp $PKG_BUILD/misc/tune2fs $INSTALL/usr/bin
-
-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
+mkdir -p $INSTALL/sbin
+  cp $PKG_BUILD/misc/fsck $INSTALL/sbin
+  cp $PKG_BUILD/e2fsck/e2fsck $INSTALL/sbin
+    ln -sf e2fsck $INSTALL/sbin/fsck.ext2
+    ln -sf e2fsck $INSTALL/sbin/fsck.ext3
+    ln -sf e2fsck $INSTALL/sbin/fsck.ext4
+    ln -sf e2fsck $INSTALL/sbin/fsck.ext4dev
+  cp $PKG_BUILD/misc/mke2fs $INSTALL/sbin
+    ln -sf mke2fs $INSTALL/sbin/mkfs.ext2
+    ln -sf mke2fs $INSTALL/sbin/mkfs.ext3
+    ln -sf mke2fs $INSTALL/sbin/mkfs.ext4
+    ln -sf mke2fs $INSTALL/sbin/mkfs.ext4dev
+  cp $PKG_BUILD/resize/resize2fs $INSTALL/sbin
+  cp $PKG_BUILD/misc/tune2fs $INSTALL/sbin

packages/sysutils/e2fsprogs/meta

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://e2fsprogs.sourceforge.net/"
 PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME/1.42/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="util-linux"
-PKG_BUILD_DEPENDS="toolchain util-linux"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"
 PKG_SHORTDESC="e2fsprogs: Utilities for use with the ext2 filesystem"

packages/sysutils/parted/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/parted/"
 PKG_URL="http://ftp.gnu.org/gnu/parted/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="util-linux e2fsprogs"
+PKG_DEPENDS="util-linux"
 PKG_BUILD_DEPENDS="toolchain util-linux"
 PKG_PRIORITY="optional"
 PKG_SECTION="system"