From: David Ward on
gitlab.com
Merge Request:
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1088
NOTE: Truncated patchset due to missing @redhat.com email
address on your GitLab profile at
https://gitlab.com/-/profile.
Once that is fixed, close and reopen the merge request to
retrigger sending the emails.
The `--with-vanilla` option does not work, because it defines
`%{variant}`, which causes errors using the current SPEC file.
This is the only situation where `%{variant}` is defined. This macro was
left in place even after `%{upstream_branch}` and others were [dropped 7
years
ago](https://src.fedoraproject.org/rpms/kernel/c/cff59d3101041cbf7
0abd8a182390104a3852af1?branch=rawhide). Remove `%{variant}` as well,
and instead rely on package builders to define `%{buildid}`
appropriately for vanilla builds, just like any other builds where they
adjust the package sources.
Then for clarity, change the word "flavour" to "variant" everywhere
it
appears in the SPEC file, since this is what is actually meant.
[Flavor](https://cki-project.gitlab.io/kernel-ark/repository-
layout.html#configuration) refers to a configuration directory (fedora
or ark). This is completely internal to the SPEC file.
Signed-off-by: David Ward <david.ward(a)ll.mit.edu>