From a16f4e054ba17261548dcb0b3b5e0a819db75519 Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Wed, 23 Jul 2025 19:40:46 +0200 Subject: [PATCH] baselayout: fix messagebus user / group ID (#3132) This change ingests a new baselayout version that fixes a UID / GID mis-alignment with the "messagebus" user / group. See https://github.com/flatcar/baselayout/pull/36. Signed-off-by: Thilo Fromm Co-authored-by: Mathieu Tortuyaux --- changelog/bugfixes/2025-07-23-baselayout-messagebus-uid.md | 1 + .../src/third_party/coreos-overlay/sys-apps/baselayout/Manifest | 2 +- ...{baselayout-3.6.8-r17.ebuild => baselayout-3.6.8-r18.ebuild} | 0 .../coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog/bugfixes/2025-07-23-baselayout-messagebus-uid.md rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.6.8-r17.ebuild => baselayout-3.6.8-r18.ebuild} (100%) diff --git a/changelog/bugfixes/2025-07-23-baselayout-messagebus-uid.md b/changelog/bugfixes/2025-07-23-baselayout-messagebus-uid.md new file mode 100644 index 0000000000..247987ba59 --- /dev/null +++ b/changelog/bugfixes/2025-07-23-baselayout-messagebus-uid.md @@ -0,0 +1 @@ +- Fixed a UID/GID mis-alignment for user/group `messagebus` between acct-user/acct-group and baselayout. ([baselayout#36](https://github.com/flatcar/baselayout/pull/36)) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest index c1225afd91..92c4fa4eae 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest @@ -1 +1 @@ -DIST flatcar-baselayout-1ad3846c507888ffbb4209f6eaf294a60cda5fe6.tar.gz 36931 BLAKE2B e354aabaf99b2c0c50c05d377e3b51c33b2924640dbc9c49c359e3a50a18d7c6067e5e901f090deb181c787ba7b437d72e5a7a5d477682794d7f9e5b12f10966 SHA512 036c3d174afcf3e81a11ff0b6cf1b9ad4b16e70eeabc68d739eef24c18e8269a27d3f7aa236c885ba6ccf5f6450ee034a553d6017b26902d75274e476a211f87 +DIST flatcar-baselayout-79d3a0c3595dbbea207592dbd9fc2156349764f2.tar.gz 38379 BLAKE2B 74bc041d68c8681c01ce3214f1e18aa67b3ca4d138948a9427dc0c74253c82c8abb9c34f921588f0f8118b5d78a1e2a6cf6f2a75f1e861c2a6fc4a9cbb850b3b SHA512 777512acad0d91f2d4ee575809b1a730f06f7380650dc08c11f4dd4d4f53ce0289868016623a03442f2f1b38f8110751fff0900df74c9d1806d0f6fb7c9e5882 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r17.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r18.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r17.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r18.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild index 4717400a22..f24bb40075 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild @@ -8,7 +8,7 @@ if [[ "${PV}" == 9999 ]]; then inherit git-r3 KEYWORDS="~amd64 ~arm64" else - EGIT_COMMIT="1ad3846c507888ffbb4209f6eaf294a60cda5fe6" # flatcar-master + EGIT_COMMIT="79d3a0c3595dbbea207592dbd9fc2156349764f2" # flatcar-master SRC_URI="https://github.com/flatcar/baselayout/archive/${EGIT_COMMIT}.tar.gz -> flatcar-${PN}-${EGIT_COMMIT}.tar.gz" S="${WORKDIR}/${PN}-${EGIT_COMMIT}" KEYWORDS="amd64 arm64"