diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk index 2223b4a6e5..325dd42b42 100644 --- a/packages/sysutils/util-linux/package.mk +++ b/packages/sysutils/util-linux/package.mk @@ -91,12 +91,18 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-gtk-doc \ --without-systemdsystemunitdir" PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET \ - --enable-static --disable-shared" - -PKG_CONFIGURE_OPTS_INIT="$PKG_CONFIGURE_OPTS_TARGET \ --enable-static --disable-shared \ --disable-libsmartcols " +PKG_CONFIGURE_OPTS_INIT="$PKG_CONFIGURE_OPTS_TARGET \ + --prefix=/ \ + --bindir=/bin \ + --sbindir=/sbin \ + --sysconfdir=/etc \ + --libexecdir=/lib \ + --localstatedir=/var \ + --disable-libsmartcols" + if [ "$SWAP_SUPPORT" = "yes" ]; then PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-libsmartcols" else @@ -129,7 +135,18 @@ post_makeinstall_target() { } post_makeinstall_init() { - rm -rf $INSTALL/usr + rm -rf $INSTALL/bin + rm -rf $INSTALL/sbin + + if [ $INITRAMFS_PARTED_SUPPORT = "yes" ]; then + # install libuuid and libblkid here, needed by 'parted' + rm -rf $INSTALL/lib/libmount.so* + + mkdir -p $INSTALL/sbin + cp mkfs $INSTALL/sbin + else + rm -rf $INSTALL/lib + fi mkdir -p $INSTALL/sbin cp fsck $INSTALL/sbin