From c2e5181fe1faec6f375ea7512f60edd802e33946 Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Thu, 4 May 2023 20:32:38 -0700 Subject: [PATCH] LU-16221 build: modify kmodtool for rhel9 Customized kmodtool to use our lbuild location Test-Parameters: trivial \ clientdistro=el9.1 serverdistro=el9.1 testlist=sanity Change-Id: I0573db09fa33a77d93d052fa12d5b07300d7eff6 Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50865 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Alex Deiter Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild-rhel9 | 20 +++++++++ contrib/lbuild/rhel9/rpmmacros.template | 77 +++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 contrib/lbuild/rhel9/rpmmacros.template diff --git a/contrib/lbuild/lbuild-rhel9 b/contrib/lbuild/lbuild-rhel9 index 73327e9..63bdeab 100644 --- a/contrib/lbuild/lbuild-rhel9 +++ b/contrib/lbuild/lbuild-rhel9 @@ -15,6 +15,26 @@ USE_KABI=false RMAC=$HOME/.rpmmacros grep '^%dist' $RMAC &> /dev/null || echo '%dist .el9' >> $RMAC +# We modify the RHEL9 kmodtool script, because it expects +# the kernel source to be in the correct packaged RHEL location. +# lbuild does not put the source in correct packaged RHEL location. +RHEL_KMODTOOL=/usr/lib/rpm/redhat/kmodtool +LBUILD_KMODTOOL="${LBUILD_DIR}/rhel9/kmodtool" +cp $RHEL_KMODTOOL $LBUILD_KMODTOOL +pushd ${LBUILD_DIR}/rhel9 +# Replace the hardcoded /usr/src/kernels with our build path +tmp="${TOPDIR}/reused/usr/src/kernels" +sed -i "s|/usr/src/kernels|${tmp}|g" ${LBUILD_DIR}/rhel9/kmodtool +chmod 755 kmodtool +popd +# Next we replace %kernel_module_package with one that is nearly +# identical, but calls lbuild's modified kmodtool script. +# We need to cleanout the previous entry +sed -i "/^%kernel_module_package/,/^)}$/d" $RMAC +sed -e "s|REPLACE_ME|$LBUILD_KMODTOOL|" -e "s|/usr/src/kernels|${tmp}|g" \ + ${LBUILD_DIR}/rhel9/rpmmacros.template > ${LBUILD_DIR}/rhel9/rpmmacros +cat ${LBUILD_DIR}/rhel9/rpmmacros >> $RMAC + patch_spec_rhel9() { sed -i -e '/Provides: kernel-uname-r =/a\ Provides: kernel-lustre = %{KVRA}%{?1:.%{1}}\\' \ diff --git a/contrib/lbuild/rhel9/rpmmacros.template b/contrib/lbuild/rhel9/rpmmacros.template new file mode 100644 index 0000000..e44eb03 --- /dev/null +++ b/contrib/lbuild/rhel9/rpmmacros.template @@ -0,0 +1,77 @@ +%kernel_module_package(n:v:r:s:f:xp:) %{expand:%( \ + ## An ugly hack: we want kmods to be processed by find-debuginfo, + ## but it processes only files with executable permission set. + ## It is important now since, as of now, if debuginfo package + ## is enabled (and it is enabled), there's an RPM build error + ## as a result of lack of ether absence or emptiness of + ## debugsourcefiles.list (which is likely a bug in RPM, but it looks + ## like that there's no obvious fix and apparently no one have + ## any issues with this). + ## In order to minimise intrusiveness, usually (in Red Hat-built kmod + ## RPMs) *.ko files just have executable permission being set as a part + ## of %build section. There are two caveats with kmp, however: + ## * We have no control over %build section itself (and it wasn't + ## required previously) + ## * Changing the criteria used in find-debuginfo.sh/brp-strip + ## for selecting files that have to undergo debug section separation + ## may introduce regression. + ## As a result, we insert additional hooks in __spec_install_post + ## (__brp_kmod_set_exec_bit in the beginning and + ## __brp_kmod_restore_perms in the end) that (temporarily) set + ## executable permission for *.ko files so find-debuginfo.sh will pick + ## them up. + ## Unfortunately, __spec_install_post's body is copied here since + ## we want that __debug_package macro expansion has been performed + ## lazily and it looks like RPM has no ability to provide a body + ## of a macro verbatim. + if [ 0 = "%{__kmod_brps_added}" ]; then \ + echo "%%global __spec_install_post \\\\" \ + echo " %%{?__brp_kmod_set_exec_bit} \\\\" \ + echo " %%%%{?__debug_package:%%%%{__debug_install_post}} \\\\" \ + echo " %%{__arch_install_post} \\\\" \ + echo " %%{__os_install_post} \\\\" \ + echo " %%{?__brp_kmod_pre_sign_process} \\\\" \ + echo " %%{?__brp_kmod_sign} \\\\" \ + echo " %%{?__brp_kmod_post_sign_process} \\\\" \ + echo " %%{?__brp_kmod_compress} \\\\" \ + echo " %%{?__brp_kmod_post_compress_process} \\\\" \ + echo " %%{?__brp_kmod_restore_perms} \\\\" \ + echo "%%{nil}" \ + fi \ + %global __kmod_brps_added 1 \ + %global kmodtool %{-s*}%{!-s:REPLACE_ME} \ + %global kmod_version %{-v*}%{!-v:%{version}} \ + %global kmod_release %{-r*}%{!-r:%{release}} \ + %global latest_kernel %({ rpm -q --qf '%%{VERSION}-%%{RELEASE}.%%{ARCH}\\\\n' `rpm -qa | egrep "^kernel(-rt|-aarch64)?-devel" | /usr/lib/rpm/redhat/rpmsort -r | head -n 1`; echo '%%%%{nil}'; } | head -n 1) \ + %{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \ + %global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \ + flavors="default" \ + if [ -z "%*" ]; then \ + flavors_to_build=$flavors \ + elif [ -z "%{-x}" ]; then \ + flavors_to_build="%*" \ + else \ + flavors_to_build=" $flavors "\ + for i in %* \ + do \ + flavors_to_build=${flavors_to_build//$i /} + done \ + fi \ + echo "%%global flavors_to_build ${flavors_to_build:-%%nil}" \ + echo "%%global kernel_source() \\\$([ default = \"%%%%{1}\" ] && echo \"/usr/src/kernels//%%%%kverrel\" || %{kmodtool} kernel_source \"%%%%{kverrel}\" \"%%%%{1}\" 2>/dev/null || { ls -Ud \"/usr/src/kernels///%%%%{kverrel}\"[.+]\"%%%%{1}\" | sort -V | tail -n 1; } || echo \"/usr/src/kernels////%%%%kverrel.%%%%1\")" \ + echo "%%global kernel_module_package_moddir() extra" \ + if [ ! -z "%{-f*}" ] \ + then \ + filelist="%{-f*}" \ + fi \ + if [ ! -z "%{-p*}" ] \ + then \ + preamble="%{-p*}" \ + fi \ + nobuildreqs="yes" \ + if [ "x%{kmodtool_generate_buildreqs}" != "x1" ] \ + then \ + nobuildreqs="no" \ + fi \ + override_filelist="$filelist" override_preamble="$preamble" nobuildreqs="$nobuildreqs" kmod_version=%kmod_version kmod_release=%kmod_release %{kmodtool} rpmtemplate %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \ +)} -- 1.8.3.1