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 | 9d42bb1a218d092b8c9447cf16ec2c94f7881c8d (patch) | |
tree | 422842a370190fdfcc59b10055cbbf761974bb76 /target/linux/ramips | |
parent | debf59c4e6f85df3132eae86b2e8c8399040c1ce (diff) | |
download | master-187ad058-9d42bb1a218d092b8c9447cf16ec2c94f7881c8d.tar.gz master-187ad058-9d42bb1a218d092b8c9447cf16ec2c94f7881c8d.tar.bz2 master-187ad058-9d42bb1a218d092b8c9447cf16ec2c94f7881c8d.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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20834 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips')
-rw-r--r-- | target/linux/ramips/image/Makefile | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 4cca2fcb34..f0fcfb2c5f 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -7,17 +7,15 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -IMGNAME:=$(BIN_DIR)/openwrt-$(BOARD) - define imgname -$(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1))) +$($BIN_DIR)/$(IMG_PREFIX)-$(2)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1))) endef -VMLINUX:=$(IMGNAME)-vmlinux -UIMAGE:=$(IMGNAME)-uImage +VMLINUX:=$(IMG_PREFIX)-vmlinux +UIMAGE:=$(IMG_PREFIX)-uImage ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) - VMLINUX:=$(IMGNAME)-vmlinux-initramfs - UIMAGE:=$(IMGNAME)-uImage-initramfs + VMLINUX:=$(IMG_PREFIX)-vmlinux-initramfs + UIMAGE:=$(IMG_PREFIX)-uImage-initramfs endif ifeq ($(CONFIG_RALINK_RT305X),y) @@ -47,11 +45,11 @@ define MkImage endef define Image/BuildKernel - cp $(KDIR)/vmlinux.elf $(VMLINUX).elf - cp $(KDIR)/vmlinux $(VMLINUX).bin + cp $(KDIR)/vmlinux.elf $(BIN_DIR)/$(VMLINUX).elf + cp $(KDIR)/vmlinux $(BIN_DIR)/$(VMLINUX).bin $(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma) $(call MkImage,lzma,$(KDIR)/vmlinux.bin.lzma,$(KDIR)/uImage.lzma) - cp $(KDIR)/uImage.lzma $(UIMAGE).bin + cp $(KDIR)/uImage.lzma $(BIN_DIR)/$(UIMAGE).bin endef define BuildFirmware/Generic @@ -113,7 +111,7 @@ endef define Image/Build $(call Image/Build/$(1)) - dd if=$(KDIR)/root.$(1) of=$(IMGNAME)-root.$(1) bs=128k conv=sync + dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync $(call Image/Build/Profile/$(PROFILE),$(1)) endef |