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 8DCF51387B1 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 CEB89E0B00; 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 286C5E0AFA for ; Thu, 9 Oct 2014 20:38:40 +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 BDCDB340430 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 76A0176D0 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: <1412703171.e35587b117197615902a50077af628fb746d3b15.twitch153@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools-hardened/desktop/ X-VCS-Repository: proj/releng X-VCS-Files: tools-hardened/desktop/fluxbox-run.sh tools-hardened/desktop/gnome3-run.sh tools-hardened/desktop/run-base.sh tools-hardened/desktop/xfce4-run.sh X-VCS-Directories: tools-hardened/desktop/ X-VCS-Committer: twitch153 X-VCS-Committer-Name: Devan Franchini X-VCS-Revision: e35587b117197615902a50077af628fb746d3b15 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: 0cd6e6d1-b0ce-4837-a8b7-8deb99c1f567 X-Archives-Hash: 81e211f5f331cf8dc55db836db31d919 commit: e35587b117197615902a50077af628fb746d3b15 Author: Devan Franchini gentoo org> AuthorDate: Mon Oct 6 17:41:41 2014 +0000 Commit: Devan Franchini gentoo org> CommitDate: Tue Oct 7 17:32:51 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=e35587b1 tools-hardened/desktop: Adds kernel source population in chroot In order to make the building of the ISO non-reliant on any sort of external settings from the build system, the kernel source for needs to be populated into the chroot, along with the pre-made kernel config. --- tools-hardened/desktop/fluxbox-run.sh | 1 + tools-hardened/desktop/gnome3-run.sh | 1 + tools-hardened/desktop/run-base.sh | 7 +++++++ tools-hardened/desktop/xfce4-run.sh | 1 + 4 files changed, 10 insertions(+) diff --git a/tools-hardened/desktop/fluxbox-run.sh b/tools-hardened/desktop/fluxbox-run.sh index a429aad..28bbe50 100755 --- a/tools-hardened/desktop/fluxbox-run.sh +++ b/tools-hardened/desktop/fluxbox-run.sh @@ -80,6 +80,7 @@ setup_confs() { main() { unpack_stage3 mount_dirs + populate_kernel_src populate_etc rebuild_toolchain rebuild_world diff --git a/tools-hardened/desktop/gnome3-run.sh b/tools-hardened/desktop/gnome3-run.sh index 1280520..8b6bc73 100755 --- a/tools-hardened/desktop/gnome3-run.sh +++ b/tools-hardened/desktop/gnome3-run.sh @@ -71,6 +71,7 @@ setup_confs() { main() { unpack_stage3 mount_dirs + populate_kernel_src populate_etc rebuild_toolchain rebuild_world diff --git a/tools-hardened/desktop/run-base.sh b/tools-hardened/desktop/run-base.sh index 12a0ee5..24326b3 100755 --- a/tools-hardened/desktop/run-base.sh +++ b/tools-hardened/desktop/run-base.sh @@ -15,6 +15,12 @@ mount_dirs() { mount --bind /sys/ "${ROOTFS}"/sys/ } +populate_kernel_src() +{ + cp -f files/kernel-config "${KERNEL_SOURCE}" + cp -Rf "${KERNEL_SOURCE}"/ "${ROOTFS}"/usr/src/ +} + populate_etc() { cp -f files/fstab "${ROOTFS}"/etc/fstab cp -f files/resolv.conf "${ROOTFS}"/etc/resolv.conf @@ -117,6 +123,7 @@ setup_systemd() { cleanup_dirs() { rm -rf "${ROOTFS}"/tmp/* + rm -rf "${ROOTFS}"/usr/src/* rm -rf "${ROOTFS}"/var/cache/* rm -rf "${ROOTFS}"/var/log/* rm -rf "${ROOTFS}"/var/tmp/* diff --git a/tools-hardened/desktop/xfce4-run.sh b/tools-hardened/desktop/xfce4-run.sh index 0d5bafc..951dab0 100755 --- a/tools-hardened/desktop/xfce4-run.sh +++ b/tools-hardened/desktop/xfce4-run.sh @@ -74,6 +74,7 @@ setup_confs() { main() { unpack_stage3 mount_dirs + populate_kernel_src populate_etc rebuild_toolchain rebuild_world