From patchwork Mon Apr 15 20:35:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Marek X-Patchwork-Id: 2446781 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 5D13B3FD8C for ; Mon, 15 Apr 2013 20:36:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756833Ab3DOUfb (ORCPT ); Mon, 15 Apr 2013 16:35:31 -0400 Received: from cantor2.suse.de ([195.135.220.15]:37508 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756710Ab3DOUfa (ORCPT ); Mon, 15 Apr 2013 16:35:30 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 27485A50E4; Mon, 15 Apr 2013 22:35:29 +0200 (CEST) Received: by pobox.suse.cz (Postfix, from userid 10020) id 0497C6009; Mon, 15 Apr 2013 22:35:28 +0200 (CEST) From: Michal Marek To: linux-kbuild@vger.kernel.org Cc: jkosina@suse.cz, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] rpm-pkg: Always regenerate the specfile Date: Mon, 15 Apr 2013 22:35:07 +0200 Message-Id: <1366058108-3500-3-git-send-email-mmarek@suse.cz> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1366058108-3500-1-git-send-email-mmarek@suse.cz> References: <1366058108-3500-1-git-send-email-mmarek@suse.cz> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org 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 --- scripts/package/Makefile | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) diff --git a/scripts/package/Makefile b/scripts/package/Makefile index ab203c2..08e4e2f 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -35,10 +35,7 @@ MKSPEC := $(srctree)/scripts/package/mkspec # rpm-pkg # --------------------------------------------------------------------------- -$(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile - $(CONFIG_SHELL) $(MKSPEC) > $@ - -rpm-pkg rpm: $(objtree)/kernel.spec FORCE +rpm-pkg rpm: FORCE @if test "$(objtree)" != "$(srctree)"; then \ echo "Building source + binary RPM is not possible outside the"; \ echo "kernel source tree. Don't set KBUILD_OUTPUT, or use the"; \ @@ -47,6 +44,7 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE fi $(MAKE) clean ln -sf $(srctree) $(KERNELPATH) + $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(TAR_CONTENT) rm $(KERNELPATH) @@ -56,17 +54,13 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE set -e; \ mv -f $(objtree)/.tmp_version $(objtree)/.version $(RPM) $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz - rm $(KERNELPATH).tar.gz - -clean-files := $(objtree)/kernel.spec + rm $(KERNELPATH).tar.gz kernel.spec # binrpm-pkg # --------------------------------------------------------------------------- -$(objtree)/binkernel.spec: $(MKSPEC) $(srctree)/Makefile - $(CONFIG_SHELL) $(MKSPEC) prebuilt > $@ - -binrpm-pkg: $(objtree)/binkernel.spec FORCE +binrpm-pkg: FORCE $(MAKE) KBUILD_SRC= + $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec set -e; \ $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version set -e; \ @@ -74,8 +68,7 @@ binrpm-pkg: $(objtree)/binkernel.spec FORCE $(RPM) $(RPMOPTS) --define "_builddir $(objtree)" --target \ $(UTS_MACHINE) -bb $< - -clean-files += $(objtree)/binkernel.spec + rm binkernel.spec # Deb target # ---------------------------------------------------------------------------