BigW Consortium Gitlab

Skip to content

O
openwrt-zsun
Commit b7624961 by nbd
Options

image: fix handling of per-device kernel build commands

Signed-off-by: 's avatarFelix Fietkau <nbd@openwrt.org> Backport of r46589 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46591 3c298f89-4303-0410-b956-a3cf2f4a3e73
parent de041ddd
Showing with 1 addition and 1 deletion
include/image.mk
...@@ -396,6 +396,7 @@ define Device/Build/kernel ...@@ -396,6 +396,7 @@ define Device/Build/kernel
_KERNEL_IMAGES += $(KDIR)/$$(KERNEL_NAME) _KERNEL_IMAGES += $(KDIR)/$$(KERNEL_NAME)
$(KDIR)/$$(KERNEL_NAME): image_prepare $(KDIR)/$$(KERNEL_NAME): image_prepare
$$(_TARGET): $$(if $$(KERNEL_INSTALL),$(BIN_DIR)/$$(KERNEL_IMAGE)) $$(_TARGET): $$(if $$(KERNEL_INSTALL),$(BIN_DIR)/$$(KERNEL_IMAGE))
$(call Device/Export,$(KDIR)/$$(KERNEL_IMAGE),$(1))
$(BIN_DIR)/$$(KERNEL_IMAGE): $(KDIR)/$$(KERNEL_IMAGE) $(BIN_DIR)/$$(KERNEL_IMAGE): $(KDIR)/$$(KERNEL_IMAGE)
cp $$^ $$@ cp $$^ $$@
ifndef IB ifndef IB
...@@ -411,7 +412,6 @@ endef ...@@ -411,7 +412,6 @@ endef
define Device/Build/image define Device/Build/image
$$(_TARGET): $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2)) $$(_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))) $(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) $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $(KDIR)/$$(KERNEL_IMAGE) $(KDIR)/root.$(1)
@rm -f $$@ @rm -f $$@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment