diff options
Diffstat (limited to 'target/linux/x86')
| -rw-r--r-- | target/linux/x86/image/Config.in | 7 | ||||
| -rw-r--r-- | target/linux/x86/image/Makefile | 64 | ||||
| -rwxr-xr-x | target/linux/x86/image/gen_image_grub.sh | 13 | ||||
| -rw-r--r-- | target/linux/x86/image/menu.lst | 15 |
4 files changed, 6 insertions, 93 deletions
diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in index 08880e5803..653aa61eff 100644 --- a/target/linux/x86/image/Config.in +++ b/target/linux/x86/image/Config.in @@ -17,13 +17,8 @@ config X86_GRUB_IMAGES bool "Build GRUB images (Linux x86 or x86_64 host only)" depends TARGET_x86 && !TARGET_x86_olpc depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS - select PACKAGE_grub if !X86_USE_GRUB2 - default y - -config X86_USE_GRUB2 - bool "Use grub2" - depends X86_GRUB_IMAGES select PACKAGE_grub2 + default y config X86_GRUB_CONSOLE bool "Use Console Terminal (in addition to Serial)" diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 17e300d508..028612a12e 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -28,11 +28,7 @@ ifneq ($(CONFIG_X86_GRUB_SERIAL),) endif ifneq ($(GRUB_TERMINALS),) - ifneq ($(CONFIG_X86_USE_GRUB2),) - GRUB_TERMINAL_CONFIG := terminal_input $(GRUB_TERMINALS); terminal_output $(GRUB_TERMINALS) - else - GRUB_TERMINAL_CONFIG := terminal --timeout=2 $(GRUB_TERMINALS) - endif + GRUB_TERMINAL_CONFIG := terminal_input $(GRUB_TERMINALS); terminal_output $(GRUB_TERMINALS) endif ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME)) @@ -59,38 +55,6 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),) block2mtd.block2mtd=$(ROOTPART),65536,rootfs root=/dev/mtdblock0 rootfstype=squashfs rootwait endef - define Image/Build/grub - # left here because the image builder doesnt need these - $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub - $(CP) \ - $(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_TARGET_IMAGES_PAD)" PATH="$(TARGET_PATH)" ./gen_image_grub.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)/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 - define Image/Build/grub2 # left here because the image builder doesnt need these $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 @@ -160,8 +124,7 @@ define Image/Build/squashfs $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) endef -ifdef CONFIG_X86_USE_GRUB2 - define Image/Build/iso +define Image/Build/iso $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz grub-mkimage \ @@ -182,24 +145,7 @@ ifdef CONFIG_X86_USE_GRUB2 $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \ -o $(KDIR)/root.iso $(KDIR)/root.grub $(TARGET_DIR) - endef -else - define Image/Build/iso - $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub - $(CP) \ - $(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' \ - -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 -endif +endef ifneq ($(CONFIG_X86_VDI_IMAGES),) define Image/Build/vdi @@ -263,14 +209,14 @@ endef define Image/Prepare $(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage $(call Image/Prepare/bootscript) - $(call Image/Prepare/$(if $(CONFIG_X86_USE_GRUB2),grub2,grub)) + $(call Image/Prepare/grub2) endef define Image/Build $(call Image/Build/$(1)) $(call Image/Build/bootscript,$(1)) ifneq ($(1),iso) - $(call Image/Build/$(if $(CONFIG_X86_USE_GRUB2),grub2,grub),$(1)) + $(call Image/Build/grub2,$(1)) $(call Image/Build/vdi,$(1)) $(call Image/Build/vmdk,$(1)) endif diff --git a/target/linux/x86/image/gen_image_grub.sh b/target/linux/x86/image/gen_image_grub.sh deleted file mode 100755 index 9a84322f44..0000000000 --- a/target/linux/x86/image/gen_image_grub.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -# Copyright (C) 2006-2010 OpenWrt.org -. ./gen_image_generic.sh - -which chpax >/dev/null && chpax -zp $(which grub) -grub --batch --no-curses --no-floppy --device-map=/dev/null <<EOF -device (hd0) $OUTPUT -geometry (hd0) $cyl $head $sect -root (hd0,0) -setup (hd0) -quit -EOF - diff --git a/target/linux/x86/image/menu.lst b/target/linux/x86/image/menu.lst deleted file mode 100644 index 5af1e955b3..0000000000 --- a/target/linux/x86/image/menu.lst +++ /dev/null @@ -1,15 +0,0 @@ -@SERIAL_CONFIG@ -@TERMINAL_CONFIG@ - -default 0 -timeout @TIMEOUT@ - -title OpenWrt -root (hd0,0) -kernel /boot/vmlinuz @CMDLINE@ noinitrd reboot=bios -boot - -title OpenWrt (failsafe) -root (hd0,0) -kernel /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd reboot=bios -boot |