kbuild: rpm-pkg: generate kernel.spec in rpmbuild/SPECS/

kernel.spec is the last piece that resides outside the rpmbuild/
directory. Move all the RPM-related files to rpmbuild/ consistently.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>

diff --git a/.gitignore b/.gitignore
index 0bbae167bf93e9c4ca21160f89ca0c04de2f4404..98274e1160d7b11729f307df26f3e93427705f8d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -74,7 +74,6 @@ modules.order
 #
 # RPM spec file (make rpm-pkg)
 #
-/kernel.spec
 /rpmbuild/
 
 #

diff --git a/Makefile b/Makefile
index 373649c7374eeabaeeb7a62558b9181724ca351a..3de6dd959bd19d4cabae97d7af00b6d21be5d3e7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1486,7 +1486,7 @@ MRPROPER_FILES += include/config include/generated          \
                  certs/signing_key.pem \
                  certs/x509.genkey \
                  vmlinux-gdb.py \
-                 kernel.spec rpmbuild \
+                 rpmbuild \
                  rust/libmacros.so
 
 # clean - Delete most, but leave enough to build external modules

diff --git a/scripts/Makefile.package b/scripts/Makefile.package
index 2bcab02da9653c2c0b5cec147dfffdc31378e5f1..05b8c3e29aac9311fbdbdbd8f0439085894e1d40 100644 (file)
--- a/scripts/Makefile.package
+++ b/scripts/Makefile.package
@@ -69,9 +69,9 @@ $(linux-tarballs): .tmp_HEAD FORCE
 # ---------------------------------------------------------------------------
 
 quiet_cmd_mkspec = GEN     $@
-      cmd_mkspec = $(srctree)/scripts/package/mkspec > $@
+      cmd_mkspec = $(srctree)/scripts/package/mkspec $@
 
-kernel.spec: FORCE
+rpmbuild/SPECS/kernel.spec: FORCE
        $(call cmd,mkspec)
 
 PHONY += rpm-sources
@@ -88,8 +88,8 @@ srcrpm-pkg: private build-type := s
 binrpm-pkg: private build-type := b
 
 rpm-pkg srcrpm-pkg: rpm-sources
-rpm-pkg srcrpm-pkg binrpm-pkg: kernel.spec
-       +$(strip rpmbuild -b$(build-type) kernel.spec \
+rpm-pkg srcrpm-pkg binrpm-pkg: rpmbuild/SPECS/kernel.spec
+       +$(strip rpmbuild -b$(build-type) rpmbuild/SPECS/kernel.spec \
        --define='_topdir $(abspath rpmbuild)' \
        $(if $(filter a b, $(build-type)), \
                --target $(UTS_MACHINE)-linux --build-in-place --noprep --define='_smp_mflags %{nil}' \

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index d41608efb74742f1811e3ece6ccfbce1f5289751..ce201bfa8377c776b29c6e2db9478fecf7652507 100755 (executable)
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -9,6 +9,12 @@
 #      Patched for non-x86 by Opencon (L) 2002 <opencon@rio.skydome.net>
 #
 
+output=$1
+
+mkdir -p "$(dirname "${output}")"
+
+exec >"${output}"
+
 if grep -q CONFIG_MODULES=y include/config/auto.conf; then
 echo '%define with_devel %{?_without_devel: 0} %{?!_without_devel: 1}'
 else

diff --git a/scripts/remove-stale-files b/scripts/remove-stale-files
index 8b1a636f854342154a54884ad47f743174ebf40a..385610fe39361e3077f5d30548d40bcbbf90c333 100755 (executable)
--- a/scripts/remove-stale-files
+++ b/scripts/remove-stale-files
@@ -38,4 +38,4 @@ rm -rf include/ksym
 
 find . -name '*.usyms' | xargs rm -f
 
-rm -f binkernel.spec
+rm -f *.spec