diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-09-30 03:10:10 +0200 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-11-14 15:19:01 +0100 |
| commit | af60e207087975d069858741c44ed4f450330ac4 (patch) | |
| tree | b02c13125c39289aa7838c16157681c3e5bc634b | |
| parent | kbuild: rpm-pkg: fix jobserver unavailable warning (diff) | |
| download | linux-af60e207087975d069858741c44ed4f450330ac4.tar.xz linux-af60e207087975d069858741c44ed4f450330ac4.zip | |
kbuild: rpm-pkg: keep spec file until make mrproper
If build fails during (bin)rpm-pkg, the spec file is not cleaned by
anyone until the next successful build of the package.
We do not have to immediately delete the spec file in case somebody
may want to take a look at it. Instead, make them ignored by git,
and cleaned up by make mrproper.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | scripts/package/Makefile | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 0c39aa20b6ba..4f034b853d7d 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,11 @@ Module.symvers /Module.markers # +# RPM spec file (make rpm-pkg) +# +/*.spec + +# # Debian directory (make deb-pkg) # /debian/ diff --git a/scripts/package/Makefile b/scripts/package/Makefile index b559671d28ca..70eea1ed8c9c 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -51,7 +51,6 @@ rpm-pkg rpm: FORCE $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec $(call cmd,src_tar,$(KERNELPATH),kernel.spec) +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz - rm $(KERNELPATH).tar.gz kernel.spec # binrpm-pkg # --------------------------------------------------------------------------- @@ -60,7 +59,8 @@ binrpm-pkg: FORCE $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ $(UTS_MACHINE) -bb $(objtree)/binkernel.spec - rm binkernel.spec + +clean-files += $(objtree)/*.spec # Deb target # --------------------------------------------------------------------------- |