Commit 6501320311664e11ad5489fedb17ea1f817c2617
1 parent
403d3cc473
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
rpm-pkg: Always regenerate the specfile
The *pkg targets are always run, so it makes no sense to cache the generated specfile. This also fixes build errors when the specfile becomes out of date, without the Makefile noticing it: $ make rpm works $ echo yadadada >localversion-test $ make rpm fails, because kernel.spec assumes the old kernel release string Signed-off-by: Michal Marek <mmarek@suse.cz>
Showing 1 changed file with 6 additions and 13 deletions Side-by-side Diff
scripts/package/Makefile
| ... | ... | @@ -35,10 +35,7 @@ |
| 35 | 35 | |
| 36 | 36 | # rpm-pkg |
| 37 | 37 | # --------------------------------------------------------------------------- |
| 38 | -$(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile | |
| 39 | - $(CONFIG_SHELL) $(MKSPEC) > $@ | |
| 40 | - | |
| 41 | -rpm-pkg rpm: $(objtree)/kernel.spec FORCE | |
| 38 | +rpm-pkg rpm: FORCE | |
| 42 | 39 | @if test "$(objtree)" != "$(srctree)"; then \ |
| 43 | 40 | echo "Building source + binary RPM is not possible outside the"; \ |
| 44 | 41 | echo "kernel source tree. Don't set KBUILD_OUTPUT, or use the"; \ |
| ... | ... | @@ -47,6 +44,7 @@ |
| 47 | 44 | fi |
| 48 | 45 | $(MAKE) clean |
| 49 | 46 | ln -sf $(srctree) $(KERNELPATH) |
| 47 | + $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec | |
| 50 | 48 | $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion |
| 51 | 49 | tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(TAR_CONTENT) |
| 52 | 50 | rm $(KERNELPATH) |
| 53 | 51 | |
| 54 | 52 | |
| 55 | 53 | |
| ... | ... | @@ -56,17 +54,13 @@ |
| 56 | 54 | set -e; \ |
| 57 | 55 | mv -f $(objtree)/.tmp_version $(objtree)/.version |
| 58 | 56 | $(RPM) $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz |
| 59 | - rm $(KERNELPATH).tar.gz | |
| 57 | + rm $(KERNELPATH).tar.gz kernel.spec | |
| 60 | 58 | |
| 61 | -clean-files := $(objtree)/kernel.spec | |
| 62 | - | |
| 63 | 59 | # binrpm-pkg |
| 64 | 60 | # --------------------------------------------------------------------------- |
| 65 | -$(objtree)/binkernel.spec: $(MKSPEC) $(srctree)/Makefile | |
| 66 | - $(CONFIG_SHELL) $(MKSPEC) prebuilt > $@ | |
| 67 | - | |
| 68 | -binrpm-pkg: $(objtree)/binkernel.spec FORCE | |
| 61 | +binrpm-pkg: FORCE | |
| 69 | 62 | $(MAKE) KBUILD_SRC= |
| 63 | + $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec | |
| 70 | 64 | set -e; \ |
| 71 | 65 | $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version |
| 72 | 66 | set -e; \ |
| ... | ... | @@ -74,8 +68,7 @@ |
| 74 | 68 | |
| 75 | 69 | $(RPM) $(RPMOPTS) --define "_builddir $(objtree)" --target \ |
| 76 | 70 | $(UTS_MACHINE) -bb $< |
| 77 | - | |
| 78 | -clean-files += $(objtree)/binkernel.spec | |
| 71 | + rm binkernel.spec | |
| 79 | 72 | |
| 80 | 73 | # Deb target |
| 81 | 74 | # --------------------------------------------------------------------------- |