Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-13053 tests: fix conf-sanity call to umount_ldiskfs
[fs/lustre-release.git]
/
contrib
/
lbuild
/
lbuild-sles12
diff --git
a/contrib/lbuild/lbuild-sles12
b/contrib/lbuild/lbuild-sles12
index
6a21843
..
996bb43
100644
(file)
--- a/
contrib/lbuild/lbuild-sles12
+++ b/
contrib/lbuild/lbuild-sles12
@@
-23,7
+23,13
@@
kernel_srpm_location() {
4.4)
kminor=${lnxmin##.}
kdir=updates-sles12.2-src
4.4)
kminor=${lnxmin##.}
kdir=updates-sles12.2-src
- if [ $kminor -eq 103 ]
+ 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
then
if [ ${lnxrel%%.*} -lt 90 ]
then
@@
-160,7
+166,13
@@
find_linux_rpm-sles12() {
4.4)
kminor=${lnxmin##.}
kdir=updates-sles12.2-x86_64
4.4)
kminor=${lnxmin##.}
kdir=updates-sles12.2-x86_64
- if [ $kminor -eq 103 ]
+ 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
then
if [ ${lnxrel%%.*} -lt 90 ]
then
@@
-172,6
+184,9
@@
find_linux_rpm-sles12() {
fi
site="http://mgmt/cobbler/repo_mirror/$kdir"
;;
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
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