ngompa/kernel-rpm
1
0
Fork 0
forked from rpms/kernel
Code Pull Requests Activity

Include the release in the kernel COPYING file

Browse Source 
Whenever upstream changes the COPYING file it leads to an RPM file
conflict because the name is set to, for example, 5.6.0 for the whole
release cycle, but multiple kernel packages need to be installed that
reference that same file. This rarely happens, but it's annoying and the
file is tiny so just have one per installed kernel.

Signed-off-by: Jeremy Cline <jcline@redhat.com>
This commit is contained in:
Jeremy Cline 2020-02-24 10:35:49 -05:00
parent 4f1980456e
commit 041b387bfe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel.spec
View File

@ -1533,7 +1533,7 @@ git am %{patches}
chmod +x scripts/checkpatch.pl chmod +x scripts/checkpatch.pl
chmod +x tools/objtool/sync-check.sh chmod +x tools/objtool/sync-check.sh
mv COPYING COPYING-%{version} mv COPYING COPYING-%{version}-%{release}
# This Prevents scripts/setlocalversion from mucking with our version numbers. # This Prevents scripts/setlocalversion from mucking with our version numbers.
touch .scmversion touch .scmversion
@ -2828,7 +2828,7 @@ fi
%if %{2}\ %if %{2}\
%{expand:%%files -f kernel-%{?3:%{3}-}core.list %{?1:-f kernel-%{?3:%{3}-}ldsoconf.list} %{?3:%{3}-}core}\ %{expand:%%files -f kernel-%{?3:%{3}-}core.list %{?1:-f kernel-%{?3:%{3}-}ldsoconf.list} %{?3:%{3}-}core}\
%{!?_licensedir:%global license %%doc}\ %{!?_licensedir:%global license %%doc}\
%license linux-%{KVERREL}/COPYING-%{version}\ %license linux-%{KVERREL}/COPYING-%{version}-%{release}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}\
%ghost /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?3:+%{3}}\ %ghost /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?3:+%{3}}\
/lib/modules/%{KVERREL}%{?3:+%{3}}/.vmlinuz.hmac \ /lib/modules/%{KVERREL}%{?3:+%{3}}/.vmlinuz.hmac \