[OS-BUILD PATCHv2 6/6] redhat/kernel.spec.template: Fix hardcoded "kernel"

From: Prarit Bhargava <prarit(a)redhat.com&gt; redhat/kernel.spec.template: Fix hardcoded "kernel" There are a few places where kernel is hardcoded in the spec. Replace hardcoded "kernel" with the package name, %{name}. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt; 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 @@ -1513,7 +1513,7 @@ mkdir configs cd configs # Drop some necessary files from the source dir into the buildroot -cp $RPM_SOURCE_DIR/kernel-*.config . +cp $RPM_SOURCE_DIR/%{name}-*.config . cp %{SOURCE80} . # merge.pl cp %{SOURCE3000} . @@ -1577,7 +1577,7 @@ for opt in %{clang_make_opts}; do OPTS="$OPTS -m $opt" done %endif -RHJOBS=$RPM_BUILD_NCPUS SPECPACKAGE_NAME=kernel ./process_configs.sh $OPTS ${specversion} +RHJOBS=$RPM_BUILD_NCPUS SPECPACKAGE_NAME=${name} ./process_configs.sh $OPTS ${specversion} cp %{SOURCE82} . RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} @@ -1639,7 +1639,7 @@ InitBuildVars() { Variant=$1 # Pick the right kernel config file - Config=kernel-%{version}-%{_target_cpu}${Variant:+-${Variant}}.config + Config=%{name}-%{version}-%{_target_cpu}${Variant:+-${Variant}}.config DevelDir=/usr/src/kernels/%{KVERREL}${Variant:++${Variant}} KernelVer=%{version}-%{release}.%{_target_cpu}${Variant:++${Variant}} -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2253