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 cb1cfa8..435e88b 100644 (file)
--- a/contrib/lbuild/lbuild-sles
+++ b/contrib/lbuild/lbuild-sles
@@ -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"
@@ -126,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)
-       local site="https://nu.novell.com/repo/\$RCE/SLES11-SP${PLEV}-Updates/sle-11-$(resolve_arch $TARGET_ARCH)/rpm/src/"
-
-       echo $site
-}