From: Jan Stancek on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3870#note_2549437147
Or we could further simplify it, and make Source2 in same style for all
variants:
```
diff --git a/redhat/Makefile b/redhat/Makefile
index 240a01b127d5..f7bcd86fa7bc 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -776,13 +776,10 @@ sources-rh: $(TARBALL) $(KABI_TARBALL) $(KABIDW_TARBALL)
generate-testpatch-tmp
kernel-local \
dracut-virt.conf \
$(SOURCES)/
-ifdef AUTOMOTIVE_BUILD
- @cat $$(ls -1 kernel.changelog-* | sort -V -r) \
+ @changelog_glob="$(SPECPACKAGE_NAME).changelog-*"; \
+ [[ -n "$(AUTOMOTIVE_BUILD)" ]] && changelog_glob="kernel.changelog-*";
\
+ cat $$(ls -1 $$changelog_glob | sort -V -r) \
> $(SOURCES)/$(SPECPACKAGE_NAME).changelog
-else
- @cat $$(ls -1 $(SPECPACKAGE_NAME).changelog-* | sort -V -r) \
- > $(SOURCES)/kernel.changelog
-endif
cp keys/redhatsecureboot{501,ca5}.cer $(SOURCES)/;
@for KABIARCH in $(ARCH_LIST); do \
cp kabi/Module.kabi_$$KABIARCH $(SOURCES)/; \
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index 7c3cd91e7c05..5c454c7cce29 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -908,12 +908,7 @@ BuildRequires: redhat-sb-certs >= 9.4-0.1
Source0: linux-%{tarfile_release}.tar.xz
Source1: Makefile.rhelver
-
-%if !%{with_automotiveonly}
-Source2: kernel.changelog
-%else
Source2: %{package_name}.changelog
-%endif
Source10: redhatsecurebootca5.cer
Source13: redhatsecureboot501.cer
```
Wdyt?
--
_______________________________________________
kernel mailing list -- [email protected]
To unsubscribe send an email to [email protected]
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/[email protected]
Do not reply to spam, report it:
https://pagure.io/fedora-infrastructure/new_issue
