fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

armsr: change image names to 'combined-efi'

Browse Source 
luci-app-attendedsysupgrade expects images to be named
'combined-efi' when the system is using EFI images.

This came about as x86 has 'combined' images for legacy
(BIOS) boot and 'combined-efi' for EFI systems.

armsr images were originally named 'combined' only
as there was no 'legacy' image type.

To avoid special handling in the attendedsysupgrade
code, name EFI images consistent with other targets.

Signed-off-by: Mathew McBride <matt@traverse.com.au>
(cherry picked from commit e79331e65f)
This commit is contained in:
Mathew McBride 2023-06-22 23:36:28 +00:00 committed by Tianling Shen
parent 2de53bce9f
commit 154fd33b9c
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/armsr/README
View File

@ -49,7 +49,7 @@ With a EDKII or U-Boot binary for the QEMU ARM virtual machines, you can use the
images in EFI mode: images in EFI mode:
32-bit: 32-bit:
gunzip -c bin/targets/armsr/armv7/openwrt-armsr-armv7-generic-ext4-combined.img.gz > openwrt-arm-32.img gunzip -c bin/targets/armsr/armv7/openwrt-armsr-armv7-generic-ext4-combined-efi.img.gz > openwrt-arm-32.img
qemu-system-arm -nographic \ qemu-system-arm -nographic \
-cpu cortex-a15 -machine virt \ -cpu cortex-a15 -machine virt \
-bios bin/targets/armsr/armv7/u-boot-qemu_armv7/u-boot.bin \ -bios bin/targets/armsr/armv7/u-boot-qemu_armv7/u-boot.bin \
@ -60,7 +60,7 @@ qemu-system-arm -nographic \
-netdev user,id=testwan -net nic,netdev=testwan -netdev user,id=testwan -net nic,netdev=testwan
64-bit: 64-bit:
gunzip -c bin/targets/armsr/armv8/openwrt-armsr-armv8-generic-ext4-combined.img.gz > openwrt-arm-64.img gunzip -c bin/targets/armsr/armv8/openwrt-armsr-armv8-generic-ext4-combined-efi.img.gz > openwrt-arm-64.img
qemu-system-aarch64 -nographic \ qemu-system-aarch64 -nographic \
-cpu cortex-a53 -machine virt \ -cpu cortex-a53 -machine virt \
-bios bin/targets/armsr/armv8/u-boot-qemu_armv8/u-boot.bin \ -bios bin/targets/armsr/armv8/u-boot-qemu_armv8/u-boot.bin \

16
target/linux/armsr/image/Makefile
View File

@ -77,22 +77,22 @@ DEVICE_VARS += GRUB2_VARIANT UBOOT
define Device/efi-default define Device/efi-default
IMAGE/rootfs.img := append-rootfs | pad-to $(ROOTFS_PARTSIZE) IMAGE/rootfs.img := append-rootfs | pad-to $(ROOTFS_PARTSIZE)
IMAGE/rootfs.img.gz := append-rootfs | pad-to $(ROOTFS_PARTSIZE) | gzip IMAGE/rootfs.img.gz := append-rootfs | pad-to $(ROOTFS_PARTSIZE) | gzip
IMAGE/combined.img := grub-config efi | combined efi | grub-install efi | append-metadata IMAGE/combined-efi.img := grub-config efi | combined efi | grub-install efi | append-metadata
IMAGE/combined.img.gz := grub-config efi | combined efi | grub-install efi | gzip | append-metadata IMAGE/combined-efi.img.gz := grub-config efi | combined efi | grub-install efi | gzip | append-metadata
IMAGE/combined.qcow2 := grub-config efi | combined efi | grub-install efi | qemu-image qcow2 IMAGE/combined-efi.qcow2 := grub-config efi | combined efi | grub-install efi | qemu-image qcow2
IMAGE/combined.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk IMAGE/combined-efi.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk
ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y) ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y)
IMAGES-y := rootfs.img.gz IMAGES-y := rootfs.img.gz
IMAGES-y += combined.img.gz IMAGES-y += combined-efi.img.gz
else else
IMAGES-y := rootfs.img IMAGES-y := rootfs.img
IMAGES-y += combined.img IMAGES-y += combined-efi.img
endif endif
ifeq ($(CONFIG_QCOW2_IMAGES),y) ifeq ($(CONFIG_QCOW2_IMAGES),y)
IMAGES-y += combined.qcow2 IMAGES-y += combined-efi.qcow2
endif endif
ifeq ($(CONFIG_VMDK_IMAGES),y) ifeq ($(CONFIG_VMDK_IMAGES),y)
IMAGES-y += combined.vmdk IMAGES-y += combined-efi.vmdk
endif endif
KERNEL := kernel-bin KERNEL := kernel-bin
KERNEL_INSTALL := 1 KERNEL_INSTALL := 1