From dc5d0b3cd5d1b67c5ce0f04a1eee8cd41ae8bbd8 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <it@startux.de>
Date: Mon, 29 Oct 2012 22:18:15 -0700
Subject: [PATCH] Fix SHA512 checksum on build script, various tweaks

---
 scripts/build.sh                 | 35 +++++++++++++++++---------------
 scripts/portage/server/make.conf | 28 +++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 16 deletions(-)
 create mode 100644 scripts/portage/server/make.conf

diff --git a/scripts/build.sh b/scripts/build.sh
index 819f5d5..edfb9bd 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -11,9 +11,11 @@ GENTOO_MIRROR="http://gentoo.arcticnetwork.ca"
 LOCAL_CACHE=/var/tmp
 IMAGE_ROOT=/mnt/gentoo
 
+HOST_PORTDIR=/mnt/portage
+
 # Import certain values from host config
-_PORTDIR=$(. /etc/make.conf && echo $PORTDIR)
-PORTDIR=${_PORTDIR:-/usr/portage}
+# _PORTDIR=$(. /etc/portage/make.conf && echo $PORTDIR)
+# HOST_PORTDIR=${_PORTDIR:-/usr/portage}
 
 set -o nounset
 
@@ -28,16 +30,16 @@ fetch_file() {
     local DIGEST=$2
     
     FILE_NAME=$(basename ${URL})
-    MD5=$(curl -s -S ${DIGEST} | grep -o -E -e "^[0-9a-f]{32} *${FILE_NAME}$" | awk '{print $1}')
+    SHA512=$(curl -s -S ${DIGEST} | grep -A1 -e "^# SHA512 HASH" | grep -o -E -e "^[0-9a-f]{128} *${FILE_NAME}$" | awk '{print $1}')
 
-    if [ -z ${MD5} ]; then
+    if [ -z ${SHA512} ]; then
         die "Unable to get checksum for ${FILE_NAME}, abort"
     fi
 
     # Do we have local copy
     if [ -f ${LOCAL_CACHE}/${FILE_NAME} ]; then
         # if we have local, correct copy use it
-        if [ $(md5sum ${LOCAL_CACHE}/${FILE_NAME} | awk '{print $1}') = ${MD5} ]; then
+        if [ $(sha512sum ${LOCAL_CACHE}/${FILE_NAME} | awk '{print $1}') = ${SHA512} ]; then
             cp ${LOCAL_CACHE}/${FILE_NAME} .
             return 
         else
@@ -46,7 +48,7 @@ fetch_file() {
     fi
 
     wget -nc ${URL} || die "Cannot download ${URL}!" 
-    if [ $(md5sum ${FILE_NAME} | awk '{print $1}') != ${MD5} ]; then
+    if [ $(sha512sum ${FILE_NAME} | awk '{print $1}') != ${SHA512} ]; then
         die "Invalid checksum for ${FILE_NAME}!"
     fi
 
@@ -116,9 +118,10 @@ setup_chroot() {
     local ROOT_FS=$1
 
     PORTAGE_SNAPSHOT="${GENTOO_MIRROR}/snapshots/portage-latest.tar.bz2"
-    if [ ${BIND_PORTAGE} = 1 ]; then
-        mkdir -p usr/portage
-        mount --bind ${PORTDIR} ${ROOT_FS}/usr/portage || die "Error mounting ${PORTDIR}"
+    if [ ${BIND_PORTAGE} = 1 ] ; then
+        if [ -d ${ROOT_FS}/${BIND_PORTAGE} ] ; then
+            mount --bind ${PORTDIR} ${ROOT_FS}/${BIND_PORTAGE} || die "Error mounting ${PORTDIR}"
+	fi
     else
         # install latest portage snapshot
         if [ ! -d "usr/portage" ] ; then
@@ -139,7 +142,6 @@ setup_chroot() {
     # Compile own kernel later
     # boot + kernel + lib/modules
 
-    # make.conf
     # etc/portage/*
 
     if [ ${INTERACTIVE} = 1 ]; then
@@ -158,8 +160,8 @@ cleanup() {
     local ROOT_FS=$1
     umount ${ROOT_FS}/dev ${ROOT_FS}/sys ${ROOT_FS}/proc
     
-    if [ ${BIND_PORTAGE} = 1 ]; then
-        umount ${ROOT_FS}/usr/portage
+    if [ ${BIND_PORTAGE} != 0 ]; then
+        umount ${ROOT_FS}/${BIND_PORTAGE}
     fi
 }
 
@@ -176,9 +178,9 @@ OPTIONS:
 -a arch, either i686 or x86_64, defaults to uname -m
 -p profile, either hardened or hardened-no-multilib or server(default)
 -t The timezone to use, default to GMT
--r chroot location, default /mnt/gentoo
--c local cache, default /var/tmp
--b bind mount host portage tree instead of installing portage inside chroot 
+-r chroot location (default $IMAGE_ROOT )
+-c local cache (default $LOCAL_CACHE)
+-b bind mount host portage tree (default $HOST_PORTDIR)
 -i interactive, setting up chroot and enter it, skip extracting stage3, portage, etc.
 -v Verbose
 EOF
@@ -193,7 +195,7 @@ fi
 VERBOSE=0
 BIND_PORTAGE=0
 INTERACTIVE=0
-while getopts ":a:p:t:r:c:bvhi" OPTIONS; do
+while getopts ":a:p:t:r:c:m:bvhi" OPTIONS; do
     case $OPTIONS in
         a ) ARCH=$OPTARG;;
         p ) PROFILE=$OPTARG;;
@@ -203,6 +205,7 @@ while getopts ":a:p:t:r:c:bvhi" OPTIONS; do
         r ) IMAGE_ROOT=$OPTARG;;
         c ) LOCAL_CACHE=$OPTARG;;
         i ) INTERACTIVE=1;;
+        m ) MAKE_CONF=$OPTARG;;
         ? )
             usage
             exit
diff --git a/scripts/portage/server/make.conf b/scripts/portage/server/make.conf
new file mode 100644
index 0000000..16c9c1f
--- /dev/null
+++ b/scripts/portage/server/make.conf
@@ -0,0 +1,28 @@
+# These settings were set by the catalyst build script that automatically
+# built this stage.
+# Please consult /usr/share/portage/config/make.conf.example for a more
+# detailed example.
+CFLAGS="-march=native -O2 -pipe"
+CXXFLAGS="${CFLAGS}"
+# WARNING: Changing your CHOST is not something that should be done lightly.
+# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.
+CHOST="x86_64-pc-linux-gnu"
+# These are the USE flags that were used in addition to what is provided by the
+# profile used for building.
+DO_USE="mmx sse sse2"
+
+# USE_NOT="-avahi -abiword -fortran -nfsv3 -arts -ipv6"
+USE_NOT="-avahi -hal -ipv6 -X -gtk -gtk3 -qt4 -kde -webkit -alsa -opengl"
+
+DISTDIR="/mnt/portage/distfiles"
+PORTDIR="/mnt/portage/portage"
+PKGDIR="/mnt/portage/packages"
+
+PORTAGE_TMPDIR="/tmp"
+PORTAGE_NICENESS=10
+MAKEOPTS="-j8"
+CLEAN_DELAY="3"
+
+LINGUAS="en de"
+
+USE="${DO_USE} ${USE_NOT}"