Djam/kernel-5.15
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kernel-5.15.git synced 2025-02-23 10:32:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

shredder-kernel is x86_64 only, not buildable on x86_32

Browse source
This commit is contained in:
Mikhail Novosyolov 2020-11-27 23:00:06 +03:00
parent 188d796585
commit a916977128
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
kernel.spec
View file

@ -359,13 +359,15 @@ BuildRequires: findutils util-linux
BuildRequires: kernel-source-rtl8821ce
BuildRequires: kernel-source-tripso
%ifarch %{ix86} %{x86_64}
BuildRequires: kernel-source-shredder-kernel
BuildRequires: kernel-source-virtualbox
# TODO: drop it for kernels >= 5.6
# because all guest modules have been upstreamized
# https://www.phoronix.com/scan.php?page=news_item&px=VirtualBox-Shared-Folder-5.6
BuildRequires: kernel-source-virtualbox-vboxadditions
%endif
%ifarch %{x86_64}
BuildRequires: kernel-source-shredder-kernel
%endif
# rosa-test-suite is maintained in certified branches only
# nlkm, memfreetest, pcietest
%if %{with nickel}
@ -931,14 +933,16 @@ latest kernel-uml-modules-%{flavour} %{kernelversion}.%{patchlevel}.x
%ksob_mk_module_pkg -n 8821ce -s net/wireless
%ksob_mk_module_pkg -n xt_TRIPSO -s net -r tripso
%ifarch %{x86_64}
%ksob_mk_module_pkg -n shredder-kernel -s extra -r rosa-shredder-user
%endif
# virtualbox host
%ifarch %{ix86} %{x86_64}
%ksob_mk_module_pkg -n vboxnetflt -s misc
%ksob_mk_module_pkg -n vboxnetadp -s misc
%ksob_mk_module_pkg -n vboxdrv -s misc
%ksob_mk_module_pkg -n vboxpci -s misc
# shredder
%ksob_mk_module_pkg -n shredder-kernel -s extra -r rosa-shredder-user
#------------------------------------------------
# a package which will pull all those modules
@ -1374,7 +1378,7 @@ cp xt_TRIPSO.ko %{temp_modules}/%{kver_full}/kernel/net/
popd
rm -fr kernel-source-tripso
%ifarch %{ix86} %{x86_64}
%ifarch %{x86_64}
cp -r "$(rpm -q --qf '/usr/src/shredder-kernel-%%{VERSION}-%%{RELEASE}' kernel-source-shredder-kernel)" kernel-source-shredder-kernel
pushd kernel-source-shredder-kernel
%kmake KERNEL_PATH=%{src_dir}
@ -1382,7 +1386,9 @@ mkdir -p %{temp_modules}/%{kver_full}/kernel/extra/
cp shredder-kernel.ko %{temp_modules}/%{kver_full}/kernel/extra/
popd
rm -fr kernel-source-shredder-kernel
%endif
%ifarch %{ix86} %{x86_64}
# build commands for virtualbox are based on the ones from the virtualbox package
cp -r "$(rpm -q --qf '/usr/src/vboxadditions-%%{VERSION}-%%{RELEASE}' kernel-source-virtualbox-vboxadditions)" kernel-source-virtualbox-vboxadditions
mkdir -p %{temp_modules}/%{kver_full}/kernel/misc/
@ -1617,8 +1623,10 @@ cat > $kernel_files <<EOF
%if %{with binary_extra_modules}
# 8821ce.ko.debug will not be excluded and will be in the main debug subpackage
%exclude %{_modulesdir}/%{kver_full}/kernel/net/wireless/8821ce.ko%{kmod_suffix}
%ifarch %{ix86} %{x86_64}
%ifarch %{x86_64}
%exclude %{_modulesdir}/%{kver_full}/kernel/extra/shredder-kernel.ko%{kmod_suffix}
%endif
%ifarch %{ix86} %{x86_64}
# vbox host: vboxnetflt vboxnetadp vboxdrv vboxpci
# vbox guest: vboxvideo vboxguest vboxsf
%exclude %{_modulesdir}/%{kver_full}/kernel/misc/vbox*.ko%{kmod_suffix}