kbuild: rpm-pkg: rename binkernel.spec to kernel.spec

Now kernel.spec and binkernel.spec have the exactly same contents.

Use kernel.spec for binrpm-pkg as well.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

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

diff --git a/Makefile b/Makefile
index 8533ba64713c1ce4f9378f84a437338ab3d4d952..4425d87dd2face2c76ddf8099886b95d3f2ed5e4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1610,7 +1610,7 @@ MRPROPER_FILES += include/config include/generated          \
                  certs/signing_key.pem \
                  certs/x509.genkey \
                  vmlinux-gdb.py \
-                 *.spec rpmbuild \
+                 kernel.spec 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 c36ae03d6002ecdcf2cff77b82188689744dfe6a..be9602fa98da655a90dded1a125f75c2fb716ccf 100644 (file)
--- a/scripts/Makefile.package
+++ b/scripts/Makefile.package
@@ -86,9 +86,9 @@ srcrpm-pkg: linux.tar.gz
 # ---------------------------------------------------------------------------
 PHONY += binrpm-pkg
 binrpm-pkg:
-       $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec
+       $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/kernel.spec
        +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
-               $(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec \
+               $(UTS_MACHINE)-linux -bb $(objtree)/kernel.spec \
                --build-in-place --noprep --define='_smp_mflags %{nil}' --without devel \
                --define='make $(MAKE)'
 

diff --git a/scripts/remove-stale-files b/scripts/remove-stale-files
index f3659ea0335bbccb775ac837fe31ed1ed00beb12..8b1a636f854342154a54884ad47f743174ebf40a 100755 (executable)
--- a/scripts/remove-stale-files
+++ b/scripts/remove-stale-files
@@ -37,3 +37,5 @@ rm -f .scmversion
 rm -rf include/ksym
 
 find . -name '*.usyms' | xargs rm -f
+
+rm -f binkernel.spec