rpms
/
kernel-lt
20
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Delete path gcc compiler and add macros gcc-toolset-12

Browse Source
i9-ispras-fuzzing-kmsan
ebasov 1 month ago
parent 79c28cfa59
commit dea5e8545d
Signed by: ebasov
GPG Key ID: 23356EDA24E5499D
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File

19
SPECS/kernel-6.1.spec
Unescape View File

@ -223,6 +223,13 @@ BuildRequires: nss-tools, pesign >= 0.10-4, system-sb-certs
%endif %endif
%endif %endif
BuildRequires: gcc-toolset-12
%enable_devtoolset12
BuildRequires: gcc-toolset-12-annobin-symlink
BuildConflicts: rhbuildsys(DiskFree) < 500Mb BuildConflicts: rhbuildsys(DiskFree) < 500Mb
### ###
@ -684,7 +691,7 @@ InitBuildVars() {
# if we are post rc1 this should match anyway so this won't matter # if we are post rc1 this should match anyway so this won't matter
perl -p -i -e 's/^PATCHLEVEL.*/PATCHLEVEL = %{patchlevel}/' Makefile perl -p -i -e 's/^PATCHLEVEL.*/PATCHLEVEL = %{patchlevel}/' Makefile
%{make} %{?_smp_mflags} CC=/opt/rh/gcc-toolset-13/root/bin/gcc mrproper %{make} %{?_smp_mflags} mrproper
cp configs/$Config .config cp configs/$Config .config
Arch=`head -1 .config | cut -b 3-` Arch=`head -1 .config | cut -b 3-`
@ -743,12 +750,12 @@ BuildKernel() {
perl -p -i -e "s/^CONFIG_BUILD_SALT.*/CONFIG_BUILD_SALT=\"%{KVERREL}\"/" .config perl -p -i -e "s/^CONFIG_BUILD_SALT.*/CONFIG_BUILD_SALT=\"%{KVERREL}\"/" .config
%if %{with_std} %if %{with_std}
%{make} %{?_smp_mflags} ARCH=%{bldarch} CC=/opt/rh/gcc-toolset-13/root/bin/gcc %{make_target} %{make} %{?_smp_mflags} ARCH=%{bldarch} %{make_target}
%{make} %{?_smp_mflags} ARCH=%{bldarch} CC=/opt/rh/gcc-toolset-13/root/bin/gcc modules || exit 1 %{make} %{?_smp_mflags} ARCH=%{bldarch} modules || exit 1
%ifarch aarch64 %ifarch aarch64
%{make} %{?_smp_mflags} ARCH=%{bldarch} CC=/opt/rh/gcc-toolset-13/root/bin/gcc dtbs %{make} %{?_smp_mflags} ARCH=%{bldarch} dtbs
%endif %endif
%if %{with_bpftool} %if %{with_bpftool}
@ -820,13 +827,13 @@ BuildKernel() {
# Override mod-fw because we don't want it to install any firmware. # Override mod-fw because we don't want it to install any firmware.
# We'll get it from the linux-firmware package and we don't want conflicts. # We'll get it from the linux-firmware package and we don't want conflicts.
%{make} %{?_smp_mflags} ARCH=%{bldarch} CC=/opt/rh/gcc-toolset-13/root/bin/gcc INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw= %{make} %{?_smp_mflags} ARCH=%{bldarch} INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw=
# Add a noop %%defattr statement because rpm doesn't like empty file list files. # Add a noop %%defattr statement because rpm doesn't like empty file list files.
echo '%%defattr(-,-,-)' > ../%{name}${Variant:+-${Variant}}-ldsoconf.list echo '%%defattr(-,-,-)' > ../%{name}${Variant:+-${Variant}}-ldsoconf.list
%if %{with_vdso_install} %if %{with_vdso_install}
%{make} %{?_smp_mflags} ARCH=%{bldarch} CC=/opt/rh/gcc-toolset-13/root/bin/gcc INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer %{make} %{?_smp_mflags} ARCH=%{bldarch} INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer
if [ $DoVDSO -ne 0 ]; then if [ $DoVDSO -ne 0 ]; then
if [ -s ldconfig-kernel.conf ]; then if [ -s ldconfig-kernel.conf ]; then

Write Preview
Loading…
Cancel
Save