summaryrefslogtreecommitdiff
path: root/target/linux/x86
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-12 23:15:56 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-12 23:15:56 +0000
commitbca3f225e9645134018a951d78198b70601eb02d (patch)
tree422842a370190fdfcc59b10055cbbf761974bb76 /target/linux/x86
parent5a822569fc7794a086947c4237be6332a296eae9 (diff)
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/x86')
-rw-r--r--target/linux/x86/image/Makefile24
1 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index b2167e7485..2a6a2e336d 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -71,7 +71,7 @@ ifneq ($(HOST_OS),Darwin)
-e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \
-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \
./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
- PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_x86.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
+ PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_x86.sh $(BIN_DIR)/$(IMG_PREFIX)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
$(call Image/Build/grub/$(1))
endef
@@ -85,7 +85,7 @@ ifneq ($(HOST_OS),Darwin)
endef
else
define Image/Build/grub
- PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" NOGRUB=1 ./gen_image_x86.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) "" $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
+ PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" NOGRUB=1 ./gen_image_x86.sh $(BIN_DIR)/$(IMG_PREFIX)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) "" $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
endef
endif
endif
@@ -94,8 +94,8 @@ ifeq ($(CONFIG_X86_VDI_IMAGES),y)
define Image/Build/vdi
# left here because the image builder doesnt need these
ifeq ($(1),ext2)
- rm $(BIN_DIR)/openwrt-$(BOARD)-ext2.vdi || true
- VBoxManage convertfromraw -format VDI $(BIN_DIR)/openwrt-$(BOARD)-ext2.image $(BIN_DIR)/openwrt-$(BOARD)-ext2.vdi
+ rm $(BIN_DIR)/$(IMG_PREFIX)-ext2.vdi || true
+ VBoxManage convertfromraw -format VDI $(BIN_DIR)/$(IMG_PREFIX)-ext2.image $(BIN_DIR)/$(IMG_PREFIX)-ext2.vdi
endif
endef
endif
@@ -104,9 +104,9 @@ ifeq ($(CONFIG_X86_VMDK_IMAGES),y)
define Image/Build/vmdk
# left here because the image builder doesnt need these
ifeq ($(1),ext2)
- rm $(BIN_DIR)/openwrt-$(BOARD)-ext2.vmdk || true
- qemu-img convert -f raw $(BIN_DIR)/openwrt-$(BOARD)-ext2.image \
- -O vmdk $(BIN_DIR)/openwrt-$(BOARD)-ext2.vmdk
+ rm $(BIN_DIR)/$(IMG_PREFIX)-ext2.vmdk || true
+ qemu-img convert -f raw $(BIN_DIR)/$(IMG_PREFIX)-ext2.image \
+ -O vmdk $(BIN_DIR)/$(IMG_PREFIX)-ext2.vmdk
endif
endef
endif
@@ -136,7 +136,7 @@ ifeq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),y)
$(CP) $(KDIR)/bzImage $(KDIR)/root.bootscript/boot/vmlinuz
sed -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \
./olpc.fth > $(KDIR)/root.bootscript/boot/olpc.fth
- PADDING="$(CONFIG_OLPC_BOOTSCRIPT_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_olpc.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(CONFIG_OLPC_BOOTSCRIPT_KERNELPART) $(KDIR)/root.bootscript $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
+ PADDING="$(CONFIG_OLPC_BOOTSCRIPT_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_olpc.sh $(BIN_DIR)/$(IMG_PREFIX)-$(1).image $(CONFIG_OLPC_BOOTSCRIPT_KERNELPART) $(KDIR)/root.bootscript $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
endef
endif
@@ -170,7 +170,7 @@ define Image/Build/iso
endef
define Image/BuildKernel
- $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz
+ $(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
endef
define Image/Build
@@ -181,10 +181,10 @@ define Image/Build
$(call Image/Build/vdi,$(1))
$(call Image/Build/vmdk,$(1))
endif
- $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs
- $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz
+ $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1).fs
+ $(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
ifeq ($(1),ext2)
- gzip -f9 $(BIN_DIR)/openwrt-$(BOARD)-$(1).image
+ gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-$(1).image
endif
endef