aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-04-29 03:03:47 +0000
committerNicolas Thill <nico@openwrt.org>2010-04-29 03:03:47 +0000
commitac838e71ff74fddda92a324ecd8a5ad81aceb686 (patch)
tree8fce28ec0251401cb7466860f5907030c29679ce /target/linux
parentdd725d483d54f3874e25a1bc1f21d482c5269080 (diff)
downloadmaster-187ad058-ac838e71ff74fddda92a324ecd8a5ad81aceb686.tar.gz
master-187ad058-ac838e71ff74fddda92a324ecd8a5ad81aceb686.tar.bz2
master-187ad058-ac838e71ff74fddda92a324ecd8a5ad81aceb686.zip
target/x86: various image changes
* add a -combined suffix for grub+kernel+rootfs images and -rootfs for root filesystem only images * change ext from .image to .img * fix perms on VirtualBox .vdi image * gzip ext2 rootfs image as well git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21246 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/x86/image/Makefile22
1 files changed, 13 insertions, 9 deletions
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index b159856203..1c94634f2c 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -65,7 +65,7 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
-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)/$(IMG_PREFIX)-$(1).image \
+ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
$(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub \
$(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
$(call Image/Build/grub/$(1))
@@ -84,7 +84,7 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
define Image/Build/grub
PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" NOGRUB=1 ./gen_image_x86.sh
- $(BIN_DIR)/$(IMG_PREFIX)-$(1).image \
+ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
$(CONFIG_X86_GRUB_KERNELPART) "" \
$(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
endef
@@ -121,7 +121,7 @@ ifneq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),)
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)/$(IMG_PREFIX)-$(1).image \
+ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
$(CONFIG_OLPC_BOOTSCRIPT_KERNELPART) $(KDIR)/root.bootscript \
$(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
endef
@@ -154,8 +154,10 @@ ifneq ($(CONFIG_X86_VDI_IMAGES),)
ifeq ($(1),ext2)
rm $(BIN_DIR)/$(IMG_PREFIX)-ext2.vdi || true
VBoxManage convertfromraw -format VDI \
- $(BIN_DIR)/$(IMG_PREFIX)-ext2.image \
- $(BIN_DIR)/$(IMG_PREFIX)-ext2.vdi
+ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
+ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
+ # XXX: VBoxManage insists on setting perms to 0600
+ chmod 0644 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
endif
endef
endif
@@ -165,8 +167,9 @@ ifneq ($(CONFIG_X86_VMDK_IMAGES),)
# left here because the image builder doesnt need these
ifeq ($(1),ext2)
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
+ qemu-img convert -f raw -O vmdk \
+ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
+ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk
endif
endef
endif
@@ -189,10 +192,11 @@ define Image/Build
$(call Image/Build/vdi,$(1))
$(call Image/Build/vmdk,$(1))
endif
- $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1).fs
+ $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
$(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
ifeq ($(1),ext2)
- gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-$(1).image
+ gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img
+ gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
endif
endef