6a73d7992a
A patch[1] to the kernel spec file changed the separator that is used for kernel flavor designation from "." to "+", which broke kmodtool and %kernel_module_package in multiple places. Try to accomodate it by accepting both "+" and "." during parsing, and guessing which one should be used for kernel osurce path generation. PS. It looks like the analogous breakage was before, when it was changed from "-" to ".". May be we should start support it back again as well. [1] https://lists.fedoraproject.org/pipermail/kernel/2013-June/004262.html * kmodtool (get_verrel, get_variant): Accept both "." and "+" as separators. (get_variant_char, print_variant_char, print_kernel_source): New functions. (get_filelist): Convert "+%1" in file list to $dotvariant, in addition to ".%1" and "-%1". (get_rpmtemplate): Determine a char that is used as a variant separator. Use it in $dotvariant. (usage): Mention "veriant_char" and "kernel_source" commands. * macros.kmp (%kernel_module_package): Use "kernel_source" command in "%kernel_source" definition when non-default variant is used; fall back to ls-based heuristics when it is not available (for example, when a version of kmodtool that doesn't support this command is used). Resolves: #2002887 Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
51 lines
2.2 KiB
Plaintext
51 lines
2.2 KiB
Plaintext
# Use these macros to differentiate between RH and other KMP implementation(s).
|
|
redhat_kernel_module_package 1
|
|
kernel_module_package_release 1
|
|
|
|
%__find_provides /usr/lib/rpm/redhat/find-provides
|
|
%__find_requires /usr/lib/rpm/redhat/find-requires
|
|
|
|
#kernel_module_package [ -n name ] [ -v version ] [ -r release ] [ -s script ]
|
|
# [ -f filelist] [ -x ] [ -p preamble ] flavor flavor ...
|
|
|
|
%kernel_module_package_buildreqs %global kmodtool_generate_buildreqs 1 \
|
|
kernel-devel kernel-abi-stablelists redhat-rpm-config kernel-rpm-macros elfutils-libelf-devel kmod
|
|
|
|
%kernel_module_package(n:v:r:s:f:xp:) %{expand:%( \
|
|
%global kmodtool %{-s*}%{!-s:/usr/lib/rpm/redhat/kmodtool} \
|
|
%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` | 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 \
|
|
)}
|