| Message ID | 20230222144730.3813421-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kbuild: rpm-pkg: remove unneeded KERNELRELEASE from modules/headers_install | expand |
On Wed, Feb 22, 2023 at 11:47:29PM +0900, Masahiro Yamada wrote: > There is no need to pass KERNELRELEASE to installation targets. > > KERNELRELEASE used for building the kernel is saved in > include/config/kernel.release. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nathan Chancellor <nathan@kernel.org> > --- > > scripts/package/mkspec | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/package/mkspec b/scripts/package/mkspec > index 83a64d9d7372..3c550960dd39 100755 > --- a/scripts/package/mkspec > +++ b/scripts/package/mkspec > @@ -99,8 +99,8 @@ $S > %else > cp \$($MAKE -s image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE > %endif > -$M $MAKE %{?_smp_mflags} KERNELRELEASE=$KERNELRELEASE INSTALL_MOD_PATH=%{buildroot} modules_install > - $MAKE %{?_smp_mflags} KERNELRELEASE=$KERNELRELEASE INSTALL_HDR_PATH=%{buildroot}/usr headers_install > +$M $MAKE %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} modules_install > + $MAKE %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install > cp System.map %{buildroot}/boot/System.map-$KERNELRELEASE > cp .config %{buildroot}/boot/config-$KERNELRELEASE > $S$M rm -f %{buildroot}/lib/modules/$KERNELRELEASE/build > -- > 2.34.1 >
diff --git a/scripts/package/mkspec b/scripts/package/mkspec index 83a64d9d7372..3c550960dd39 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -99,8 +99,8 @@ $S %else cp \$($MAKE -s image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE %endif -$M $MAKE %{?_smp_mflags} KERNELRELEASE=$KERNELRELEASE INSTALL_MOD_PATH=%{buildroot} modules_install - $MAKE %{?_smp_mflags} KERNELRELEASE=$KERNELRELEASE INSTALL_HDR_PATH=%{buildroot}/usr headers_install +$M $MAKE %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} modules_install + $MAKE %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install cp System.map %{buildroot}/boot/System.map-$KERNELRELEASE cp .config %{buildroot}/boot/config-$KERNELRELEASE $S$M rm -f %{buildroot}/lib/modules/$KERNELRELEASE/build
There is no need to pass KERNELRELEASE to installation targets. KERNELRELEASE used for building the kernel is saved in include/config/kernel.release. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- scripts/package/mkspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)