[OS-BUILD PATCHv2 0/0] Drop the %{variant} macro and fix --with-vanilla