Skip to content

[redhat] kernel.spec.template - fix use_vdso usage

Ben Crocker requested to merge bcrocker/kernel-ark:0129-kernelspec-use_vdso into os-build

In redhat/kernel.spec.template, change

%if %{use_vdso}

to

%if 0%{?use_vdso}

This change solves this problem:

error: parse error in expression: %{use_vdso}
error: \ ^ error: /home/bcrocker/kernel-ark/redhat/rpm/SOURCES/kernel.spec:468: bad %if condition: %{use_vdso}
make[1]: *** [Makefile:292: dist-kernel-dbgonly] Error 1
make[1]: Leaving directory '/home/bcrocker/kernel-ark/redhat'
make: *** [makefile:12: dist-kernel-dbgonly] Error 2

and enables the following targets to run successfully:

• dist-rpm-baseonly
• dist-kernel-baseonly

The following targets:

• dist-kernel-dbgonly
• dist-kernel-paeonly

still fail, both because of the same error:

Processing files: kernel-debuginfo-common-x86_64-5.11.0-0.rc4.20210129git288c90477c1c.130.test.fc33.x86_64
error: Empty %files file /home/bcrocker/ark-kernels/a1/redhat/rpm/BUILD/kernel-20210129git288c90477c1c/debugfiles.list

RPM build errors:
Empty %files file /home/bcrocker/ark-kernels/a1/redhat/rpm/BUILD/kernel-20210129git288c90477c1c/debugfiles.list
make[2]: *** [Makefile:279: do-rpmbuild] Error 1
make[2]: Leaving directory '/home/bcrocker/ark-kernels/a1/redhat'
make[1]: *** [Makefile:295: dist-kernel-dbgonly] Error 2
make[1]: Leaving directory '/home/bcrocker/ark-kernels/a1/redhat'
make: *** [makefile:12: dist-kernel-dbgonly] Error 2

Signed-off-by: Ben Crocker bcrocker@redhat.com

Edited by Ben Crocker

Merge request reports