X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fx86%2Fimage%2FMakefile;h=83b8140b7aefbe708fd09c9c61827e7e39bda8b4;hb=HEAD;hp=1c94634f2c579946f1174dc996dc2fa9b95aad09;hpb=99d4eee46634a077cd76ef9e31fe322734871d08;p=openwrt%2Fstaging%2Flynxis.git diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 1c94634f2c..83b8140b7a 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -1,5 +1,6 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2019 Alexander Couzens # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,207 +10,165 @@ include $(INCLUDE_DIR)/image.mk export PATH=$(TARGET_PATH):/sbin +GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial test vga +GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial test vga GRUB_TERMINALS = GRUB_SERIAL_CONFIG = GRUB_TERMINAL_CONFIG = GRUB_CONSOLE_CMDLINE = -ifneq ($(CONFIG_X86_GRUB_CONSOLE),) +USE_ATKBD = generic 64 + +ifneq ($(strip $(foreach subtarget,$(USE_ATKBD),$(CONFIG_TARGET_x86_$(subtarget)))),) + GRUB2_MODULES += at_keyboard + GRUB2_MODULES_ISO += at_keyboard +endif + +ifneq ($(CONFIG_GRUB_CONSOLE),) GRUB_CONSOLE_CMDLINE += console=tty0 GRUB_TERMINALS += console endif -ifneq ($(CONFIG_X86_GRUB_SERIAL),) - GRUB_CONSOLE_CMDLINE += console=$(call qstrip,$(CONFIG_X86_GRUB_SERIAL)),$(CONFIG_X86_GRUB_BAUDRATE)n8 - GRUB_SERIAL_CONFIG := serial --unit=0 --speed=$(CONFIG_X86_GRUB_BAUDRATE) --word=8 --parity=no --stop=1 +GRUB_SERIAL:=$(call qstrip,$(CONFIG_GRUB_SERIAL)) + +ifneq ($(GRUB_SERIAL),) + GRUB_CONSOLE_CMDLINE += console=$(GRUB_SERIAL),$(CONFIG_GRUB_BAUDRATE)n8$(if $(CONFIG_GRUB_FLOWCONTROL),r,) + GRUB_SERIAL_CONFIG := serial --unit=0 --speed=$(CONFIG_GRUB_BAUDRATE) --word=8 --parity=no --stop=1 --rtscts=$(if $(CONFIG_GRUB_FLOWCONTROL),on,off) GRUB_TERMINALS += serial endif ifneq ($(GRUB_TERMINALS),) - GRUB_TERMINAL_CONFIG := terminal --timeout=2 $(GRUB_TERMINALS) + GRUB_TERMINAL_CONFIG := terminal_input $(GRUB_TERMINALS); terminal_output $(GRUB_TERMINALS) endif +SIGNATURE:=$(shell perl -e 'printf("%08x", rand(0xFFFFFFFF))') +ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME)) +ROOTPART:=$(if $(ROOTPART),$(ROOTPART),PARTUUID=$(SIGNATURE)-02) -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 - endef - - define Image/cmdline/jffs2-64k - block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootwait - endef - - define Image/cmdline/jffs2-128k - block2mtd.block2mtd=$(ROOTPART),131072,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootwait - endef +GRUB_TIMEOUT:=$(call qstrip,$(CONFIG_GRUB_TIMEOUT)) +GRUB_TITLE:=$(call qstrip,$(CONFIG_GRUB_TITLE)) - define Image/cmdline/squashfs - block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs rootwait - endef +# Convert a raw image into a $1 type image. +# E.g. | qemu-image vdi +define Build/qemu-image + qemu-img convert -f raw -O $1 \ + $@ \ + $@.new + mv $@.new $@ +endef - define Image/Build/grub - # left here because the image builder doesnt need these - $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub - $(CP) \ - $(KDIR)/*stage* \ - $(KDIR)/root.grub/boot/grub/ - $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz +define Build/grubpc + -rm -rf "$@.grubpc" "$@.root.grub" + $(INSTALL_DIR) $@.root.grub/boot/grub $@.grubpc + $(CP) $(IMAGE_KERNEL) $@.root.grub/boot/vmlinuz + grub-mkimage \ + -p /boot/grub \ + -d $(STAGING_DIR_HOST)/lib/grub/i386-pc \ + -o $@.grubpc/core.img \ + -O i386-pc \ + -c ./grub-early.cfg \ + $(GRUB2_MODULES) + $(CP) $(STAGING_DIR_HOST)/lib/grub/i386-pc/*.img $@.grubpc/ + echo '(hd0) $@' > $@.grubpc/device.map 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' \ - ./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)-combined-$(1).img \ - $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub \ - $(CONFIG_TARGET_ROOTFS_FSPART) $(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 \ - $(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)-combined-$(1).img \ - $(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 - endef + -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(FILESYSTEM)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ + -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ + -e 's#@TITLE@#$(GRUB_TITLE)#g' \ + ./grub.cfg > $@.root.grub/boot/grub/grub.cfg + -$(CP) $(STAGING_DIR_ROOT)/boot/. $@.root.grub/boot/ + PADDING="1" SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" $(SCRIPT_DIR)/gen_image_generic.sh \ + $@ \ + $(CONFIG_TARGET_KERNEL_PARTSIZE) $@.root.grub \ + $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(IMAGE_ROOTFS) \ + 256 + grub-bios-setup \ + --device-map="$@.grubpc/device.map" \ + -d "$@.grubpc" \ + -r "hd0,msdos1" \ + "$@" + rm -rf "$@.grubpc" "$@.root.grub" +endef - define Image/cmdline/jffs2-64k - block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootdelay=$(ROOTDELAY) - endef +ifneq ($(CONFIG_GRUB_IMAGES),) + BOOTOPTS:=$(call qstrip,$(CONFIG_GRUB_BOOTOPTS)) - define Image/cmdline/jffs2-128k - block2mtd.block2mtd=$(ROOTPART),131072,rootfs root=/dev/mtdblock0 rootfstype=jffs2 rootdelay=$(ROOTDELAY) + define Image/cmdline/ext4 + root=$(ROOTPART) rootfstype=ext4 rootwait endef define Image/cmdline/squashfs - block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs rootdelay=$(ROOTDELAY) - endef - - define Image/Build/bootscript - # left here because the image builder doesnt need these - $(INSTALL_DIR) $(KDIR)/root.bootscript/boot - $(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)-combined-$(1).img \ - $(CONFIG_OLPC_BOOTSCRIPT_KERNELPART) $(KDIR)/root.bootscript \ - $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1) + root=$(ROOTPART) rootfstype=squashfs rootwait endef - endif -define Image/Build/squashfs - $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) -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 +define Build/grubiso + -rm -rf "$@.root.grub/boot/grub" "$@.grubiso" + $(INSTALL_DIR) $@.root.grub/boot/grub $@.grubiso + $(CP) $(IMAGE_KERNEL) $@.root.grub/boot/vmlinuz + grub-mkimage \ + -p /boot/grub \ + -d $(STAGING_DIR_HOST)/lib/grub/i386-pc \ + -o $@.grub2/eltorito.img \ + -O i386-pc \ + -c ./grub-early.cfg \ + $(GRUB2_MODULES_ISO) + cat \ + $(STAGING_DIR_HOST)/lib/grub/i386-pc/cdboot.img \ + $@.grub2/eltorito.img \ + > $@.root.grub/boot/grub/eltorito.img 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#(hd0,0)#(cd)#g' \ - ./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 - -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)-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 - -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 -O vmdk \ - $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ - $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk - endif - endef -endif - -define Image/BuildKernel - $(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz + -e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait $(strip $(call Image/cmdline/$(FILESYSTEM)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ + -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ + -e 's#@TITLE@#$(GRUB_TITLE)#g' \ + ./grub-iso.cfg > $@.root.grub/boot/grub/grub.cfg + -$(CP) $(STAGING_DIR_ROOT)/boot/. $@.root.grub/boot/ + mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \ + -o $@ $@.root.grub $(TARGET_DIR) + rm -rf "$@.root.grub/boot/grub" "$@.grubiso" endef -define Image/Prepare - $(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage - $(call Image/Prepare/bootscript) - $(call Image/Prepare/grub) +define Device/generic + PROFILES := Default + DEVICE_TITLE := Generic (ext4/squashfs) + KERNEL := kernel-bin + IMAGES := vdi.gz vmdk.gz raw.img.gz + IMAGE/vdi.gz := grubpc | qemu-image vdi | gzip + IMAGE/vmdk.gz := grubpc | qemu-image vmdk | gzip + IMAGE/raw.img.gz := grubpc | gzip + FILESYSTEMS := squashfs ext4 endef -define Image/Build - $(call Image/Build/$(1)) - $(call Image/Build/bootscript,$(1)) - ifneq ($(1),iso) - $(call Image/Build/grub,$(1)) - $(call Image/Build/vdi,$(1)) - $(call Image/Build/vmdk,$(1)) - endif - $(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)-combined-$(1).img - gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img - endif +TARGET_DEVICES += generic + +define Device/generic-iso + PROFILES := Default + DEVICE_TITLE := Generic (iso) + KERNEL := kernel-bin + IMAGES := iso.gz + IMAGE/iso.gz := grubiso | append-metadata | gzip + FILESYSTEMS := iso endef -$(eval $(call BuildImage)) +TARGET_DEVICES += generic-iso -ifneq ($(CONFIG_X86_VDI_IMAGES),) - $(eval $(call RequireCommand,VBoxManage, \ - You need VBoxManage to generate VirtualBox images. \ - )) -endif +ifeq ($(SUBTARGET),geode) + +define Device/geos + DEVICE_TITLE := Geos + KERNEL := kernel-bin + IMAGES := iso.gz + IMAGE/iso.gz := grubiso | append-metadata | gzip + FILESYSTEMS := iso + DEVICE_PACKAGES := soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \ + hwclock flashrom tc kmod-pppoa kmod-8139cp kmod-mppe \ + kmod-usb-ohci-pci kmod-hwmon-lm90 +endef +TARGET_DEVICES += geos -ifneq ($(CONFIG_X86_VMDK_IMAGES),) - $(eval $(call RequireCommand,qemu-img, \ - You need qemu-img to generate VMware images. \ - )) endif + +$(eval $(call BuildImage))