From 301b3bcf25835815c5ea93a8f7f962ce943daabc Mon Sep 17 00:00:00 2001 From: Devan Franchini Date: Mon, 6 Oct 2014 13:50:02 -0400 Subject: [PATCH] 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 20d52bdc..f1365020 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 c189a28d..2ffefcfb 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 4d8f4d0d..48b8bf92 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