| Message ID | 1402501243-28213-1-git-send-email-mmarek@suse.cz (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
This v2 patch is good, Tested-by: Mike Qiu <qiudayu@linux.vnet.ibm.com> On 06/11/2014 11:40 PM, Michal Marek wrote: > The rule to create the final images uses a zImage.% pattern. > Unfortunately, this also matches the names of the zImage.*.lds linker > scripts, which appear as a dependency of the final images. This somehow > worked when $(srctree) used to be an absolute path, but now the pattern > matches too much. List only the images from $(image-y) as the target of > the rule, to avoid the circular dependency. > > Signed-off-by: Michal Marek <mmarek@suse.cz> > --- > v2: > - Filter out duplicates in the target list > - fix the platform argument to cmd_wrap > > arch/powerpc/boot/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile > index 426dce7..ccc25ed 100644 > --- a/arch/powerpc/boot/Makefile > +++ b/arch/powerpc/boot/Makefile > @@ -333,8 +333,8 @@ $(addprefix $(obj)/, $(initrd-y)): $(obj)/ramdisk.image.gz > $(obj)/zImage.initrd.%: vmlinux $(wrapperbits) > $(call if_changed,wrap,$*,,,$(obj)/ramdisk.image.gz) > > -$(obj)/zImage.%: vmlinux $(wrapperbits) > - $(call if_changed,wrap,$*) > +$(addprefix $(obj)/, $(sort $(filter zImage.%, $(image-y)))): vmlinux $(wrapperbits) > + $(call if_changed,wrap,$(subst $(obj)/zImage.,,$@)) > > # dtbImage% - a dtbImage is a zImage with an embedded device tree blob > $(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb
Dne 12.6.2014 04:07, Mike Qiu napsal(a): > This v2 patch is good, > > Tested-by: Mike Qiu <qiudayu@linux.vnet.ibm.com> Thanks. In kbuild.git it goes. Michal
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 426dce7..ccc25ed 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -333,8 +333,8 @@ $(addprefix $(obj)/, $(initrd-y)): $(obj)/ramdisk.image.gz $(obj)/zImage.initrd.%: vmlinux $(wrapperbits) $(call if_changed,wrap,$*,,,$(obj)/ramdisk.image.gz) -$(obj)/zImage.%: vmlinux $(wrapperbits) - $(call if_changed,wrap,$*) +$(addprefix $(obj)/, $(sort $(filter zImage.%, $(image-y)))): vmlinux $(wrapperbits) + $(call if_changed,wrap,$(subst $(obj)/zImage.,,$@)) # dtbImage% - a dtbImage is a zImage with an embedded device tree blob $(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb
The rule to create the final images uses a zImage.% pattern. Unfortunately, this also matches the names of the zImage.*.lds linker scripts, which appear as a dependency of the final images. This somehow worked when $(srctree) used to be an absolute path, but now the pattern matches too much. List only the images from $(image-y) as the target of the rule, to avoid the circular dependency. Signed-off-by: Michal Marek <mmarek@suse.cz> --- v2: - Filter out duplicates in the target list - fix the platform argument to cmd_wrap arch/powerpc/boot/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)