From: brian <brian>
Date: Wed, 24 Jun 2009 18:45:06 +0000 (+0000)
Subject: b=19853
X-Git-Tag: v1_9_220~101
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d72e7298699c4167ace2089a01a9b2aa074aeca7;p=fs%2Flustre-release.git

b=19853
i=jack
i=yangsheng

The SLES 11 kernel spec has what is IMHO a bug in that it tries to write to
a file in RPMS/i386 even though you are building i686 RPMs.
---

diff --git a/build/lbuild b/build/lbuild
index 68ce8a2..cfbd8b2 100755
--- a/build/lbuild
+++ b/build/lbuild
@@ -1279,12 +1279,15 @@ build_with_srpm() {
 
 create_rpmbuild_dirs() {
 
-    if [ ! -d RPMS ]; then
-        mkdir -p RPMS
-        for arch in $BUILD_ARCHS; do
-            mkdir RPMS/$arch
-        done
-    fi
+    [ -d RPMS ] || mkdir RPMS
+    for arch in $BUILD_ARCHS; do
+        if [[ $arch = i?86 ]]; then
+            # some stupidity in the sles11 kernel spec requires an RPMS/i386
+            # even if the target arch is i686
+            [ -d RPMS/i386 ] || mkdir RPMS/i386
+        fi
+        [ -d RPMS/$arch ] || mkdir RPMS/$arch
+    done
     [ -d BUILD ] || mkdir BUILD
     [ -d SOURCES ] || mkdir SOURCES
     [ -d SPECS ] || mkdir SPECS