X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/db6034ebcf8ecd7a512630a2903405f355b87755..908e9268f9871db0cb3425138711134ca0696c3e:/target/linux/x86/image/Makefile

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index dd147b869..6d3c77b77 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -14,20 +14,21 @@ ROOTPART=$(strip $(subst ",, $(CONFIG_X86_GRUB_ROOTPART)))
 
 
 ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
+ifneq ($(HOST_OS),Darwin)
   define Image/cmdline/squashfs
-    block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs init=/etc/preinit
+    block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs
   endef
 
   define Image/cmdline/jffs2-64k
-    block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=jffs2 init=/etc/preinit
+    block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=jffs2
   endef
 
   define Image/cmdline/jffs2-128k
-    block2mtd.block2mtd=$(ROOTPART),131072,rootfs root=/dev/mtdblock0 rootfstype=jffs2 init=/etc/preinit
+    block2mtd.block2mtd=$(ROOTPART),131072,rootfs root=/dev/mtdblock0 rootfstype=jffs2
   endef
 
   define Image/cmdline/ext2
-    root=$(ROOTPART) rootfstype=ext2 init=/etc/preinit
+    root=$(ROOTPART) rootfstype=ext2
   endef
   
   define Image/Build/grub
@@ -41,24 +42,48 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
 		-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \
 		-e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
 		./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
-	PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(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.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
 	$(call Image/Build/grub/$(1))
   endef
-endif
 
-ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
   define Image/Prepare/grub
 	# for the image builder
 	$(CP) \
-		$(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/stage1 \
-		$(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/stage2 \
-		$(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/e2fs_stage1_5 \
+		$(STAGING_DIR_HOST)/usr/lib/grub/i386-*/stage1 \
+		$(STAGING_DIR_HOST)/usr/lib/grub/i386-*/stage2 \
+		$(STAGING_DIR_HOST)/usr/lib/grub/i386-*/e2fs_stage1_5 \
 		$(KDIR)/
   endef
+else
+  define Image/Build/grub
+	PADDING="$(CONFIG_X86_GRUB_IMAGES_PAD)" PATH="$(TARGET_PATH)" NOGRUB=1 ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) "" $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
+  endef
+endif
+endif
+
+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
+    endif
+  endef
+endif
+
+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
+    endif
+  endef
 endif
 
 define Image/Prepare
-	$(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $(KDIR)/bzImage
+	$(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage
 	$(call Image/Prepare/grub)
 endef
   
@@ -67,29 +92,45 @@ define Image/Build/squashfs
 endef
 
 define Image/Build/iso 
+	$(INSTALL_DIR) $(KDIR)/root.grub/boot/grub
 	$(CP) \
-		$(STAGING_DIR_HOST)/usr/lib/grub/i386-pc/stage2_eltorito \
+		$(STAGING_DIR_HOST)/usr/lib/grub/i386-openwrt/stage2_eltorito \
 		$(KDIR)/root.grub/boot/grub/stage2_eltorito 
-	sed -i \
+	sed \
 		-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1))) $(BOOTOPTS)#g' \
 		-e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
 		-e 's#(hd0,0)#(cd)#g' \
-		 $(KDIR)/root.grub/boot/grub/menu.lst 
+		./menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
 	$(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz 
 	mkisofs -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table \
 		-o $(KDIR)/root.iso $(KDIR)/root.grub 
 endef 
 
 define Image/BuildKernel
-	$(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz
+	$(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz
 endef
 
 define Image/Build
 	$(call Image/Build/$(1))
+ifneq ($(1),iso)
 	$(call Image/Build/grub,$(1))
-	$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).fs
-	$(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz
+	$(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
 endef
 
 $(eval $(call BuildImage))
 
+ifeq ($(CONFIG_X86_VDI_IMAGES),y)
+  $(eval $(call RequireCommand,VBoxManage, \
+	You need VBoxManage to generate VirtualBox images. \
+  ))
+endif
+
+ifeq ($(CONFIG_X86_VMDK_IMAGES),y)
+   $(eval $(call RequireCommand,qemu-img, \
+	You need qemu-img to generate VMware images. \
+   ))
+endif