X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=contrib%2Flbuild%2Flbuild-sles12;h=996bb43f6363d9f1646410395ab8fdd4f27e633f;hb=8addb60ebdd8817d95ec109c7697a0dffcc521a1;hp=e2343f23beca601d9a731cb769ac77fafa8b4c76;hpb=48416b83331778f564986b8c96ee6d362123af76;p=fs%2Flustre-release.git

diff --git a/contrib/lbuild/lbuild-sles12 b/contrib/lbuild/lbuild-sles12
index e2343f2..996bb43 100644
--- a/contrib/lbuild/lbuild-sles12
+++ b/contrib/lbuild/lbuild-sles12
@@ -10,22 +10,67 @@ BUILD_GEN+=".0"
 WITH_ZFS="Zfs Not Supported"
 
 source ${LBUILD_DIR}/lbuild-sles
-# LU-6490 work around
-CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-gss"
+
+kernel_srpm_location() {
+
+    local site
+    local kminor
+    local kdir
+    case $lnxmaj in
+    3.12)
+	site="http://mgmt/cobbler/repo_mirror/updates-sles12.1-src"
+	;;
+    4.4)
+	kminor=${lnxmin##.}
+	kdir=updates-sles12.2-src
+	if [ $kminor -eq 114 -o $kminor -eq 120 ]
+	then
+		if [ ${lnxrel%%.*} -gt 92 ]
+		then
+			kdir=updates-sles12.3-src
+		fi
+	elif [ $kminor -eq 103 ]
+	then
+		if [ ${lnxrel%%.*} -lt 90 ]
+		then
+			kdir=updates-sles12.3-src
+		fi
+	elif [ $kminor -eq 82 -o $kminor -gt 91 ]
+	then
+		kdir=updates-sles12.3-src
+	fi
+	site="http://mgmt/cobbler/repo_mirror/$kdir"
+	;;
+    esac
+    echo "$site/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}
+	case $lnxmaj in
+	4.4)
+        sed -i -e "s/^\(Release: *\).*$/\1${lnxrel}_${buildid}/" \
+               -e '/^%setup /a\
+cp  %_sourcedir/linux-4.4-lustre.patch %_builddir/%{name}-%{version}/lustre.patch\
+! grep -q lustre.patch %_sourcedir/series.conf && echo -e "\\n\\tlustre.patch" >> %_sourcedir/series.conf' \
+          SOURCES/kernel-${spec}.spec || \
+            fatal 1 "Error while editing SOURCES/kernel-${spec}.spec"
+	;;
+	3.12)
         sed -i -e "s/^\(Release: *\).*$/\1${lnxrel}_${buildid}/" \
                -e '/^%setup /a\
-cp  %_sourcedir/linux-3.0-lustre.patch %_builddir/%{name}-%{version}/lustre.patch\
+cp  %_sourcedir/linux-3.12-lustre.patch %_builddir/%{name}-%{version}/lustre.patch\
 ! grep -q lustre.patch %_sourcedir/series.conf && echo -e "\\n\\tlustre.patch" >> %_sourcedir/series.conf' \
           SOURCES/kernel-${spec}.spec || \
             fatal 1 "Error while editing SOURCES/kernel-${spec}.spec"
+	;;
+	esac
 
         if $KERNEL_LUSTRE_NAMING; then
             # these are all of the changes needed because we change the package names
@@ -78,6 +123,11 @@ unpack_linux_devel_rpm-sles12() {
         fatal 1 "Unpack error for $kernelrpm"
     fi
 
+    if [ -d "${rpmdir}/../noarch" ]; then
+	rpmdir="${rpmdir%/*}"
+	rpmdir="${rpmdir}/noarch"
+    fi
+
     if ! kernelrpm=$(find_rpm "$rpmdir" provides "^kernel-(lustre-)?devel = $wanted_kernel"); then
         fatal 1 "Could not find the kernel-devel in $rpmdir/"
     fi
@@ -101,15 +151,53 @@ find_linux_rpm-sles12() {
     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/SLES12-SP${PLEV}-Updates/sle-12-$(resolve_arch $TARGET_ARCH)/rpm/$(resolve_arch $TARGET_ARCH)"
+    local wanted_kernel_org="$wanted_kernel"
+
+	if [ "x$rpmfix_diff" != "x" ] && [ $wanted_kernel != "${lnxmaj}${lnxmin}-${lnxrel}${rpmfix_diff}" ]; then
+		wanted_kernel="${lnxmaj}${lnxmin}-${lnxrel}${rpmfix_diff}"
+	fi
+    local site
+    local kminor
+    local kdir
+    case $lnxmaj in
+    3.12)
+	site="http://mgmt/cobbler/repo_mirror/updates-sles12.1-x86_64"
+	;;
+    4.4)
+	kminor=${lnxmin##.}
+	kdir=updates-sles12.2-x86_64
+	if [ $kminor -eq 114 -o $kminor -eq 120 ]
+	then
+		if [ ${lnxrel%%.*} -gt 92 ]
+		then
+			kdir=updates-sles12.3-x86_64
+		fi
+	elif [ $kminor -eq 103 ]
+	then
+		if [ ${lnxrel%%.*} -lt 90 ]
+		then
+			kdir=updates-sles12.3-x86_64
+		fi
+	elif [ $kminor -eq 82 -o $kminor -gt 91 ]
+	then
+		kdir=updates-sles12.3-x86_64
+	fi
+	site="http://mgmt/cobbler/repo_mirror/$kdir"
+	;;
+    4.12)
+	site="http://mgmt/cobbler/repo_mirror/updates-sles12.4-x86_64"
+	;;
+    esac
     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
+        fetch_url "$site/x86_64/kernel-default-devel-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm" $pathtorpms
+    fi
+    # SLES 12 also needs kernel-devel in addition to kernel-default-devel
+    if [ ! -f $pathtorpms/kernel-devel-$wanted_kernel_org.noarch.rpm ]; then
+        fetch_url "$site/noarch/kernel-devel-$wanted_kernel_org.noarch.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
+    if [ ! -f $pathtorpms/kernel-source-$wanted_kernel_org.noarch.rpm ]; then
+        fetch_url "$site/noarch/kernel-source-$wanted_kernel_org.noarch.rpm" $pathtorpms
     fi
     echo "kernel-default-devel-$wanted_kernel.$(resolve_arch $TARGET_ARCH).rpm"