In the invirtibuilder, take advantage of the getBinaries function in

[invirt/packages/invirt-dev.git] / invirt-build-release

diff --git a/invirt-build-release b/invirt-build-release
index 480cf36..9dd40c1 100755 (executable)
--- a/invirt-build-release
+++ b/invirt-build-release
@@ -1,4 +1,5 @@
 #!/bin/bash
 #!/bin/bash

+distribution=hardy

 svnuri="$(invirt-getconf svn.uri)"
 
 set -e
 svnuri="$(invirt-getconf svn.uri)"
 
 set -e

@@ -16,17 +17,24 @@ for package; do
              <(dpkg-parsechangelog))
     dpkg-buildpackage -us -uc -rfakeroot -S
     cd ..
              <(dpkg-parsechangelog))
     dpkg-buildpackage -us -uc -rfakeroot -S
     cd ..

-    eval $(perl -ne 'print if s/^(Architecture): /\1=/' ${Source}_${Version}.dsc)
-    case $Architecture in
-      all)
-        sbuild -A -d hardy ${Source}_${Version}.dsc;;
-      any)
-        sbuild -d hardy-amd64 ${Source}_${Version}.dsc
-        sbuild -d hardy-i386  ${Source}_${Version}.dsc;;
-      *)
-        echo "invirt-build-release: arch '$Architecture' unimplemented" >&2
-        exit 1
-    esac
+    arch_any=0
+    sed -ne 's/^Architecture: //p' ${Source}_${Version}.dsc | while read arch; do
+        case "$arch" in
+            all)
+                ;;
+            any)
+                arch_any=1;;
+            *)
+                echo "invirt-build-release: arch '$Architecture' unimplemented" >&2
+                exit 1;;
+        esac
+    done
+    if [ $arch_any -eq 0 ]; then
+        sbuild -d $distribution --arch-all   ${Source}_${Version}.dsc
+    else
+        sbuild -d $distribution --arch amd64 --arch-all ${Source}_${Version}.dsc
+        sbuild -d $distribution --arch i386  ${Source}_${Version}.dsc
+    fi

 
     if ! svn ls $svnuri/package_tags/$Source >/dev/null 2>&1; then
         svn mkdir $svnuri/package_tags/$Source \
 
     if ! svn ls $svnuri/package_tags/$Source >/dev/null 2>&1; then
         svn mkdir $svnuri/package_tags/$Source \