X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=contrib%2Flbuild%2Flbuild-sles12;h=996bb43f6363d9f1646410395ab8fdd4f27e633f;hb=8addb60ebdd8817d95ec109c7697a0dffcc521a1;hp=cce4e56ea2dabb0200d630f5d3f3c4c6cd10a484;hpb=272c136099bb27550202f0a69d72bc6f344284a4;p=fs%2Flustre-release.git diff --git a/contrib/lbuild/lbuild-sles12 b/contrib/lbuild/lbuild-sles12 index cce4e56..996bb43 100644 --- a/contrib/lbuild/lbuild-sles12 +++ b/contrib/lbuild/lbuild-sles12 @@ -13,7 +13,35 @@ source ${LBUILD_DIR}/lbuild-sles kernel_srpm_location() { - local site="http://mgmt/cobbler/repo_mirror/updates-sles12.1-src" + 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/" } @@ -23,14 +51,26 @@ 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.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 @@ -111,18 +151,53 @@ find_linux_rpm-sles12() { local prefix="$1" local wanted_kernel="$2" local pathtorpms=${3:-"$KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH"} - - local site="http://mgmt/cobbler/repo_mirror/updates-sles12.1-x86_64" + 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/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.noarch.rpm ]; then - fetch_url "$site/noarch/kernel-devel-$wanted_kernel.noarch.rpm" $pathtorpms + 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.noarch.rpm ]; then - fetch_url "$site/noarch/kernel-source-$wanted_kernel.noarch.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"