| Message ID | 1352014361-21159-1-git-send-email-adam8157@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Nov 04, 2012 at 03:32:41PM +0800, Adam Lee wrote: > `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(-) Hi, Michal Any comment about my fix? reproduce steps: 1, make rpm-pkg 2, change localversion 3, make rpm-pkg
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
`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(-)