From b36d9c7c9044f0252a38c401877e8ea29d49da03 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Mon, 6 Apr 2015 20:30:53 +0200
Subject: work in progress, introduction of architecture variables

---
 README                                     | 16 +++++++++-------
 TODOS                                      |  3 ---
 examples/build_gold_image/biruda.conf      |  7 ++++---
 examples/build_gold_image/build_centos6.sh |  4 +---
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/README b/README
index a0826ef..994e8a5 100644
--- a/README
+++ b/README
@@ -23,10 +23,11 @@ Requirements
   http://www.gnu.org/software/gengetopt/gengetopt.html
 * confuse: configuration library
   http://www.nongnu.org/confuse/
-* nanomsg: for communication between nodes (on the same machine or on several machines)
+* nanomsg: for communication between nodes (on the same machine or on
+  several machines)
   http://nanomsg.org/
-* libmicrohttpd: for an embedded web interface (not on Windows, there is
-  no master webserver on Windows currently)
+* libmicrohttpd: for an embedded web interface (not on Windows, there
+  is no master webserver on Windows currently)
   http://www.gnu.org/software/libmicrohttpd/
 * pthreads: for threading support on Windows
   http://sourceware.org/pthreads-win32/
@@ -38,7 +39,8 @@ Requirements
   command line interface (cli)
   https://github.com/antirez/linenoise
   (integrated)
-* http-tiny: simple web client library, used by the 'cli' to talk to the master.
+* http-tiny: simple web client library, used by the 'cli' to talk to
+  the master.
   http://www.demailly.com/~dl/http-tiny-1.2.tar.gz
   (integrated)
 * libdaemon: for daemonizing support on Unix
@@ -46,6 +48,6 @@ Requirements
 Other projects
 --------------
 
-* my own shell-script-based predecessor at http://github.com/Wolframe/build
-* buildbot
-* OpenSuseBuild service
+* my own shell-script-based predecessor (http://github.com/Wolframe/build)
+* buildbot (http://buildbot.net/)
+* OpenSuseBuild service (http://openbuildservice.org/)
diff --git a/TODOS b/TODOS
index 2ea9c62..902bf2a 100644
--- a/TODOS
+++ b/TODOS
@@ -1,7 +1,4 @@
 - http_lib:
   - POST
     - handle answer body too
-- architecture variables in biruda.conf?
-#	command = "/bin/sh ./build_centos6.sh x86_64"
-	command = "/bin/sh ./build_centos6.sh i686"
 - replace json-c with an embeddd and thread-safe libcjson as in Tegano
diff --git a/examples/build_gold_image/biruda.conf b/examples/build_gold_image/biruda.conf
index 1344f6c..6a22a98 100644
--- a/examples/build_gold_image/biruda.conf
+++ b/examples/build_gold_image/biruda.conf
@@ -23,7 +23,8 @@ worker example_build_gold
 
 	execution = direct
 
-	command = "/bin/sh ./build_centos6.sh x86_64"
+	command = "/bin/sh ./build_centos6.sh ${ARCH}"
+#	command = "/bin/sh ./build_centos6.sh x86_64"
 #	command = "/bin/sh ./build_centos6.sh i686"
 }
 
@@ -35,8 +36,8 @@ worker example_run
 
 	execution = direct
 
-	command = "/bin/chroot rhel6-x64 /bin/bash -c '/bin/cat /etc/redhat-release'"
-#	command = "/bin/chroot rhel6-i686 /bin/bash -c '/bin/cat /etc/redhat-release'"
+#	command = "/bin/chroot rhel6-x64 /bin/bash -c '/bin/cat /etc/redhat-release'"
+	command = "/bin/chroot rhel6-i686 /bin/bash -c '/bin/cat /etc/redhat-release'"
 }
 
 webserver
diff --git a/examples/build_gold_image/build_centos6.sh b/examples/build_gold_image/build_centos6.sh
index 1645d79..8a64f57 100755
--- a/examples/build_gold_image/build_centos6.sh
+++ b/examples/build_gold_image/build_centos6.sh
@@ -8,13 +8,11 @@ ARCH=$1
 
 case $ARCH in
 	i686)
-		SHORT_ARCH=i686
 		PACKAGE_ARCH=i386
 		ARCH_SWITCH=linux32
 		;;
 		
 	x86_64)
-		SHORT_ARCH=x64
 		PACKAGE_ARCH=x86_64
 		ARCH_SWITCH=
 		;;
@@ -24,7 +22,7 @@ case $ARCH in
 		exit 1
 esac
 
-CHROOT_DIR=rhel6-${SHORT_ARCH}
+CHROOT_DIR=rhel6-${ARCH}
 
 rm -rf $CHROOT_DIR
 
-- 
cgit v1.2.3-54-g00ecf