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 81480138247 for ; Thu, 9 Oct 2014 20:38:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73324E0AF6; Thu, 9 Oct 2014 20:38:40 +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 05895E0AF6 for ; Thu, 9 Oct 2014 20:38:39 +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 CE257340431 for ; Thu, 9 Oct 2014 20:38:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87C8476D1 for ; Thu, 9 Oct 2014 20:38:36 +0000 (UTC) From: "Devan Franchini" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Devan Franchini" Message-ID: <1412703172.301b3bcf25835815c5ea93a8f7f962ce943daabc.twitch153@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools-hardened/desktop/ X-VCS-Repository: proj/releng X-VCS-Files: tools-hardened/desktop/rebuild.sh tools-hardened/desktop/toolchain.sh tools-hardened/desktop/update.sh X-VCS-Directories: tools-hardened/desktop/ X-VCS-Committer: twitch153 X-VCS-Committer-Name: Devan Franchini X-VCS-Revision: 301b3bcf25835815c5ea93a8f7f962ce943daabc X-VCS-Branch: master Date: Thu, 9 Oct 2014 20:38:36 +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: 4968a0a9-18e1-4b0a-99e2-3a80004f2381 X-Archives-Hash: b340ef69daa6e2ca3033fb0f61c55bbd commit: 301b3bcf25835815c5ea93a8f7f962ce943daabc Author: Devan Franchini gentoo org> AuthorDate: Mon Oct 6 17:50:02 2014 +0000 Commit: Devan Franchini gentoo org> CommitDate: Tue Oct 7 17:32:52 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=301b3bcf tools-hardened/desktop: Adds KERNEL_DIR env var to emerge calls It is important that when emerging packages no kernel configuration is taken from the running kernel, to fix this all calls to emerge have been prepended with the KERNEL_DIR env var which includes the kernel src dir that emerge should look at inside the chroot. --- tools-hardened/desktop/rebuild.sh | 4 +++- tools-hardened/desktop/toolchain.sh | 8 +++++--- tools-hardened/desktop/update.sh | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tools-hardened/desktop/rebuild.sh b/tools-hardened/desktop/rebuild.sh index 20d52bd..f136502 100755 --- a/tools-hardened/desktop/rebuild.sh +++ b/tools-hardened/desktop/rebuild.sh @@ -1,5 +1,7 @@ #!/bin/bash -l +kernel_dir="/usr/src/linux-tinhat" + source /etc/profile env-update -emerge -evq --keep-going --with-bdeps=y world +KERNEL_DIR="${kernel_dir}" emerge -evq --keep-going --with-bdeps=y world diff --git a/tools-hardened/desktop/toolchain.sh b/tools-hardened/desktop/toolchain.sh index c189a28..2ffefcf 100755 --- a/tools-hardened/desktop/toolchain.sh +++ b/tools-hardened/desktop/toolchain.sh @@ -1,11 +1,13 @@ #!/bin/bash -l +kernel_dir="/usr/src/linux-tinhat" + source /etc/profile env-update -emerge -1q binutils +KERNEL_DIR="${kernel_dir}" emerge -1q binutils source /etc/profile env-update -emerge -1q gcc +KERNEL_DIR="${kernel_dir}" emerge -1q gcc source /etc/profile env-update -emerge -1q glibc +KERNEL_DIR="${kernel_dir}" emerge -1q glibc diff --git a/tools-hardened/desktop/update.sh b/tools-hardened/desktop/update.sh index 4d8f4d0..48b8bf9 100755 --- a/tools-hardened/desktop/update.sh +++ b/tools-hardened/desktop/update.sh @@ -1,5 +1,6 @@ #!/bin/bash -l +kernel_dir="/usr/src/linux-tinhat" #Right now we're commenting out the cairo #rebuild to see if it works in glibc. #hacky - for some reason cairo fails to rebuild @@ -12,4 +13,4 @@ env-update #env-update #emerge -1q x11-libs/cairo -emerge -uvNDq --keep-going --with-bdeps=y world +KERNEL_DIR="${kernel_dir}" emerge -uvNDq --keep-going --with-bdeps=y world