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 5CA84138A1F for ; Mon, 14 Apr 2014 01:16:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 047BEE0AB5; Mon, 14 Apr 2014 01:16:14 +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 79499E0ABD for ; Mon, 14 Apr 2014 01:16:13 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5035033FF77 for ; Mon, 14 Apr 2014 01:16:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 1A1B61872F for ; Mon, 14 Apr 2014 01:16:11 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1397437170.6d610cf9afd929e4c973780e1d37746ebf3d15ff.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_compile.sh gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 6d610cf9afd929e4c973780e1d37746ebf3d15ff X-VCS-Branch: master Date: Mon, 14 Apr 2014 01:16:11 +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: da9804eb-e121-4aa2-81c1-9649209a11cd X-Archives-Hash: aef3ab462ce0f72499445540075ab85f commit: 6d610cf9afd929e4c973780e1d37746ebf3d15ff Author: Robin H. Johnson gentoo org> AuthorDate: Mon Apr 14 00:55:25 2014 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Apr 14 00:59:30 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=6d610cf9 LVM install fixes. Clean up LVM install to work with non-root and handle errors. Signed-off-by: Robin H. Johnson gentoo.org> --- gen_compile.sh | 7 +++++-- gen_initramfs.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gen_compile.sh b/gen_compile.sh index a90977f..9b5df01 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -468,8 +468,11 @@ compile_lvm() { >> ${LOGFILE} 2>&1 || \ gen_die 'Configure of lvm failed!' print_info 1 'lvm: >> Compiling...' - compile_generic '' utils - compile_generic "install DESTDIR=${TEMP}/lvm/" utils + compile_generic '' utils || gen_die "failed to build LVM" + mkdir -p "${TEMP}/lvm/sbin" + compile_generic "install DESTDIR=${TEMP}/lvm/" utils || gen_die "failed to install LVM" + # Upstream does u-w on files, and this breaks stuff. + chmod -R u+w "${TEMP}/lvm/" cd "${TEMP}/lvm" print_info 1 ' >> Copying to bincache...' diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 26bcdf6..5ac9ac1 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -349,7 +349,7 @@ append_lvm(){ fi else print_info 1 ' LVM: Adding support (compiling binaries)...' - compile_lvm + compile_lvm || gen_die "Could not compile LVM" /bin/tar -jxpf "${LVM_BINCACHE}" -C "${TEMP}/initramfs-lvm-temp" || gen_die "Could not extract lvm binary cache!"; mv ${TEMP}/initramfs-lvm-temp/sbin/lvm.static ${TEMP}/initramfs-lvm-temp/bin/lvm ||