From: Prarit Bhargava prarit@redhat.com
redhat: Test tmp file before deleting
If BTF is not enabled in the kernel config then .tmp_vmlinux.btf will not exist. The rpm build will throw an error because the file doesn't exist.
Test for the existence of .tmp_vmlinux.btf before deleting it.
Reported by: stan upaitag@zoho.com Signed-off-by: Prarit Bhargava prarit@redhat.com
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -1683,7 +1683,10 @@ BuildKernel() { %endif
# Remove large intermediate files we no longer need to save space - rm vmlinux.o .tmp_vmlinux.btf + rm vmlinux.o + if [ -f .tmp_vmlinux.btf ]; then + rm .tmp_vmlinux.btf + fi
# Start installing the results install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2135
From: Herton R. Krzesinski on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2135#note_1162936...
Wouldn't it be better to just use ```rm -f``` instead of adding the if?
On Mon, 07 Nov 2022 18:41:00 -0000 "Herton R. Krzesinski (via Email Bridge)" cki-gitlab@redhat.com wrote:
From: Herton R. Krzesinski on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2135#note_1162936...
Wouldn't it be better to just use ```rm -f``` instead of adding the if?
Good point.
On Mon, 07 Nov 2022 17:59:40 -0000 "Prarit Bhargava (via Email Bridge)" cki-gitlab@redhat.com wrote:
Thanks.
kernel@lists.fedoraproject.org