Merge pull request #910 from flatcar/kai/sysext-mvp

build_library: For now don't use a version for the OEM sysext image
This commit is contained in:
Kai Lüke 2023-06-14 14:31:40 +02:00 committed by GitHub
commit f2ee542503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -548,19 +548,22 @@ install_oem_sysext() {
local built_sysext_dir="${FLAGS_to}/${oem_sysext}-sysext" local built_sysext_dir="${FLAGS_to}/${oem_sysext}-sysext"
local built_sysext_filename="${oem_sysext}.raw" local built_sysext_filename="${oem_sysext}.raw"
local built_sysext_path="${built_sysext_dir}/${built_sysext_filename}" 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=( local build_oem_sysext_flags=(
--board="${BOARD}" --board="${BOARD}"
--build_dir="${built_sysext_dir}" --build_dir="${built_sysext_dir}"
--prod_image_path="${VM_SRC_IMG}" --prod_image_path="${VM_SRC_IMG}"
--prod_pkgdb_path="${VM_SRC_PKGDB}" --prod_pkgdb_path="${VM_SRC_PKGDB}"
# TODO: Drop this when we implement updating OEM sysexts. --version_id="${version_id}"
--version_id=initial
) )
"${SCRIPT_ROOT}/build_oem_sysext" "${build_oem_sysext_flags[@]}" "${oem_sysext}" "${SCRIPT_ROOT}/build_oem_sysext" "${build_oem_sysext_flags[@]}" "${oem_sysext}"
local installed_sysext_oem_dir='/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_filename="${installed_sysext_file_prefix}.raw"
local installed_sysext_abspath="${installed_sysext_oem_dir}/${installed_sysext_filename}" local installed_sysext_abspath="${installed_sysext_oem_dir}/${installed_sysext_filename}"
info "Installing ${oem_sysext} sysext" info "Installing ${oem_sysext} sysext"