From 122674f13f952bab921259da02581c0e57af245e Mon Sep 17 00:00:00 2001 From: "Brian J. Murrell" Date: Thu, 29 May 2014 07:49:46 -0400 Subject: [PATCH] LU-5120 Don't really need the default-base rpm The kernel-default-base is not actually needed to build Lustre on SLES11 so get rid of it. Clean up the fetching of needed packages. Signed-off-by: Brian J. Murrell Change-Id: Ieee2b01f9a8c280de5d2cc4c43ff672539eea7ef Reviewed-on: http://review.whamcloud.com/10485 Tested-by: Jenkins Reviewed-by: Bob Glossman Tested-by: Maloo Reviewed-by: Minh Diep Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild-rhel | 6 ------ contrib/lbuild/lbuild-sles | 9 +-------- contrib/lbuild/lbuild-sles11 | 30 ++++++++++++++---------------- 3 files changed, 15 insertions(+), 30 deletions(-) diff --git a/contrib/lbuild/lbuild-rhel b/contrib/lbuild/lbuild-rhel index 3a7d378..a81aff5 100644 --- a/contrib/lbuild/lbuild-rhel +++ b/contrib/lbuild/lbuild-rhel @@ -159,12 +159,6 @@ find_linux_devel_paths() { LINUX=$path/usr/src/kernels/${lnxmaj}${lnxmin}-${lnxrel}${DEVEL_PATH_ARCH_DELIMETER:-"-"}${ARCH} # RHEL doesn't have the -obj tree LINUXOBJ="" - # XXX - i don't think we need this any more - #LINUXRELEASE=$(find_linux_release "$LINUX") - #if [ -z "$LINUXRELEASE" ]; then - # echo "Failed to find linux release in $LINUX" - # return 255 - #fi return 0 } diff --git a/contrib/lbuild/lbuild-sles b/contrib/lbuild/lbuild-sles index a7fffdc..8b8e1b3 100644 --- a/contrib/lbuild/lbuild-sles +++ b/contrib/lbuild/lbuild-sles @@ -4,7 +4,7 @@ # to build built BUILD_GEN+=".1" #LU-3337 add missing build files for sles11sp2 server -DEVEL_KERNEL_TYPE="source" +DEVEL_KERNEL_TYPE="default-devel" RPM_HELPERS_DIR="/usr/lib/rpm" prepare_and_build_srpm() { @@ -112,13 +112,6 @@ find_linux_devel_paths() { LINUX=$path/usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel} LINUXOBJ=$path/usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}-obj/$(resolve_arch $TARGET_ARCH $PATCHLESS)/$RPMSMPTYPE - # XXX this has been commented out in th rhel5 build file for a while - # as it says there, it's probably not needed anymore and can be deleted - #LINUXRELEASE=$(find_linux_release "$LINUXOBJ") - #if [ -z "$LINUXRELEASE" ]; then - # echo "Failed to find linux release in $LINUXOBJ" - # return 255 - #fi return 0 } diff --git a/contrib/lbuild/lbuild-sles11 b/contrib/lbuild/lbuild-sles11 index f287507..bed32e9 100644 --- a/contrib/lbuild/lbuild-sles11 +++ b/contrib/lbuild/lbuild-sles11 @@ -67,17 +67,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 @@ -93,17 +94,14 @@ find_linux_rpm-sles11() { 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 + 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 -- 1.8.3.1