All of lore.kernel.org
 help / color / mirror / Atom feed
From: Adam Lee <adam8157@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Michal Marek <mmarek@suse.cz> (maintainer:KERNEL BUILD + fi...),
	linux-kbuild@vger.kernel.org (open list:KERNEL BUILD + fi...)
Subject: [PATCH] kconfig: fix the failure of `make rpm-pkg` after localversion file changed
Date: Sun,  4 Nov 2012 15:32:41 +0800	[thread overview]
Message-ID: <1352014361-21159-1-git-send-email-adam8157@gmail.com> (raw)

`make rpm-pkg` and `make binrpm-pkg` will write $KERNELRELEASE into rpm
spec files which don't depend on localversion file now. So, the
unchanged spec files will cause failure after localversion file changed.

I added the localversion file into the dependencies of spec files.
Because that file is not necessary, I made it a empty target, so its
last-modification time will be checked by Make only when it exists.

Signed-off-by: Adam Lee <adam8157@gmail.com>
---
 scripts/package/Makefile |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 87bf080..a7c1f59 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -30,9 +30,12 @@ KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))
 MKSPEC     := $(srctree)/scripts/package/mkspec
 PREV       := set -e; cd -P ..;
 
+# localversion, its last-modification time will be checked only when it exists
+localversion:
+
 # rpm-pkg
 # ---------------------------------------------------------------------------
-$(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile
+$(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile localversion
 	$(CONFIG_SHELL) $(MKSPEC) > $@
 
 rpm-pkg rpm: $(objtree)/kernel.spec FORCE
@@ -60,7 +63,7 @@ clean-files := $(objtree)/kernel.spec
 
 # binrpm-pkg
 # ---------------------------------------------------------------------------
-$(objtree)/binkernel.spec: $(MKSPEC) $(srctree)/Makefile
+$(objtree)/binkernel.spec: $(MKSPEC) $(srctree)/Makefile localversion
 	$(CONFIG_SHELL) $(MKSPEC) prebuilt > $@
 
 binrpm-pkg: $(objtree)/binkernel.spec FORCE
-- 
1.7.10.4


WARNING: multiple messages have this Message-ID (diff)
From: Adam Lee <adam8157@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Michal Marek <mmarek@suse.cz>,
	"open list:KERNEL BUILD + fi..." <linux-kbuild@vger.kernel.org>
Subject: [PATCH] kconfig: fix the failure of `make rpm-pkg` after localversion file changed
Date: Sun,  4 Nov 2012 15:32:41 +0800	[thread overview]
Message-ID: <1352014361-21159-1-git-send-email-adam8157@gmail.com> (raw)

`make rpm-pkg` and `make binrpm-pkg` will write $KERNELRELEASE into rpm
spec files which don't depend on localversion file now. So, the
unchanged spec files will cause failure after localversion file changed.

I added the localversion file into the dependencies of spec files.
Because that file is not necessary, I made it a empty target, so its
last-modification time will be checked by Make only when it exists.

Signed-off-by: Adam Lee <adam8157@gmail.com>
---
 scripts/package/Makefile |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 87bf080..a7c1f59 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -30,9 +30,12 @@ KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))
 MKSPEC     := $(srctree)/scripts/package/mkspec
 PREV       := set -e; cd -P ..;
 
+# localversion, its last-modification time will be checked only when it exists
+localversion:
+
 # rpm-pkg
 # ---------------------------------------------------------------------------
-$(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile
+$(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile localversion
 	$(CONFIG_SHELL) $(MKSPEC) > $@
 
 rpm-pkg rpm: $(objtree)/kernel.spec FORCE
@@ -60,7 +63,7 @@ clean-files := $(objtree)/kernel.spec
 
 # binrpm-pkg
 # ---------------------------------------------------------------------------
-$(objtree)/binkernel.spec: $(MKSPEC) $(srctree)/Makefile
+$(objtree)/binkernel.spec: $(MKSPEC) $(srctree)/Makefile localversion
 	$(CONFIG_SHELL) $(MKSPEC) prebuilt > $@
 
 binrpm-pkg: $(objtree)/binkernel.spec FORCE
-- 
1.7.10.4


             reply	other threads:[~2012-11-04  7:32 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-04  7:32 Adam Lee [this message]
2012-11-04  7:32 ` [PATCH] kconfig: fix the failure of `make rpm-pkg` after localversion file changed Adam Lee
2013-02-18  3:08 ` Adam Lee

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1352014361-21159-1-git-send-email-adam8157@gmail.com \
    --to=adam8157@gmail.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mmarek@suse.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.