From f790e3e6486acabd6b7f72c321e8f8fd2279c0c2 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Tue, 13 Jun 2023 18:07:44 +0200 Subject: [PATCH] build_library: For now don't use a version for the OEM sysext image The initial MVP of the OEM sysext usage we release won't have updates for the sysext image and, therefore, it is not bound to the OS version. The special name suffix instead of the version hints bootengine at using it if no matching version is found. The name will also be used at hint for update-engine to clean it up when versioned sysext images arrive. --- build_library/vm_image_util.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh index 802f0aa137..b684e45277 100644 --- a/build_library/vm_image_util.sh +++ b/build_library/vm_image_util.sh @@ -548,19 +548,22 @@ install_oem_sysext() { local built_sysext_dir="${FLAGS_to}/${oem_sysext}-sysext" local built_sysext_filename="${oem_sysext}.raw" local built_sysext_path="${built_sysext_dir}/${built_sysext_filename}" + # TODO: Set 'version' to with "${FLATCAR_VERSION}" and + # 'version_id' to "${FLATCAR_VERSION_ID}" when we implement updating OEM sysexts + local version='initial' + local version_id='initial' local build_oem_sysext_flags=( --board="${BOARD}" --build_dir="${built_sysext_dir}" --prod_image_path="${VM_SRC_IMG}" --prod_pkgdb_path="${VM_SRC_PKGDB}" - # TODO: Drop this when we implement updating OEM sysexts. - --version_id=initial + --version_id="${version_id}" ) "${SCRIPT_ROOT}/build_oem_sysext" "${build_oem_sysext_flags[@]}" "${oem_sysext}" local installed_sysext_oem_dir='/oem/sysext' - local installed_sysext_file_prefix="${oem_sysext}-${FLATCAR_VERSION}" + local installed_sysext_file_prefix="${oem_sysext}-${version}" local installed_sysext_filename="${installed_sysext_file_prefix}.raw" local installed_sysext_abspath="${installed_sysext_oem_dir}/${installed_sysext_filename}" info "Installing ${oem_sysext} sysext"