commit: 60d9860a74552dc3d49f8c1735f0068130251c62
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 18:07:55 2015 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 18:27:54 2015 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=60d9860a
Fix build issues with the dmraid module
Attempts at building an initramfs with --dmraid have started to fail very
recently. The failure itself seems to be due to changes to the current
system versions of lvm2, that have brought to light the fact that the
genkernel dmraid has been building using /usr/include/ headers instead of
headers from the genkernel lvm2. Additionally to this, dmraid requires
libdevmapper-event, and the genkernel version of lvm2 doesn't (didn't ever?)
build this.
This commit addresses both issues, by:
1. Adding --enable-dmeventd --enable-cmdlib to the lvm configuration, so
that libdevmapper-event is available to dmraid
2. Adding a --with-devmappert-prefix= to dmraid configure so that
./configure won't try and override it or otherwise get in the way of
the hard-coded paths we add to CFLAGS.
3. Adding a DEVMAPPEREVENT_CFLAGS var as dmraid ./configure erroneously
does not set this var to anything, despite it being used later.
Received nod from Zero_Chaos for the commit.
gen_compile.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gen_compile.sh b/gen_compile.sh
index 97bd36e..99cf37c 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -463,6 +463,7 @@ compile_lvm() {
print_info 1 'lvm: >> Configuring...'
CFLAGS="-fPIC" \
./configure --enable-static_link --prefix=/ \
+ --enable-dmeventd --enable-cmdlib \
--with-lvm1=internal --with-clvmd=none
--with-cluster=none \
--disable-readline --disable-selinux
--with-mirrors=internal \
--with-snapshots=internal --with-pool=internal \
@@ -555,9 +556,12 @@ compile_dmraid() {
LDFLAGS="-L${TEMP}/lvm/lib" \
CFLAGS="-I${TEMP}/lvm/include" \
+ DEVMAPPEREVENT_CFLAGS="-I${TEMP}/lvm/include" \
CPPFLAGS="-I${TEMP}/lvm/include" \
LIBS="-ldevmapper" \
- ./configure --enable-static_link --prefix=${TEMP}/dmraid >>
${LOGFILE} 2>&1 ||
+ ./configure --enable-static_link \
+ --with-devmapper-prefix="${TEMP}/lvm" \
+ --prefix=${TEMP}/dmraid >> ${LOGFILE} 2>&1 ||
gen_die 'Configure of dmraid failed!'
# We dont necessarily have selinux installed yet... look into
