From 16fee4f5b1a890857a4e0c41485a0edf7bf6a576 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Tue, 4 Jul 2023 14:18:15 +0200
Subject: [PATCH] build_library/vm_image_util.sh: Switch OEM sysext image
 building to build_sysext

---
 build_library/vm_image_util.sh | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 762364b5c9..22a5685522 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -554,19 +554,30 @@ 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
+    # TODO: Set 'version' to "${FLATCAR_VERSION}" and drop
+    # VERSION_FIELD_OVERRIDE when we implement updating OEM sysexts.
     local version='initial'
-    local version_id='initial'
-    local build_oem_sysext_flags=(
+    local build_sysext_env=(
+        VERSION_FIELD_OVERRIDE='SYSEXT_LEVEL=1.0'
+    )
+    local metapkg="coreos-base/${oem_sysext}"
+    local build_sysext_flags=(
         --board="${BOARD}"
         --build_dir="${built_sysext_dir}"
-        --prod_image_path="${VM_SRC_IMG}"
-        --prod_pkgdb_path="${VM_SRC_PKGDB}"
-        --version_id="${version_id}"
+        --squashfs_base="${VM_SRC_SYSEXT_IMG}"
+        --metapkgs="${metapkg}"
     )
+    local overlay_path mangle_fs
+    overlay_path=$(portageq get_repo_path / coreos)
+    mangle_fs="${overlay_path}/${metapkg}/files/manglefs.sh"
+    if [[ -x "${mangle_fs}" ]]; then
+        build_sysext_flags+=(
+            --manglefs_script="${mangle_fs}"
+        )
+    fi
 
-    "${SCRIPT_ROOT}/build_oem_sysext" "${build_oem_sysext_flags[@]}" "${oem_sysext}"
+    mkdir -p "${built_sysext_dir}"
+    sudo "${build_sysext_env[@]}" "${SCRIPT_ROOT}/build_sysext" "${build_sysext_flags[@]}" "${oem_sysext}"
 
     local installed_sysext_oem_dir='/oem/sysext'
     local installed_sysext_file_prefix="${oem_sysext}-${version}"