mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-11 06:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

build_library: create_prod_sysexts: Move artifacts to BUILD_DIR

Browse Source 
Putting things in a sysexts subdir results in the same layout on
bincache and does not follow the expected url schema for fetching the
sysext.

Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
This commit is contained in:
Jeremi Piotrowski 2024-03-11 17:35:18 +00:00
parent 42ed2d9b7e
commit 1ec40b2dac
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
build_library/prod_image_util.sh
View File

@ -251,8 +251,6 @@ create_prod_tar() {
create_prod_sysexts() { create_prod_sysexts() {
local image_name="$1" local image_name="$1"
local image_sysext_base="${image_name%.bin}_sysext.squashfs" local image_sysext_base="${image_name%.bin}_sysext.squashfs"
sudo rm -rf "${BUILD_DIR}/sysexts/*"
mkdir -p "${BUILD_DIR}/sysexts"
local to_upload=() local to_upload=()
for sysext in "${EXTRA_SYSEXTS[@]}"; do for sysext in "${EXTRA_SYSEXTS[@]}"; do
local name="flatcar-${sysext%:*}" local name="flatcar-${sysext%:*}"
@ -261,24 +259,27 @@ create_prod_sysexts() {
if [[ ! -x "${mangle_script}" ]]; then if [[ ! -x "${mangle_script}" ]]; then
mangle_script= mangle_script=
fi fi
sudo rm -f "${BUILD_DIR}/${name}.raw" \
"${BUILD_DIR}/flatcar-test-update-${name}.gz" \
"${BUILD_DIR}/${name}_*"
sudo "${SCRIPT_ROOT}/build_sysext" --board="${BOARD}" \ sudo "${SCRIPT_ROOT}/build_sysext" --board="${BOARD}" \
--squashfs_base="${BUILD_DIR}/${image_sysext_base}" \ --squashfs_base="${BUILD_DIR}/${image_sysext_base}" \
--image_builddir="${BUILD_DIR}/sysexts" \ --image_builddir="${BUILD_DIR}" \
${mangle_script:+--manglefs_script=${mangle_script}} \ ${mangle_script:+--manglefs_script=${mangle_script}} \
"${name}" "${pkg}" "${name}" "${pkg}"
delta_generator \ delta_generator \
-private_key "/usr/share/update_engine/update-payload-key.key.pem" \ -private_key "/usr/share/update_engine/update-payload-key.key.pem" \
-new_image "${BUILD_DIR}/sysexts/${name}.raw" \ -new_image "${BUILD_DIR}/${name}.raw" \
-out_file "${BUILD_DIR}/sysexts/flatcar_test_update-${name}.gz" -out_file "${BUILD_DIR}/flatcar_test_update-${name}.gz"
to_upload+=( to_upload+=(
"${BUILD_DIR}/sysexts/${name}.raw" "${BUILD_DIR}/${name}.raw"
"${BUILD_DIR}/sysexts/${name}_contents.txt" "${BUILD_DIR}/${name}_contents.txt"
"${BUILD_DIR}/sysexts/${name}_contents_wtd.txt" "${BUILD_DIR}/${name}_contents_wtd.txt"
"${BUILD_DIR}/sysexts/${name}_disk_usage.txt" "${BUILD_DIR}/${name}_disk_usage.txt"
"${BUILD_DIR}/sysexts/${name}_packages.txt" "${BUILD_DIR}/${name}_packages.txt"
"${BUILD_DIR}/sysexts/flatcar_test_update-${name}.gz" "${BUILD_DIR}/flatcar_test_update-${name}.gz"
) )
done done
upload_image -d ${BUILD_DIR}/sysexts/sysext.DIGESTS "${to_upload[@]}" upload_image -d ${BUILD_DIR}/sysexts.DIGESTS "${to_upload[@]}"
} }