X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Flbuild-sles;h=1f1bb8f4278fc1b0a77854bcfafb5e2875450294;hb=3d1bee6c001f3fb131d8c42a41fbb2adeacd70b9;hp=e1ede26df19eef3ed7969e417c62e3bad0928e65;hpb=eea0b5248b5c08acb1a20f47f40bc5672db62dd4;p=fs%2Flustre-release.git

diff --git a/build/lbuild-sles b/build/lbuild-sles
index e1ede26..1f1bb8f 100644
--- a/build/lbuild-sles
+++ b/build/lbuild-sles
@@ -1,6 +1,7 @@
 # vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4:
 
 DEVEL_KERNEL_TYPE="source"
+RPM_HELPERS_DIR="/usr/lib/rpm"
 
 prepare_and_build_srpm() {
 
@@ -45,7 +46,7 @@ prepare_and_build_srpm() {
     # now build it
     if ! $RPMBUILD $rpmbuildopt $targets \
                    --define "_topdir $TOPDIR" \
-                   $TOPDIR/SOURCES/kernel-$RPMSMPTYPE.spec >&2; then
+                   $TOPDIR/SOURCES/kernel-$RPMSMPTYPE.spec 2>&1; then
         fatal 1 "Failed to build kernel RPM"
     fi
 #fi
@@ -53,7 +54,7 @@ prepare_and_build_srpm() {
     # for SLES, we also need to build the kernel-source rpm
     if ! $RPMBUILD $rpmbuildopt $targets \
                    --define "_topdir $TOPDIR" \
-                   $TOPDIR/SOURCES/kernel-source.spec >&2; then
+                   $TOPDIR/SOURCES/kernel-source.spec 2>&1; then
         fatal 1 "Failed to build kernel source RPM"
     fi
 
@@ -82,3 +83,32 @@ rpm_BUILD_kernel_dirname() {
     fi
     echo kernel${lustre}-${rpmsmptype}-${lnxmaj}${lnxmin}/linux-${lnxmaj}
 }
+
+find_linux_devel_paths() {
+    local path="$1"
+
+    LINUX=$path/usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}
+
+    local objects=$TARGET_ARCH/$RPMSMPTYPE
+    if [ -d $path/usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}-obj/powerpc ]; then
+        objects="powerpc/$TARGET_ARCH"
+    elif [ $TARGET_ARCH == 'i686' ]; then
+        objects="i386/$RPMSMPTYPE"
+    fi
+
+    LINUXOBJ=$path/usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}-obj/$objects
+    LINUXRELEASE=$(find_linux_release "$LINUXOBJ")
+
+    if [ -z "$LINUXRELEASE" ]; then
+        echo "Failed to find linux release in $LINUXOBJ"
+        return 255
+    fi
+
+    return 0
+}
+
+mcpu_rpmbuild_opt() {
+
+    echo "--define \'jobs $(/usr/bin/getconf _NPROCESSORS_ONLN)\'"
+    return 0
+}