From 5a1f212ce668e666848986f9288c55767014cee3 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 19 Dec 2020 17:51:00 +0000 Subject: [PATCH] nightly build: Include the Oracle UEK kernel git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9214 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- nightly/conf/nightly.conf | 3 +++ scripts/kernel-functions | 35 ++++++++++++++++++++++++++++------- scripts/rhel-rpm-functions | 12 ++++++++---- 3 files changed, 39 insertions(+), 11 deletions(-) diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf index 353bd2958..0c301cac3 100644 --- a/nightly/conf/nightly.conf +++ b/nightly/conf/nightly.conf @@ -73,4 +73,7 @@ ABT_KERNELS=" \ 3.10.0-862.14.4.el7^CentOS^7.5.1804-nc \ 2.6.32-754.29.2.el6^CentOS^6.10-nc \ 2.6.32-696.30.1.el6^CentOS^6.9-nc \ +5.4.17-2036.101.2.el7uek^UEK^7-nc \ +4.14.35-2025.403.3.el7uek^UEK^7-nc \ +4.1.12-124.45.6.el7uek^UEK^7-nc \ " diff --git a/scripts/kernel-functions b/scripts/kernel-functions index 07b1d9d09..b9fdf43e0 100644 --- a/scripts/kernel-functions +++ b/scripts/kernel-functions @@ -129,7 +129,7 @@ function extract_kernel_tree { function patch_kernel { case "$1" in *^*) - # RHEL / CentOS. + # RHEL / CentOS or UEK. ;; *) # See also commit f153b82121b0 ("Sanitize gcc version header @@ -765,7 +765,14 @@ function download_and_extract_distro_rpm { read -a urls -r <<<"$(get_srpm_urls "$distro" "$release" x86_64 | tr '\n' ' ')" for url in "${urls[@]}"; do - wget -q -nc "${url}/kernel-${kver}.src.rpm" && break + case "$distro" in + CentOS) + wget -q -nc "${url}/kernel-${kver}.src.rpm" && break + ;; + UEK) + wget -q -nc "${url}/kernel-uek-${kver}.src.rpm" && break + ;; + esac done ) local tmpdir=kernel-tree-tmp-$$ @@ -773,11 +780,25 @@ function download_and_extract_distro_rpm { mkdir "${tmpdir}" || return $? ( cd "${tmpdir}" && - rpm2cpio "${kernel_downloads}/kernel-${kver}.src.rpm" | - cpio -i --make-directories --quiet && - tar xaf "linux-${kver}.tar."* && - mv "linux-${kver}" ".." && - cd "../linux-${kver}" + case "$distro" in + CentOS) + rpm2cpio "${kernel_downloads}/kernel-${kver}.src.rpm" | + cpio -i --make-directories --quiet && + tar xaf "linux-${kver}.tar."* && + mv "linux-${kver}" ".." && + cd "../linux-${kver}" + ;; + UEK) + rpm2cpio "${kernel_downloads}/kernel-uek-${kver}.src.rpm" | + cpio -i --make-directories --quiet && + tar xaf "linux-${kver/-*}.tar."* && + mv "linux-${kver/-*}" "../linux-${kver}" && + cd "../linux-${kver}" + ;; + *) + echo "Error: unknown distro $distro" + ;; + esac ) || return $? rm -rf "${tmpdir}" } diff --git a/scripts/rhel-rpm-functions b/scripts/rhel-rpm-functions index 69e86aada..3385587e2 100644 --- a/scripts/rhel-rpm-functions +++ b/scripts/rhel-rpm-functions @@ -35,10 +35,12 @@ function get_srpm_urls() { echo "http://ftp.redhat.com/redhat/rhel/rc/7/Server/source/tree/Packages";; esac ;; - "Oracle Linux Server") + "Oracle Linux Server"|"UEK") echo "http://public-yum.oracle.com/repo/OracleLinux/OL${releasevermajor}/${releaseverminor}/base/${arch}/getPackageSource" echo "http://public-yum.oracle.com/repo/OracleLinux/OL${releasevermajor}/latest/${arch}/getPackageSource" - echo "http://public-yum.oracle.com/repo/OracleLinux/OL${releasevermajor}/UEK/latest/${arch}/getPackageSource" + for ((i=4;i<=6;i++)); do + echo "http://public-yum.oracle.com/repo/OracleLinux/OL${releasevermajor}/UEKR$i/${arch}/getPackageSource" + done ;; "Scientific Linux") case $releasever in @@ -87,10 +89,12 @@ function get_rpm_urls() { ;; "Red Hat Enterprise Linux"*) echo "";; - "Oracle Linux Server") + "Oracle Linux Server"|"UEK") echo "http://public-yum.oracle.com/repo/OracleLinux/OL${releasevermajor}/${releaseverminor}/base/${arch}/getPackageSource" echo "http://public-yum.oracle.com/repo/OracleLinux/OL${releasevermajor}/latest/${arch}/getPackageSource" - echo "http://public-yum.oracle.com/repo/OracleLinux/OL${releasevermajor}/UEK/latest/${arch}/getPackageSource" + for ((i=4;i<=6;i++)); do + echo "http://public-yum.oracle.com/repo/OracleLinux/OL${releasevermajor}/UEKR$i/${arch}/getPackageSource" + done ;; "Scientific Linux") case $releasever in