Author: nbd Date: 2015-08-13 21:35:29 +0200 (Thu, 13 Aug 2015) New Revision: 46591
Modified: branches/chaos_calmer/include/image.mk Log: image: fix handling of per-device kernel build commands Signed-off-by: Felix Fietkau <[email protected]> Backport of r46589 Modified: branches/chaos_calmer/include/image.mk =================================================================== --- branches/chaos_calmer/include/image.mk 2015-08-13 19:35:26 UTC (rev 46590) +++ branches/chaos_calmer/include/image.mk 2015-08-13 19:35:29 UTC (rev 46591) @@ -396,6 +396,7 @@ _KERNEL_IMAGES += $(KDIR)/$$(KERNEL_NAME) $(KDIR)/$$(KERNEL_NAME): image_prepare $$(_TARGET): $$(if $$(KERNEL_INSTALL),$(BIN_DIR)/$$(KERNEL_IMAGE)) + $(call Device/Export,$(KDIR)/$$(KERNEL_IMAGE),$(1)) $(BIN_DIR)/$$(KERNEL_IMAGE): $(KDIR)/$$(KERNEL_IMAGE) cp $$^ $$@ ifndef IB @@ -411,7 +412,6 @@ define Device/Build/image $$(_TARGET): $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)) - $(eval $(call Device/Export,$(KDIR)/$(KERNEL_IMAGE),$(1))) $(eval $(call Device/Export,$(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)),$(1))) $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/$$(KERNEL_IMAGE) $(KDIR)/root.$(1) @rm -f $$@ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
