From 43fac44e538bcedff3397456c50752c19f743cae Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@lastsummer.de>
Date: Sun, 9 Nov 2014 11:04:44 +0100
Subject: [PATCH] build: add common file to avoid duplication

---
 build/base.sh   |  7 ++-----
 build/common.sh | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
 build/kernel.sh |  7 ++-----
 3 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100755 build/common.sh

diff --git a/build/base.sh b/build/base.sh
index 20fd19f..fab7788 100755
--- a/build/base.sh
+++ b/build/base.sh
@@ -26,15 +26,12 @@
 
 set -e
 
-# XXX move to common location
-SETSDIR=/tmp/sets
-SRCDIR=/usr/src
-CPUS=1
+. ./common.sh
 
 mkdir -p ${SETSDIR}
 rm -rf ${SETSDIR}/base.txz
 
-# XXX wipe git repostory to avoid dirty build
+git_clear ${SRCDIR}
 
 # XXX needs SRCCONF
 MAKEARGS="__MAKE_CONF="
diff --git a/build/common.sh b/build/common.sh
new file mode 100755
index 0000000..16d21df
--- /dev/null
+++ b/build/common.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# Copyright (c) 2014 Franco Fichtner <franco@lastsummer.de>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+set -e
+
+export SETSDIR=/tmp/sets
+export SRCDIR=/usr/src
+export CPUS=`sysctl kern.smp.cpus | awk '{ print $2 }'`
+
+# print environment to showcase all of our variables                            
+env
+
+git_clear()
+{
+	# Reset the git repository into a known state by
+	# enforcing a hard-reset to HEAD (so you keep your
+	# selected commit, but no manual changes) and all
+	# unknown files are cleared (so it looks like a
+	# freshly cloned repository).
+
+	echo -n ">>> Resetting ${1}... "
+
+	# set used here to avoid errors when git isn't bootstrapped
+	set +e
+	git -C ${1} reset --hard HEAD
+	git -C ${1} clean -xdqf .
+	set -e
+}
diff --git a/build/kernel.sh b/build/kernel.sh
index a7ac317..0c2b4ba 100755
--- a/build/kernel.sh
+++ b/build/kernel.sh
@@ -26,15 +26,12 @@
 
 set -e
 
-# XXX move to common location
-SETSDIR=/tmp/sets
-SRCDIR=/usr/src
-CPUS=1
+. ./common.sh
 
 mkdir -p ${SETSDIR}
 rm -rf ${SETSDIR}/kernel.txz
 
-# XXX wipe git repostory to avoid dirty build
+git_clear ${SRCDIR}
 
 # XXX needs KERNCONF and TARGET_ARCH
 MAKEARGS=""