Revert "LU-8383 build: Spec file cleanup after LU-5614"

[fs/lustre-release.git] / contrib / lbuild / lbuild-sles

diff --git a/contrib/lbuild/lbuild-sles b/contrib/lbuild/lbuild-sles
index e61b27f..435e88b 100644 (file)
--- a/contrib/lbuild/lbuild-sles
+++ b/contrib/lbuild/lbuild-sles
@@ -2,18 +2,14 @@
 
 # increment this if you have made a change that should force a new kernel
 # to build built
-BUILD_GEN+=".0"        # TT-107: don't cache the BUILD dir (reset major to 5)
+BUILD_GEN+=".1" #LU-3337 add missing build files for sles11sp2 server
 
-DEVEL_KERNEL_TYPE="source"
+DEVEL_KERNEL_TYPE="default-devel"
 RPM_HELPERS_DIR="/usr/lib/rpm"
 
 prepare_and_build_srpm() {
 
     pushd $TOPDIR >/dev/null
-    # all of the specs but one are put into SOURCES, so let's just move
-    # the one lone one in SPECS into SOURCES and just reference them from
-    # there
-    mv SPECS/*.spec SOURCES/
 
     # generate our buildid
     local buildid="lustre${EXTRA_VERSION##*_lustre}"
@@ -48,7 +44,7 @@ prepare_and_build_srpm() {
 #     landing.
 #if false; then
     # now build it
-    if ! $RPMBUILD $rpmbuildopt $targets \
+    if ! rpmbuild $rpmbuildopt $targets \
                    --define "_topdir $TOPDIR" \
                    $TOPDIR/SOURCES/kernel-$RPMSMPTYPE.spec 2>&1; then
         fatal 1 "Failed to build kernel RPM"
@@ -56,7 +52,7 @@ prepare_and_build_srpm() {
 #fi
 
     # for SLES, we also need to build the kernel-source rpm
-    if ! $RPMBUILD $rpmbuildopt $targets \
+    if ! rpmbuild $rpmbuildopt $targets \
                    --define "_topdir $TOPDIR" \
                    $TOPDIR/SOURCES/kernel-source.spec 2>&1; then
         fatal 1 "Failed to build kernel source RPM"
@@ -116,13 +112,6 @@ find_linux_devel_paths() {
 
     LINUX=$path/usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}
     LINUXOBJ=$path/usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}-obj/$(resolve_arch $TARGET_ARCH $PATCHLESS)/$RPMSMPTYPE
-    # XXX this has been commented out in th rhel5 build file for a while
-    # as it says there, it's probably not needed anymore and can be deleted
-    #LINUXRELEASE=$(find_linux_release "$LINUXOBJ")
-    #if [ -z "$LINUXRELEASE" ]; then
-    #    echo "Failed to find linux release in $LINUXOBJ"
-    #    return 255
-    #fi
 
     return 0
 }
@@ -132,3 +121,8 @@ mcpu_rpmbuild_opt() {
     echo "--define \'jobs $(/usr/bin/getconf _NPROCESSORS_ONLN)\'"
     return 0
 }
+
+# This function digs out the linux release from a linux-obj tree
+find_linux_release() {
+    _find_linux_release $LINUXOBJ
+}