Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 18:08:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2023-09-30 19:38:47 +09:00
parent 4074532758
commit ffa46bbc58
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

2
Makefile
View File

@ -1486,7 +1486,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 \
kernel.spec rpmbuild \ 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

8
scripts/Makefile.package
View File

@ -69,9 +69,9 @@ $(linux-tarballs): .tmp_HEAD FORCE
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
quiet_cmd_mkspec = GEN $@ 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) $(call cmd,mkspec)
PHONY += rpm-sources PHONY += rpm-sources
@ -88,8 +88,8 @@ srcrpm-pkg: private build-type := s
binrpm-pkg: private build-type := b binrpm-pkg: private build-type := b
rpm-pkg srcrpm-pkg: rpm-sources rpm-pkg srcrpm-pkg: rpm-sources
rpm-pkg srcrpm-pkg binrpm-pkg: kernel.spec rpm-pkg srcrpm-pkg binrpm-pkg: rpmbuild/SPECS/kernel.spec
+$(strip rpmbuild -b$(build-type) kernel.spec \ +$(strip rpmbuild -b$(build-type) rpmbuild/SPECS/kernel.spec \
--define='_topdir $(abspath rpmbuild)' \ --define='_topdir $(abspath rpmbuild)' \
$(if $(filter a b, $(build-type)), \ $(if $(filter a b, $(build-type)), \
--target $(UTS_MACHINE)-linux --build-in-place --noprep --define='_smp_mflags %{nil}' \ --target $(UTS_MACHINE)-linux --build-in-place --noprep --define='_smp_mflags %{nil}' \

6
scripts/package/mkspec
View File

@ -9,6 +9,12 @@
# Patched for non-x86 by Opencon (L) 2002 <opencon@rio.skydome.net> # 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 if grep -q CONFIG_MODULES=y include/config/auto.conf; then
echo '%define with_devel %{?_without_devel: 0} %{?!_without_devel: 1}' echo '%define with_devel %{?_without_devel: 0} %{?!_without_devel: 1}'
else else

2
scripts/remove-stale-files
View File

@ -38,4 +38,4 @@ rm -rf include/ksym
find . -name '*.usyms' | xargs rm -f find . -name '*.usyms' | xargs rm -f
rm -f binkernel.spec rm -f *.spec