Commit ffa46bbc authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarNathan Chancellor <nathan@kernel.org>
Tested-by: default avatarNathan Chancellor <nathan@kernel.org>
parent 40745327

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ modules.order 
#

# RPM spec file (make rpm-pkg)

#

/kernel.spec

/rpmbuild/



#

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

scripts/Makefile.package

+4 −4
Original line number Diff line number Diff line
@@ -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}' \

scripts/package/mkspec

+6 −0
Original line number Diff line number Diff line
@@ -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

scripts/remove-stale-files

+1 −1
Original line number Diff line number Diff line
@@ -38,4 +38,4 @@ rm -rf include/ksym 


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



rm -f binkernel.spec
 
rm -f *.spec