Skip to content

Commit

Permalink
kbuild: rpm-pkg: remove unneeded KERNELRELEASE from modules/headers_i…
Browse files Browse the repository at this point in the history
…nstall

This is a temporary workaround added by commit f6e09b0 ("kbuild:
do not put .scmversion into the source tarball").

Since commit 1cb86b6 ("kbuild: save overridden KERNELRELEASE in
include/config/kernel.release"), the user-supplied KERNELRELEASE is
saved in include/config/kernel.release.

Remove it again.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
  • Loading branch information
masahir0y committed Feb 26, 2023
1 parent 29cbe6e commit 7adf14d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/package/mkspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7adf14d

Please sign in to comment.