From e4b22372ce3ee082a4d7ea22fb086a16c6c5308d Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Tue, 9 Dec 2025 17:50:00 +0000 Subject: [PATCH 1/4] Delete sdk_container/.repo/manifests/os-release As far as I can tell, this has never been used. Signed-off-by: James Le Cuirot --- sdk_container/.repo/manifests/os-release | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 sdk_container/.repo/manifests/os-release diff --git a/sdk_container/.repo/manifests/os-release b/sdk_container/.repo/manifests/os-release deleted file mode 100644 index 3942c3a2d9..0000000000 --- a/sdk_container/.repo/manifests/os-release +++ /dev/null @@ -1,6 +0,0 @@ -NAME="Flatcar Container Linux by Kinvolk" -ID=flatcar -ID_LIKE=coreos -ANSI_COLOR="38;5;75" -HOME_URL="https://flatcar.org/" -BUG_REPORT_URL="https://issues.flatcar.org" From b82850d1c9ae819bac7ba6fecaace62809ae67fe Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Wed, 10 Dec 2025 10:16:26 +0000 Subject: [PATCH 2/4] set_lsb_release: Drop the "Oklo" release codename It was never updated in a meaningful way. It was only used directly in lsb_release, which is a dead standard. It was included in the os-release `PRETTY_NAME` but not as a field on its own. Closes: https://github.com/flatcar/scripts/pull/88 Signed-off-by: James Le Cuirot --- build_library/set_lsb_release | 6 ++---- changelog/changes/2026-02-23-oklo-codename.md | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 changelog/changes/2026-02-23-oklo-codename.md diff --git a/build_library/set_lsb_release b/build_library/set_lsb_release index f86c968909..7705b16490 100755 --- a/build_library/set_lsb_release +++ b/build_library/set_lsb_release @@ -26,10 +26,9 @@ ROOT_FS_DIR="$FLAGS_root" [ -d "$ROOT_FS_DIR" ] || die "Root FS does not exist? ($ROOT_FS_DIR)" OS_NAME="Flatcar Container Linux by Kinvolk" -OS_CODENAME="Oklo" OS_ID="flatcar" OS_ID_LIKE="coreos" -OS_PRETTY_NAME="$OS_NAME $FLATCAR_VERSION (${OS_CODENAME})" +OS_PRETTY_NAME="$OS_NAME $FLATCAR_VERSION" FLATCAR_APPID="{e96281a6-d1af-4bde-9a0a-97b76e56dc57}" @@ -38,8 +37,7 @@ sudo mkdir -p "${ROOT_FS_DIR}/usr/share/flatcar" "${ROOT_FS_DIR}/etc/flatcar" sudo_clobber "${ROOT_FS_DIR}/usr/share/flatcar/lsb-release" < Date: Wed, 10 Dec 2025 10:37:19 +0000 Subject: [PATCH 3/4] set_lsb_release: Set some fields dynamically from the base profile This leverages the branding eclass that was recently added to Gentoo. Since originally preparing this commit, these fields were added to our make.conf, but setting them in the profile is more versatile, allowing for downstreams. Signed-off-by: James Le Cuirot --- build_library/set_lsb_release | 34 +++++++++---------- .../profiles/coreos/base/make.defaults | 19 +++++------ 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/build_library/set_lsb_release b/build_library/set_lsb_release index 7705b16490..44a4a5f4a1 100755 --- a/build_library/set_lsb_release +++ b/build_library/set_lsb_release @@ -11,7 +11,7 @@ SCRIPT_ROOT=$(readlink -f $(dirname "$0")/..) . "${SCRIPT_ROOT}/common.sh" || exit 1 # Flags -DEFINE_string board "" "The board to build an image for." +DEFINE_string board "${DEFAULT_BOARD}" "The board to build an image for." DEFINE_string root "" "The root file system to write /etc/lsb-release to." DEFINE_string group "" "The default update group for update_engine." @@ -25,17 +25,16 @@ ROOT_FS_DIR="$FLAGS_root" [ -n "$ROOT_FS_DIR" ] || die "--root is required." [ -d "$ROOT_FS_DIR" ] || die "Root FS does not exist? ($ROOT_FS_DIR)" -OS_NAME="Flatcar Container Linux by Kinvolk" -OS_ID="flatcar" -OS_ID_LIKE="coreos" -OS_PRETTY_NAME="$OS_NAME $FLATCAR_VERSION" +# These variables are set in the base profile. +eval $("portageq-${FLAGS_board}" envvar -v BRANDING_OS_\*) +BRANDING_OS_PRETTY_NAME="${BRANDING_OS_NAME} ${FLATCAR_VERSION}" FLATCAR_APPID="{e96281a6-d1af-4bde-9a0a-97b76e56dc57}" # DISTRIB_* are the standard lsb-release names sudo mkdir -p "${ROOT_FS_DIR}/usr/share/flatcar" "${ROOT_FS_DIR}/etc/flatcar" sudo_clobber "${ROOT_FS_DIR}/usr/share/flatcar/lsb-release" < Date: Fri, 5 Dec 2025 10:18:12 +0000 Subject: [PATCH 4/4] coreos-overlay: Drop broken scripts symlinks These have probably have been broken for years. Signed-off-by: James Le Cuirot --- .../src/third_party/coreos-overlay/coreos/scripts/build_packages | 1 - .../src/third_party/coreos-overlay/coreos/scripts/setup_board | 1 - 2 files changed, 2 deletions(-) delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos/scripts/build_packages delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos/scripts/setup_board diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/scripts/build_packages b/sdk_container/src/third_party/coreos-overlay/coreos/scripts/build_packages deleted file mode 120000 index c43c4e9b0c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/scripts/build_packages +++ /dev/null @@ -1 +0,0 @@ -../../../../scripts/build_packages \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/scripts/setup_board b/sdk_container/src/third_party/coreos-overlay/coreos/scripts/setup_board deleted file mode 120000 index 1ae2ca87e1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/scripts/setup_board +++ /dev/null @@ -1 +0,0 @@ -../../../../scripts/setup_board \ No newline at end of file