diff --git a/build_image b/build_image index a9e6bcdaf82..f365c2c1908 100755 --- a/build_image +++ b/build_image @@ -177,7 +177,8 @@ if [[ "${PROD_IMAGE}" -eq 1 ]]; then if [[ ${FLAGS_extract_update} -eq ${FLAGS_TRUE} ]]; then extract_update "${FLATCAR_PRODUCTION_IMAGE_NAME}" "${DISK_LAYOUT}" fi - if [[ ${FLAGS_generate_update} -eq ${FLAGS_TRUE} ]]; then + # TODO: Un-nobble this later when we have passed the shim review. + if [[ ${FLAGS_generate_update} -eq ${FLAGS_TRUE} ]]; then # && ${COREOS_OFFICIAL:-0} -ne 1 ]]; then generate_update "${FLATCAR_PRODUCTION_IMAGE_NAME}" "${DISK_LAYOUT}" fi if [[ "${PROD_TAR}" -eq 1 ]]; then diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh index bd26b5dab94..4fc7a4c43d8 100755 --- a/build_library/build_image_util.sh +++ b/build_library/build_image_util.sh @@ -79,7 +79,9 @@ generate_update() { local devkey="/usr/share/update_engine/update-payload-key.key.pem" # Extract the partition if it isn't extracted already. - [[ -s ${update} ]] || extract_update "${image_name}" "${disk_layout}" + [[ -s ${update} ]] || + "${BUILD_LIBRARY_DIR}/disk_util" --disk_layout="${disk_layout}" \ + extract "${BUILD_DIR}/${image_name}" "USR-A" "${update}" echo "Generating update payload, signed with a dev key" delta_generator \ diff --git a/changelog/updates/2024-12-28-linux-6.6.68-update.md b/changelog/updates/2024-12-28-linux-6.6.68-update.md new file mode 100644 index 00000000000..fc408d0e6d2 --- /dev/null +++ b/changelog/updates/2024-12-28-linux-6.6.68-update.md @@ -0,0 +1 @@ +- Linux ([6.6.68](https://lwn.net/Articles/1003609)) diff --git a/changelog/updates/2025-01-03-linux-6.6.69-update.md b/changelog/updates/2025-01-03-linux-6.6.69-update.md new file mode 100644 index 00000000000..6a75d9782fb --- /dev/null +++ b/changelog/updates/2025-01-03-linux-6.6.69-update.md @@ -0,0 +1 @@ +- Linux ([6.6.69](https://lwn.net/Articles/1003986)) diff --git a/ci-automation/sbsign_image.sh b/ci-automation/sbsign_image.sh index fe3053e7fd6..9f2cb630d95 100644 --- a/ci-automation/sbsign_image.sh +++ b/ci-automation/sbsign_image.sh @@ -82,14 +82,17 @@ function _sbsign_image_impl() { local sdk_image="$(docker_image_fullname "${sdk_name}" "${docker_sdk_vernum}")" echo "docker image rm -f '${sdk_image}'" >> ./ci-cleanup.sh - ./run_sdk_container -x ./ci-cleanup.sh -v "${FLATCAR_VERSION}" -U -C "${sdk_image}" \ + local docker_vernum="$(vernum_to_docker_image_version "${FLATCAR_VERSION}")" + local sbsign_container="flatcar-sbsign-image-${arch}-${docker_vernum}" + ./run_sdk_container -x ./ci-cleanup.sh -n "${sbsign_container}" -v "${FLATCAR_VERSION}" -U -C "${sdk_image}" \ ./sbsign_image --board="${arch}-usr" \ --group="${channel}" --version="${FLATCAR_VERSION}" \ --output_root="${CONTAINER_IMAGE_ROOT}" \ --only_store_compressed # Delete uncompressed generic image before signing and upload - rm "${images_local}/flatcar_production_image.bin" + # Also delete update image because it will be unchanged + rm "${images_local}"/flatcar_production_{image,update}.bin create_digests "${SIGNER}" "${images_local}"/* sign_artifacts "${SIGNER}" "${images_local}"/* copy_to_buildcache "${images_remote}"/ "${images_local}"/* diff --git a/run_sdk_container b/run_sdk_container index 6cb9213a217..36ad60a19bf 100755 --- a/run_sdk_container +++ b/run_sdk_container @@ -22,7 +22,7 @@ mounts=() usage() { echo " Usage:" - echo " $0 [-t] [-v ] [-V ] [-a ] [-n ] [-x