From e2b57ecf5f1f50f7b5f5644e483e06dd67a3cb5f Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Mon, 12 Apr 2010 23:15:56 +0000 Subject: define a shared IMG_PREFIX variable used as a basename for image files, it contains board & subtarget infos (if appropriate) allowing subtargets to share the same bin directory without overwriting each other's files SVN-Revision: 20834 --- target/linux/kirkwood/image/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/kirkwood/image') diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index a2aaa77235..86d6a01e91 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009 OpenWrt.org +# Copyright (C) 2009-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -15,7 +15,7 @@ endef define Image/BuildKernel # do mach-id fixup here, if needed - cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage + cp $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage endef define Image/Build @@ -26,7 +26,7 @@ define Image/Build/jffs2-128k ( \ dd if=$(KDIR)/uImage bs=4096k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \ - ) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img + ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img endef define Image/Build/squashfs @@ -34,7 +34,7 @@ define Image/Build/squashfs ( \ dd if=$(KDIR)/uImage bs=4096k conv=sync; \ dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \ - ) > $(BIN_DIR)/openwrt-$(BOARD)-$(1).img + ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img endef $(eval $(call BuildImage)) -- cgit v1.2.3