From ad324df09e327cea9294c2f36015381bc707698e Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Thu, 2 Sep 2021 07:24:07 +0000 Subject: [PATCH] build_library: introduce rpi4 image type The rpi4 image type installs rpi4 oem configuration and the rpi4 UEFI firmware into the boot partition. Signed-off-by: Jeremi Piotrowski --- build_library/vm_image_util.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index a63edb85be..a19de94b76 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -34,6 +34,7 @@ VALID_IMG_TYPES=( rackspace rackspace_onmetal rackspace_vhd + rpi4 vagrant vagrant_parallels vagrant_virtualbox @@ -62,6 +63,7 @@ VALID_OEM_PACKAGES=( qemu rackspace rackspace-onmetal + rpi4 vagrant vagrant-key vagrant-virtualbox @@ -123,6 +125,9 @@ IMG_DEFAULT_MEM=1024 # Number of CPUs to use in any config files IMG_DEFAULT_CPUS=2 +# Copy files installed by OEM package from /boot to ESP partition +IMG_DEFAULT_COPY_BOOT=false + ## qemu IMG_qemu_DISK_FORMAT=qcow2 IMG_qemu_DISK_LAYOUT=vm @@ -270,6 +275,10 @@ IMG_rackspace_onmetal_DISK_FORMAT=qcow2 IMG_rackspace_onmetal_DISK_LAYOUT=onmetal IMG_rackspace_onmetal_OEM_PACKAGE=oem-rackspace-onmetal +IMG_rpi4_DISK_FORMAT=raw +IMG_rpi4_OEM_PACKAGE=oem-rpi4 +IMG_rpi4_COPY_BOOT=true + ## cloudstack IMG_cloudstack_OEM_PACKAGE=oem-cloudstack IMG_cloudstack_vhd_DISK_FORMAT=vhd @@ -476,6 +485,7 @@ install_oem_package() { local oem_pkg=$(_get_vm_opt OEM_PACKAGE) local oem_use=$(_get_vm_opt OEM_USE) local oem_tmp="${VM_TMP_DIR}/oem" + local oem_copy_boot="$(_get_vm_opt COPY_BOOT)" if [[ -z "${oem_pkg}" ]]; then return 0 @@ -501,6 +511,7 @@ install_oem_package() { --root-deps=rdeps --usepkgonly ${getbinpkg} \ --quiet --jobs=2 "${oem_pkg}" sudo rsync -a "${oem_tmp}/usr/share/oem/" "${VM_TMP_ROOT}/usr/share/oem/" + ( $oem_copy_boot ) && sudo rsync -a "${oem_tmp}/boot/" "${VM_TMP_ROOT}/boot/" sudo rm -rf "${oem_tmp}" }