diff options
| author | Nicolas Thill <nico@openwrt.org> | 2010-04-12 23:15:56 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2010-04-12 23:15:56 +0000 |
| commit | e2b57ecf5f1f50f7b5f5644e483e06dd67a3cb5f (patch) | |
| tree | f8563604e7685c30b0a2a675ca80379a34114565 /include | |
| parent | 040c06438896144dfe148910f922a0d9bb0058b0 (diff) | |
| download | upstream-e2b57ecf5f1f50f7b5f5644e483e06dd67a3cb5f.tar.gz upstream-e2b57ecf5f1f50f7b5f5644e483e06dd67a3cb5f.tar.bz2 upstream-e2b57ecf5f1f50f7b5f5644e483e06dd67a3cb5f.zip | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/image.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/image.mk b/include/image.mk index 0ce6336cc5..98e32b349a 100644 --- a/include/image.mk +++ b/include/image.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -15,6 +15,8 @@ override MAKEFLAGS= override MAKE:=$(SUBMAKE) KDIR=$(KERNEL_BUILD_DIR) +IMG_PREFIX:=openwrt-$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) + ifneq ($(CONFIG_BIG_ENDIAN),y) JFFS2OPTS := --pad --little-endian --squash SQUASHFS_OPTS := -le @@ -76,13 +78,13 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y) define Image/mkfs/tgz - $(TAR) -zcf $(BIN_DIR)/openwrt-$(BOARD)-rootfs.tgz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ . + $(TAR) -zcf $(BIN_DIR)/$(IMG_PREFIX)-rootfs.tgz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ . endef endif ifeq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),y) define Image/mkfs/cpiogz - ( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/openwrt-$(BOARD)-rootfs.cpio.gz ) + ( cd $(TARGET_DIR); find . | cpio -o -H newc | gzip -9 >$(BIN_DIR)/$(IMG_PREFIX)-rootfs.cpio.gz ) endef endif ifeq ($(CONFIG_TARGET_ROOTFS_UBIFS),y) @@ -96,7 +98,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) endif else define Image/BuildKernel - cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.elf + cp $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.elf $(call Image/Build/Initramfs) endef endif |