summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2023-02-22 23:47:29 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2023-02-26 16:54:12 +0900
commit7adf14d8aca1ea53bf9ccf8463809c82adb8c23a (patch)
tree92cc00274a1034654070c0cad432633aae1ed4e6 /scripts
parent29cbe6ecfd97cb599883c68d3c6dbac11d0618b8 (diff)
downloadlinux-stable-7adf14d8aca1ea53bf9ccf8463809c82adb8c23a.tar.gz
linux-stable-7adf14d8aca1ea53bf9ccf8463809c82adb8c23a.tar.bz2
linux-stable-7adf14d8aca1ea53bf9ccf8463809c82adb8c23a.zip
kbuild: rpm-pkg: remove unneeded KERNELRELEASE from modules/headers_install
This is a temporary workaround added by commit f6e09b07cc12 ("kbuild: do not put .scmversion into the source tarball"). Since commit 1cb86b6c3136 ("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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/package/mkspec4
1 files 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