Skip to content

Commit

Permalink
kbuild: rpm-pkg: rename binkernel.spec to kernel.spec
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Masahiro Yamada committed Jul 24, 2023
1 parent 49c803c commit 975667d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ modules.order
#
# RPM spec file (make rpm-pkg)
#
/*.spec
/kernel.spec
/rpmbuild/

#
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/Makefile.package
Original file line number Diff line number Diff line change
Expand Up @@ -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)'

Expand Down
2 changes: 2 additions & 0 deletions scripts/remove-stale-files
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ rm -f .scmversion
rm -rf include/ksym

find . -name '*.usyms' | xargs rm -f

rm -f binkernel.spec

0 comments on commit 975667d

Please sign in to comment.