From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2CF3C13888F for ; Tue, 13 Oct 2015 18:28:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D63FE077F; Tue, 13 Oct 2015 18:28:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E9C6DE077F for ; Tue, 13 Oct 2015 18:28:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 064D3340A36 for ; Tue, 13 Oct 2015 18:28:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE5F1107D for ; Tue, 13 Oct 2015 18:28:05 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1444760874.60d9860a74552dc3d49f8c1735f0068130251c62.zerochaos@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_compile.sh X-VCS-Directories: / X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 60d9860a74552dc3d49f8c1735f0068130251c62 X-VCS-Branch: master Date: Tue, 13 Oct 2015 18:28:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8a877489-b7ff-40bd-899a-ad9ca9bcc0b2 X-Archives-Hash: 02f21fae41428c198d19bd89c01b921c commit: 60d9860a74552dc3d49f8c1735f0068130251c62 Author: Ian Stakenvicius gentoo org> AuthorDate: Tue Oct 13 18:07:55 2015 +0000 Commit: Richard Farina gentoo 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