projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 4b8c693b GKH |
1 | From e32e78c5ee8aadef020fbaecbe6fb741ed9029fd Mon Sep 17 00:00:00 2001 |
| 2 | From: Sam Ravnborg <sam@ravnborg.org> | |
| 3 | Date: Mon, 2 Aug 2010 20:47:48 +0000 | |
| 4 | Subject: powerpc: fix build with make 3.82 | |
| 5 | ||
| 6 | From: Sam Ravnborg <sam@ravnborg.org> | |
| 7 | ||
| 8 | commit e32e78c5ee8aadef020fbaecbe6fb741ed9029fd upstream. | |
| 9 | ||
| 10 | Thomas Backlund reported that the powerpc build broke with make 3.82. | |
| 11 | It failed with the following message: | |
| 12 | ||
| 13 | arch/powerpc/Makefile:183: *** mixed implicit and normal rules. Stop. | |
| 14 | ||
| 15 | The fix is to avoid mixing non-wildcard and wildcard targets. | |
| 16 | ||
| 17 | Reported-by: Thomas Backlund <tmb@mandriva.org> | |
| 18 | Tested-by: Thomas Backlund <tmb@mandriva.org> | |
| 19 | Cc: Michal Marek <mmarek@suse.cz> | |
| 20 | Signed-off-by: Sam Ravnborg <sam@ravnborg.org> | |
| 21 | Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> | |
| 22 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 23 | ||
| 24 | --- | |
| 25 | arch/powerpc/Makefile | 16 ++++++++++++---- | |
| 26 | 1 file changed, 12 insertions(+), 4 deletions(-) | |
| 27 | ||
| 28 | --- a/arch/powerpc/Makefile | |
| 29 | +++ b/arch/powerpc/Makefile | |
| 30 | @@ -158,9 +158,11 @@ drivers-$(CONFIG_OPROFILE) += arch/power | |
| 31 | # Default to zImage, override when needed | |
| 32 | all: zImage | |
| 33 | ||
| 34 | -BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% simpleImage.% | |
| 35 | +# With make 3.82 we cannot mix normal and wildcard targets | |
| 36 | +BOOT_TARGETS1 := zImage zImage.initrd uImaged | |
| 37 | +BOOT_TARGETS2 := zImage% dtbImage% treeImage.% cuImage.% simpleImage.% | |
| 38 | ||
| 39 | -PHONY += $(BOOT_TARGETS) | |
| 40 | +PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2) | |
| 41 | ||
| 42 | boot := arch/$(ARCH)/boot | |
| 43 | ||
| 44 | @@ -175,10 +177,16 @@ relocs_check: arch/powerpc/relocs_check. | |
| 45 | zImage: relocs_check | |
| 46 | endif | |
| 47 | ||
| 48 | -$(BOOT_TARGETS): vmlinux | |
| 49 | +$(BOOT_TARGETS1): vmlinux | |
| 50 | + $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@) | |
| 51 | +$(BOOT_TARGETS2): vmlinux | |
| 52 | + $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@) | |
| 53 | + | |
| 54 | + | |
| 55 | +bootwrapper_install: | |
| 56 | $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@) | |
| 57 | ||
| 58 | -bootwrapper_install %.dtb: | |
| 59 | +%.dtb: | |
| 60 | $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@) | |
| 61 | ||
| 62 | define archhelp |