X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=contrib%2Flbuild%2Flbuild-sles11;h=8514f96bc75802530c20c9b0388f25ebfe78c19f;hb=032004cd076bdc69076d8ea455ae2de10d996428;hp=f28750729f38124f8d0488e2a2b5cb83af54eecd;hpb=2d7b2950520918caa0df3ab203c4c5e5c4e3bb50;p=fs%2Flustre-release.git

diff --git a/contrib/lbuild/lbuild-sles11 b/contrib/lbuild/lbuild-sles11
index f287507..8514f96 100644
--- a/contrib/lbuild/lbuild-sles11
+++ b/contrib/lbuild/lbuild-sles11
@@ -5,18 +5,25 @@
 # build on all distributions, update the BUILD_GEN variable in build/lbuild)
 BUILD_GEN+=".0"
 
-# This distro does not support zfs, so define ZFSNOTSUPPORTED
+# This distro does not support zfs, so define WITH_ZFS
 # use words that make the bash log readable.
-ZFSNOTSUPPORTED="Zfs Not Supported"
+WITH_ZFS="Zfs Not Supported"
 
 source ${LBUILD_DIR}/lbuild-sles
 
+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/"
+
+}
+
 edit_specs() {
 
     # edit the SPECs with our changes
     local spec
     (cd $TOPDIR/SOURCES; ./mkspec --release ${lnxrel})
-    for spec in $RPMSMPTYPE source; do
+    for spec in $RPMSMPTYPE source syms; do
         #cp $TOPDIR/SOURCES/kernel-$spec.spec{,.orig}
         sed -i -e "s/^\(Release: *\).*$/\1${lnxrel}_${buildid}/" \
                -e '/^%setup /a\
@@ -67,17 +74,18 @@ unpack_linux_devel_rpm-sles11() {
     local wanted_kernel="${lnxmaj}${lnxmin}-${lnxrel}"
 
     # this is a hack that should go away when the modified lustre kernel
-    # Provides kernel-default-base                        vvvvvvvvv
-    if ! kernelrpm=$(find_rpm "$rpmdir" provides "^kernel-(lustre-)?default-base = $wanted_kernel"); then
-        fatal 1 "Could not find the kernel-default-base in $rpmdir/"
+    # Provides kernel-default-devel                       vvvvvvvvv
+    if ! kernelrpm=$(find_rpm "$rpmdir" provides "^kernel-(lustre-)?default-devel = $wanted_kernel"); then
+        fatal 1 "Could not find the kernel-default-devel in $rpmdir/"
     fi
 
     if ! rpm2cpio < "$rpmdir/$kernelrpm" | cpio -id > /dev/null 2>&1; then
         fatal 1 "Unpack error for $kernelrpm"
     fi
 
-    if ! kernelrpm=$(find_rpm "$rpmdir" provides "^kernel-(lustre-)?default-devel = $wanted_kernel"); then
-        fatal 1 "Could not find the kernel-default-devel in $rpmdir/"
+    # SLES also needs the kernel-source together with the kernel-default-devel
+    if ! kernelrpm=$(find_rpm "$rpmdir" provides "^kernel-source = $wanted_kernel"); then
+        fatal 1 "Could not find the kernel-source in $rpmdir/"
     fi
 
     if ! rpm2cpio < "$rpmdir/$kernelrpm" | cpio -id > /dev/null 2>&1; then
@@ -87,24 +95,21 @@ unpack_linux_devel_rpm-sles11() {
 }
 
 find_linux_rpm-sles11() {
-    local prefix="$1"
-    local wanted_kernel="$2"
-    local pathtorpms=${3:-"${KERNELRPMSBASE}/${lnxmaj}/${DISTRO}/${TARGET_ARCH}"}
-
-    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/$(resolve_arch $TARGET_ARCH)"
-    case $prefix in
-        -devel)
-            fetch_url "$site/kernel-default-base-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm" $pathtorpms
-            fetch_url "$site/kernel-default-devel-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm" $pathtorpms
-            echo "kernel-default-devel-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm"
-            ;;
-        -source)
-            fetch_url "$site/kernel-source-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm" $pathtorpms
-            echo "kernel-source-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm"
-            ;;
-    esac
-
-    return 0
-
+	local prefix="$1"
+	local wanted_kernel="$2"
+	local pathtorpms=${3:-"$KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH"}
+
+	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/$(resolve_arch $TARGET_ARCH)"
+
+	if [ ! -f $pathtorpms/kernel-default-devel-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm ]; then
+		fetch_url "$site/kernel-default-devel-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm" $pathtorpms
+	fi
+	# SLES also needs the kernel-source along with kernel-devel
+	if [ ! -f $pathtorpms/kernel-source-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm ]; then
+		fetch_url "$site/kernel-source-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm" $pathtorpms
+	fi
+	echo "kernel-default-devel-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm"
+
+	return 0
 }