Skip to content

Drop the %{variant} macro and fix --with-vanilla

David Ward requested to merge dpward/kernel-ark:drop-variant-macro into os-build

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. 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 refers to a configuration directory (fedora or ark). This is completely internal to the SPEC file.

Signed-off-by: David Ward david.ward@ll.mit.edu

Merge request reports