X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f41147f4006383549e90293e42e4f022c74bb2d2..5e670215a9f99612d222307fcaa855f275661373:/target/linux/x86/image/Makefile?ds=inline diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index b15985620..26e34ff6d 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -29,15 +29,16 @@ ifneq ($(GRUB_TERMINALS),) GRUB_TERMINAL_CONFIG := terminal --timeout=2 $(GRUB_TERMINALS) endif +ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME)) + +GRUB_TIMEOUT:=$(call qstrip,$(CONFIG_X86_GRUB_TIMEOUT)) ifneq ($(CONFIG_X86_GRUB_IMAGES),) - ifneq ($(HOST_OS),Darwin) BOOTOPTS:=$(call qstrip,$(CONFIG_X86_GRUB_BOOTOPTS)) - ROOTPART:=$(call qstrip,$(CONFIG_X86_GRUB_ROOTPART)) - define Image/cmdline/ext2 - root=$(ROOTPART) rootfstype=ext2 rootwait + define Image/cmdline/ext4 + root=$(ROOTPART) rootfstype=ext4 rootwait endef define Image/cmdline/jffs2-64k @@ -56,50 +57,42 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),) # left here because the image builder doesnt need these $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(CP) \ - $(KDIR)/*stage* \ + $(KDIR)/stage1 \ + $(KDIR)/stage2 \ + $(KDIR)/e2fs_stage1_5 \ $(KDIR)/root.grub/boot/grub/ $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz sed \ -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ + -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#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 \ - $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub \ - $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) + PADDING="$(CONFIG_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_x86.sh \ + $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ + $(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \ + $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) $(call Image/Build/grub/$(1)) endef define Image/Prepare/grub # for the image builder $(CP) \ - $(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 \ + $(STAGING_DIR)/usr/lib/grub/i386-openwrt/stage1 \ + $(STAGING_DIR)/usr/lib/grub/i386-openwrt/stage2 \ + $(STAGING_DIR)/usr/lib/grub/i386-openwrt/stage2_eltorito \ + $(STAGING_DIR)/usr/lib/grub/i386-openwrt/e2fs_stage1_5 \ $(KDIR)/ endef - else - - 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 \ - $(CONFIG_X86_GRUB_KERNELPART) "" \ - $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) - endef - - endif endif ROOTDELAY=10 ifneq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),) - ROOTPART:=$(call qstrip,$(CONFIG_OLPC_BOOTSCRIPT_ROOTPART)) - - define Image/cmdline/ext2 - root=$(ROOTPART) rootfstype=ext2 rootwait + define Image/cmdline/ext4 + root=$(ROOTPART) rootfstype=ext4 rootwait endef define Image/cmdline/jffs2-64k @@ -120,10 +113,10 @@ ifneq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),) $(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)/$(IMG_PREFIX)-$(1).image \ - $(CONFIG_OLPC_BOOTSCRIPT_KERNELPART) $(KDIR)/root.bootscript \ - $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) + PADDING="$(CONFIG_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_olpc.sh \ + $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ + $(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.bootscript \ + $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) endef endif @@ -135,8 +128,8 @@ endef define Image/Build/iso $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(CP) \ - $(STAGING_DIR_HOST)/usr/lib/grub/i386-openwrt/stage2_eltorito \ - $(KDIR)/root.grub/boot/grub/stage2_eltorito + $(KDIR)/stage2_eltorito \ + $(KDIR)/root.grub/boot/grub/ sed \ -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ @@ -151,11 +144,13 @@ endef ifneq ($(CONFIG_X86_VDI_IMAGES),) define Image/Build/vdi # left here because the image builder doesnt need these - 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 + ifeq ($(1),ext4) + rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true + qemu-img convert -f raw -O 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 @@ -163,16 +158,46 @@ endif ifneq ($(CONFIG_X86_VMDK_IMAGES),) define Image/Build/vmdk # 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 + ifeq ($(1),ext4) + rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true + qemu-img convert -f raw -O vmdk \ + $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ + $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk endif endef endif +define Image/Build/gzip + gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img + gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img +endef + +ifneq ($(CONFIG_TARGET_IMAGES_GZIP),) + define Image/Build/gzip/ext4 + $(call Image/Build/gzip,ext4) + endef + ifneq ($(CONFIG_TARGET_IMAGES_PAD),) + define Image/Build/gzip/squashfs + $(call Image/Build/gzip,squashfs) + endef + define Image/Build/gzip/jffs2-64k + $(call Image/Build/gzip,jffs2-64k) + endef + define Image/Build/gzip/jffs2-128k + $(call Image/Build/gzip,jffs2-128k) + endef + endif +endif + define Image/BuildKernel $(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz + ifneq ($(CONFIG_X86_ETHERBOOT_IMAGES),) + rm -f $(BIN_DIR)/$(IMG_PREFIX)-etherboot + $(STAGING_DIR_HOST)/bin/mkelfImage \ + --append=$(CONFIG_X86_ETHERBOOT_BOOTOPTS) \ + $(KDIR)/bzImage \ + $(BIN_DIR)/$(IMG_PREFIX)-etherboot + endif endef define Image/Prepare @@ -189,23 +214,9 @@ 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 - endif + $(call Image/Build/gzip/$(1)) endef $(eval $(call BuildImage)) - -ifneq ($(CONFIG_X86_VDI_IMAGES),) - $(eval $(call RequireCommand,VBoxManage, \ - You need VBoxManage to generate VirtualBox images. \ - )) -endif - -ifneq ($(CONFIG_X86_VMDK_IMAGES),) - $(eval $(call RequireCommand,qemu-img, \ - You need qemu-img to generate VMware images. \ - )) -endif