From 48ef37a2f7b2ab1e6fa09249a56a1af1018b10f6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 25 May 2014 19:22:15 +0200 Subject: [PATCH] e2fsprogs: add initramfs support, include e2fsck to initramfs Signed-off-by: Stephan Raue --- packages/initramfs/package.mk | 2 +- packages/sysutils/e2fsprogs/package.mk | 39 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/packages/initramfs/package.mk b/packages/initramfs/package.mk index e6438a3047..d943aae352 100644 --- a/packages/initramfs/package.mk +++ b/packages/initramfs/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain libc:init busybox:init linux:init plymouth-lite:init diskdev_cmds:init" +PKG_DEPENDS_TARGET="toolchain libc:init busybox:init linux:init plymouth-lite:init diskdev_cmds:init e2fsprogs:init" PKG_PRIORITY="optional" PKG_SECTION="virtual" PKG_SHORTDESC="initramfs: Metapackage for installing initramfs" diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk index b4e0cb2f92..1fb2264617 100644 --- a/packages/sysutils/e2fsprogs/package.mk +++ b/packages/sysutils/e2fsprogs/package.mk @@ -24,6 +24,7 @@ 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_TARGET="toolchain" +PKG_DEPENDS_INIT="toolchain" PKG_PRIORITY="optional" PKG_SECTION="tools" PKG_SHORTDESC="e2fsprogs: Utilities for use with the ext2 filesystem" @@ -63,6 +64,34 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \ --disable-rpath \ --with-gnu-ld" +PKG_CONFIGURE_OPTS_INIT="--prefix=/ \ + --bindir=/bin \ + --sbindir=/sbin \ + --enable-verbose-makecmds \ + --enable-symlink-install \ + --enable-symlink-build \ + --disable-compression \ + --disable-htree \ + --disable-elf-shlibs \ + --disable-bsd-shlibs \ + --disable-profile \ + --disable-jbd-debug \ + --disable-blkid-debug \ + --disable-testio-debug \ + --enable-libuuid \ + --enable-libblkid \ + --disable-debugfs \ + --disable-imager \ + --disable-resizer \ + --enable-fsck \ + --disable-e2initrd-helper \ + --enable-tls \ + --disable-uuidd \ + --disable-nls \ + --disable-rpath \ + --with-gnu-ld" + + pre_configure_target() { # e2fsprogs fails to build with LTO support on gcc-4.9 strip_lto @@ -79,3 +108,13 @@ post_makeinstall_target() { rm -rf $INSTALL/sbin/logsave rm -rf $INSTALL/sbin/mklost+found } + +pre_configure_init() { +# e2fsprogs fails to build with LTO support on gcc-4.9 + strip_lto +} + +makeinstall_init() { + mkdir -p $INSTALL/sbin + cp e2fsck/e2fsck $INSTALL/sbin +}