iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2023-07-22 13:48:03 +09:00
parent 49c803cd91
commit 975667d02d
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -74,7 +74,7 @@ modules.order
# #
# RPM spec file (make rpm-pkg) # RPM spec file (make rpm-pkg)
# #
/*.spec /kernel.spec
/rpmbuild/ /rpmbuild/
# #

2
Makefile
View File

@ -1610,7 +1610,7 @@ MRPROPER_FILES += include/config include/generated \
certs/signing_key.pem \ certs/signing_key.pem \
certs/x509.genkey \ certs/x509.genkey \
vmlinux-gdb.py \ vmlinux-gdb.py \
*.spec rpmbuild \ kernel.spec rpmbuild \
rust/libmacros.so rust/libmacros.so
# clean - Delete most, but leave enough to build external modules # clean - Delete most, but leave enough to build external modules

4
scripts/Makefile.package
View File

@ -86,9 +86,9 @@ srcrpm-pkg: linux.tar.gz
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
PHONY += binrpm-pkg PHONY += binrpm-pkg
binrpm-pkg: binrpm-pkg:
$(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/kernel.spec
+rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ +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 \ --build-in-place --noprep --define='_smp_mflags %{nil}' --without devel \
--define='make $(MAKE)' --define='make $(MAKE)'

2
scripts/remove-stale-files
View File

@ -37,3 +37,5 @@ rm -f .scmversion
rm -rf include/ksym rm -rf include/ksym
find . -name '*.usyms' | xargs rm -f find . -name '*.usyms' | xargs rm -f
rm -f binkernel.spec