mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-08 05:26:58 +02:00
361eda220b
This change fixes a version mismatch of FLATCAR_BUILD_ID when performing a dev build of an existing release tag. The build ID is part of the version string of dev builds, separated by a "+" from the main version. If common.sh detects a dev build (COREOS_OFFICIAL != 1) and FLATCAR_BUILD_ID is empty, common.sh will generate a new ID based on a timestamp. For official releases, FLATCAR_BUILD_ID is not set in version.txt. A dev build of a release tag would make common.sh generate a new ID each time it is sourced by different processes. build_image sources common.sh first, and writes the resulting version string the OS image's os-release file. build_sysext runs later and also sources common.sh, leading its version check to fail as its own VERSION now differs from the version of the OS image it's supposed to generate sysexts for. This change reads BUILD_ID from the OS image rootfs in sysext_prod_builder and exports FLATCAR_BUILD_ID accordingly before calling build_sysext. Hence FLATCAR_BUILD_ID is not empty, so common.sh in build_sysext will not re-generate it. Signed-off-by: Thilo Fromm <thilofromm@microsoft.com> |
||
|---|---|---|
| .. | ||
| board_options.sh | ||
| build_image_util.sh | ||
| catalyst_sdk.sh | ||
| catalyst_toolchains.sh | ||
| catalyst.sh | ||
| check_root | ||
| configure_bootloaders.sh | ||
| cros_vm_constants.sh | ||
| dev_container_util.sh | ||
| disk_layout.json | ||
| disk_util | ||
| ebuild_aci_manifest.in | ||
| ebuild_aci_util.sh | ||
| extra_sysexts.sh | ||
| extract-initramfs-from-vmlinuz.sh | ||
| gen_tmpfiles.py | ||
| generate_au_zip.py | ||
| generate_grub_hashes.py | ||
| generate_kernel_hash.py | ||
| grub_install.sh | ||
| grub.cfg | ||
| menu.lst | ||
| modify_image_util.sh | ||
| parallels_pvs.sh | ||
| prefix_util.sh | ||
| prod_image_util.sh | ||
| qemu_template.sh | ||
| release_util.sh | ||
| reports_util.sh | ||
| set_lsb_release | ||
| sysext_mangle_containerd-flatcar | ||
| sysext_mangle_docker-flatcar | ||
| sysext_mangle_flatcar-podman | ||
| sysext_mangle_flatcar-python | ||
| sysext_mangle_flatcar-zfs | ||
| sysext_prod_builder | ||
| template_vmware.ovf | ||
| test_build_root | ||
| test_image_content.sh | ||
| test_oem_pkgs | ||
| toolchain_util.sh | ||
| update_chroot_util.sh | ||
| virtualbox_ovf.sh | ||
| vm_image_util.sh | ||
| write_hdd.sh | ||