From d9391b9e34aebf64026e9510ec4c4193337392a8 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Thu, 26 Mar 2026 14:15:05 +0000 Subject: [PATCH] sys-apps/baselayout: Bump to drop /usr/lib/debug dirs and symlinks Gentoo starts with this directory being empty, and Portage complains if you populate it with merge-usr symlinks. Signed-off-by: James Le Cuirot --- .../src/third_party/coreos-overlay/sys-apps/baselayout/Manifest | 2 +- ...{baselayout-3.6.8-r20.ebuild => baselayout-3.6.8-r21.ebuild} | 0 .../coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/{baselayout-3.6.8-r20.ebuild => baselayout-3.6.8-r21.ebuild} (100%) 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 8c30e5b987..d8f595d3bd 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-bb76459c3338ce0e76c4e48d545795bfbc9dbfd9.tar.gz 37869 BLAKE2B 2d7ca48708e4eb3dc2f68ed6fb2b86bb9a903031e3249f55f8b8a0e1d6d08ef35caa40a50560c87bd0bad2c69fc9089425469a56b66a9c9ac9eee69bc83fbe5d SHA512 4f294d82eec5d53b1b444561f01b33b768e88c44ef7d8d3d7a5ce12a42c06048656a9f8bbdcb3a2c4751eb3f92639ccbdbb6a316e35b85a242476e1de5cd3fe1 +DIST flatcar-baselayout-9af25c8fed49fc58467ff82b452d6c0fe20188e6.tar.gz 38224 BLAKE2B 9f229b588b8a1b2584d038e83a647107acffa851b0f746dae9b0d3cb33537b6626dde5adbf904470a2be86ec89a5a5de5ad84c82d334837c75152b85cd9f621f SHA512 a32da0a455af0d52d3d0c32b11ab4fdf8b3482fb47040c2e9ac28a1f3d978fe96ce53d288f4a33f7b28999b1f72f01e1265c17986c595f203a23f44cf82c68e6 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r20.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r21.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r20.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r21.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 403d3bf497..3bdaf2afaf 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 @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/flatcar/baselayout.git" inherit git-r3 else - EGIT_VERSION="bb76459c3338ce0e76c4e48d545795bfbc9dbfd9" # flatcar-master + EGIT_VERSION="9af25c8fed49fc58467ff82b452d6c0fe20188e6" # flatcar-master SRC_URI="https://github.com/flatcar/baselayout/archive/${EGIT_VERSION}.tar.gz -> flatcar-${PN}-${EGIT_VERSION}.tar.gz" S="${WORKDIR}/${PN}-${EGIT_VERSION}" KEYWORDS="amd64 arm64"