From: Michael Schröder <mls@suse.de>
Date: Tue, 23 Jan 2007 06:30:47 +0000 (+0000)
Subject: - make exclarch an array
X-Git-Tag: obs_2.0~461
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1dc5c98420c5e52b394898a883311adc4e24801;p=tools%2Fobs-build.git

- make exclarch an array
- remount root rw in xen case, needed if root is not reiserfs
---

diff --git a/Build.pm b/Build.pm
index 00a8b00..d8675c6 100644
--- a/Build.pm
+++ b/Build.pm
@@ -718,8 +718,9 @@ sub read_spec {
       $packrel = $1;
       $macros{'release'} = $packrel;
     }
-    if ($main_preamble && ($line =~ /^ExclusiveArch:\s*(\S+)/i)) {
-      $exclarch = $1;
+    if ($main_preamble && ($line =~ /^ExclusiveArch:\s*(.*)/i)) {
+      $exclarch ||= [];
+      push @$exclarch, split(' ', $1);
     }
     if ($main_preamble && ($line =~ /^(BuildRequires|BuildConflicts|\#\!BuildIgnore):\s*(\S.*)$/i)) {
       my $what = $1;
diff --git a/build b/build
index 645f39d..10f10d4 100755
--- a/build
+++ b/build
@@ -192,6 +192,8 @@ if test "$0" = "/.build/build" ; then
     fi
     PATH=$BUILD_DIR:$PATH
     RUNNING_IN_XEN=true
+    mount -orw -n -tproc none /proc 2>/dev/null
+    mount -n -o remount,rw /
     if test -n "$XENSWAP" ; then
 	for i in 1 2 3 4 5 6 7 8 9 10 ; do
 	    test -e "$XENSWAP" && break
@@ -203,7 +205,6 @@ if test "$0" = "/.build/build" ; then
 	cp -a "$XENSWAP" /.build/swapdev
     fi
     umount -l /dev 2>/dev/null
-    mount -orw -n -tproc none /proc 2>/dev/null
     if test -n "$XENSWAP" ; then
 	rm -f "$XENSWAP"
 	cp -a /.build/swapdev "$XENSWAP"