Inicio Explorar Ayuda
Registro Iniciar sesión
OpenWrt
/
OpenWrt_x86-r2s-r4s-r5s-N1
espejo de https://github.com/kiddin9/OpenWrt_x86-r2s-r4s-r5s-N1.git
2
0
Fork 0
Archivos Incidencias 0 Wiki
Árbol: b8e010e67a
Ramas Etiquetas
OpenWrt_x86-r2s...
/
devices
/
x86_generic
/
patches
/
image.patch

image.patch 2.8 KB
Histórico Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849 
  1. From c7bc056650227ba6003414356f57b33cdb2603b7 Mon Sep 17 00:00:00 2001
    2. 

  2. From: kiddin9 <[email protected]>
    3. 

  3. Date: Sat, 23 Apr 2022 18:38:12 +0800
    4. 

  4. Subject: [PATCH] Update Makefile
    5. 

  5. 

  6. ---
    7. 

  7.  target/linux/x86/image/Makefile | 12 ++++--------
    8. 

  8.  1 file changed, 4 insertions(+), 8 deletions(-)
    9. 

  9. 

  10. diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
    11. 

  11. index 322131c2a488..0b4ed1d272eb 100644
    12. 

  12. --- a/target/linux/x86/image/Makefile
    13. 

  13. +++ b/target/linux/x86/image/Makefile
    14. 

  14. @@ -108,22 +108,18 @@ define Device/Default
    15. 

  15.    IMAGE/combined.img := grub-config pc | combined | grub-install | append-metadata
    16. 

  16.    IMAGE/combined.img.gz := grub-config pc | combined | grub-install | gzip | append-metadata
    17. 

  17.    IMAGE/combined.vdi := grub-config pc | combined | grub-install | qemu-image vdi
    18. 

  18. -  IMAGE/combined.vmdk := grub-config pc | combined | grub-install | qemu-image vmdk
    19. 

  19. +  IMAGE/combined.vmdk.zip := grub-config pc | combined | grub-install | qemu-exsi vmdk -o adapter_type=lsilogic -o subformat=monolithicFlat
    20. 

  20.    IMAGE/combined.vhdx := grub-config pc | combined | grub-install | qemu-image vhdx -o subformat=dynamic
    21. 

  21. -  IMAGE/rootfs.img := append-rootfs | pad-to $(ROOTFS_PARTSIZE)
    22. 

  22. -  IMAGE/rootfs.img.gz := append-rootfs | pad-to $(ROOTFS_PARTSIZE) | gzip
    23. 

  23.    ARTIFACT/image-efi.iso := grub-config iso | iso efi
    24. 

  24.    IMAGE/combined-efi.img := grub-config efi | combined efi | grub-install efi | append-metadata
    25. 

  25.    IMAGE/combined-efi.img.gz := grub-config efi | combined efi | grub-install efi | gzip | append-metadata
    26. 

  26.    IMAGE/combined-efi.vdi := grub-config efi | combined efi | grub-install efi | qemu-image vdi
    27. 

  27. -  IMAGE/combined-efi.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk
    28. 

  28. +  IMAGE/combined-efi.vmdk.zip := grub-config efi | combined efi | grub-install efi | qemu-exsi vmdk -o adapter_type=lsilogic -o subformat=monolithicFlat
    29. 

  29.    IMAGE/combined-efi.vhdx := grub-config efi | combined efi | grub-install efi | qemu-image vhdx -o subformat=dynamic
    30. 

  30.    ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y)
    31. 

  31. -    IMAGES-y := rootfs.img.gz
    32. 

  32.      IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.img.gz
    33. 

  33.      IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.img.gz
    34. 

  34.    else
    35. 

  35. -    IMAGES-y := rootfs.img
    36. 

  36.      IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.img
    37. 

  37.      IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.img
    38. 

  38.    endif
    39. 

  39. @@ -139,8 +135,8 @@ define Device/Default
    40. 

  40.      IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vdi
    41. 

  41.    endif
    42. 

  42.    ifeq ($(CONFIG_VMDK_IMAGES),y)
    43. 

  43. -    IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vmdk
    44. 

  44. -    IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vmdk
    45. 

  45. +    IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vmdk.zip
    46. 

  46. +    IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vmdk.zip
    47. 

  47.    endif
    48. 

  48.    ifeq ($(CONFIG_VHDX_IMAGES),y)
    49. 

  49.      IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vhdx
    50.