From 581ae71336bd1521baed424cff1c90abc4bb0deb 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..f6ac62235e 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-e721701eb2847df30d64b34a194f205ab3e5e40f.tar.gz 37838 BLAKE2B 96f8d39319fbaf9949eda64ff3a55731578f9e71ffffe07e67c253774af86bc33e798c5e23b3836dfae26912c34b1cd25da76405633f3d662efb7e1fdad617b8 SHA512 c142672f275914ca7e8ba39b3bdd9041ed221dcc81187a8c309569b7d4c0902527a12de4295992cfa2c21202c2c6bce5a6c7ab2a9ed2026fa50674878a147c67 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..7d8dcdb87c 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="e721701eb2847df30d64b34a194f205ab3e5e40f" # chewi/debug-dirs 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"