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 a7fffdc..435e88b 100644 (file)
--- a/contrib/lbuild/lbuild-sles
+++ b/contrib/lbuild/lbuild-sles
@@ -4,7 +4,7 @@
 # to build built
 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() {
@@ -44,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"
@@ -52,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"
@@ -112,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
 }
@@ -133,10 +126,3 @@ mcpu_rpmbuild_opt() {
 find_linux_release() {
     _find_linux_release $LINUXOBJ
 }
-
-kernel_srpm_location() {
-
-    local PLEV=$(sed -n -e 's/^PATCHLEVEL = //p' /etc/SuSE-release)
-    echo "https://nu.novell.com/repo/\$RCE/SLES11-SP${PLEV}-Updates/sle-11-$(resolve_arch $TARGET_ARCH)/rpm/src/"
-
-}