OpenWrt – Diff between revs 2 and 3
?pathlinks?
| Rev 2 | Rev 3 | |||
|---|---|---|---|---|
| Line 7... | Line 7... | |||
| 7 | include $(TOPDIR)/rules.mk |
7 | include $(TOPDIR)/rules.mk |
|
| 8 | include $(INCLUDE_DIR)/image.mk |
8 | include $(INCLUDE_DIR)/image.mk |
|
| Line 9... | Line 9... | |||
| 9 | |
9 | |
|
| Line 10... | Line 10... | |||
| 10 | export PATH=$(TARGET_PATH):/sbin |
10 | export PATH=$(TARGET_PATH):/sbin |
|
| 11 | |
11 | |
|
| 12 | GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial test vga |
12 | GRUB2_MODULES = biosdisk boot chain configfile ext2 linux ls part_msdos reboot serial vga |
|
| 13 | GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial test vga |
13 | GRUB2_MODULES_ISO = biosdisk boot chain configfile iso9660 linux ls part_msdos reboot serial vga |
|
| 14 | GRUB_TERMINALS = |
14 | GRUB_TERMINALS = |
|
| 15 | GRUB_SERIAL_CONFIG = |
15 | GRUB_SERIAL_CONFIG = |
|
| - | 16 | GRUB_TERMINAL_CONFIG = |
||
| Line 16... | Line 17... | |||
| 16 | GRUB_TERMINAL_CONFIG = |
17 | GRUB_CONSOLE_CMDLINE = |
|
| Line 17... | Line 18... | |||
| 17 | GRUB_CONSOLE_CMDLINE = |
18 | GRUB_ROOT = hd0,msdos1 |
|
| 18 | |
19 | |
|
| Line 43... | Line 44... | |||
| 43 | SIGNATURE:=$(shell perl -e 'printf("%08x", rand(0xFFFFFFFF))') |
44 | SIGNATURE:=$(shell perl -e 'printf("%08x", rand(0xFFFFFFFF))') |
|
| 44 | ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME)) |
45 | ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME)) |
|
| 45 | ROOTPART:=$(if $(ROOTPART),$(ROOTPART),PARTUUID=$(SIGNATURE)-02) |
46 | ROOTPART:=$(if $(ROOTPART),$(ROOTPART),PARTUUID=$(SIGNATURE)-02) |
|
| Line 46... | Line 47... | |||
| 46 | |
47 | |
|
| - | 48 | GRUB_TIMEOUT:=$(call qstrip,$(CONFIG_GRUB_TIMEOUT)) |
||
| 47 | GRUB_TIMEOUT:=$(call qstrip,$(CONFIG_GRUB_TIMEOUT)) |
49 | |
|
| - | 50 | ifneq ($(CONFIG_TARGET_x86_xen_domu),) |
||
| - | 51 | GRUB_ROOT = xen/xvda,msdos1 |
||
| Line 48... | Line 52... | |||
| 48 | GRUB_TITLE:=$(call qstrip,$(CONFIG_GRUB_TITLE)) |
52 | endif |
|
| Line 49... | Line 53... | |||
| 49 | |
53 | |
|
| Line 75... | Line 79... | |||
| 75 | sed \ |
79 | sed \ |
|
| 76 | -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ |
80 | -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ |
|
| 77 | -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ |
81 | -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ |
|
| 78 | -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ |
82 | -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ |
|
| 79 | -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ |
83 | -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ |
|
| 80 | -e 's#@TITLE@#$(GRUB_TITLE)#g' \ |
84 | -e 's#@ROOT@#$(GRUB_ROOT)#g' \ |
|
| 81 | ./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg |
85 | ./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg |
|
| 82 | -$(CP) $(STAGING_DIR_ROOT)/boot/. $(KDIR)/root.grub/boot/ |
- | ||
| 83 | PADDING="$(CONFIG_TARGET_IMAGES_PAD)" SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" $(SCRIPT_DIR)/gen_image_generic.sh \ |
86 | PADDING="$(CONFIG_TARGET_IMAGES_PAD)" SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" $(SCRIPT_DIR)/gen_image_generic.sh \ |
|
| 84 | $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ |
87 | $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ |
|
| 85 | $(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \ |
88 | $(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \ |
|
| 86 | $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \ |
89 | $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \ |
|
| 87 | 256 |
90 | 256 |
|
| Line 114... | Line 117... | |||
| 114 | sed \ |
117 | sed \ |
|
| 115 | -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ |
118 | -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ |
|
| 116 | -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ |
119 | -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ |
|
| 117 | -e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait $(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ |
120 | -e 's#@CMDLINE@#root=/dev/sr0 rootfstype=iso9660 rootwait $(strip $(call Image/cmdline/$(1)) $(BOOTOPTS) $(GRUB_CONSOLE_CMDLINE))#g' \ |
|
| 118 | -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ |
121 | -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ |
|
| 119 | -e 's#@TITLE@#$(GRUB_TITLE)#g' \ |
- | ||
| 120 | ./grub-iso.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg |
122 | ./grub-iso.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg |
|
| 121 | -$(CP) $(STAGING_DIR_ROOT)/boot/. $(KDIR)/root.grub/boot/ |
- | ||
| 122 | mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \ |
123 | mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \ |
|
| 123 | -o $(KDIR)/root.iso $(KDIR)/root.grub $(TARGET_DIR) |
124 | -o $(KDIR)/root.iso $(KDIR)/root.grub $(TARGET_DIR) |
|
| 124 | endef |
125 | endef |
|
| Line 125... | Line 126... | |||
| 125 | |
126 | |
|
| 126 | ifneq ($(CONFIG_VDI_IMAGES),) |
127 | ifneq ($(CONFIG_VDI_IMAGES),) |
|
| 127 | define Image/Build/vdi |
128 | define Image/Build/vdi |
|
| 128 | rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true |
129 | rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true |
|
| 129 | qemu-img convert -f raw -O vdi \ |
130 | qemu-img convert -f raw -O vdi \ |
|
| 130 | $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ |
131 | $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ |
|
| - | 132 | $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi |
||
| - | 133 | # XXX: VBoxManage insists on setting perms to 0600 |
||
| 131 | $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi |
134 | chmod 0644 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi |
|
| 132 | endef |
135 | endef |
|
| Line 133... | Line 136... | |||
| 133 | endif |
136 | endif |
|
| 134 | |
137 | |
|