Skip to content

Fix debug symbol issues #3870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chewi wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix debug symbol issues #3870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5763ce9
overlay profiles: Drop /usr/lib/debug/.build-id from INSTALL_MASK
chewi Mar 26, 2026
2ac3a6e
overlay profiles: Remove debug build-id symlinks broken by INSTALL_MASK
chewi Mar 27, 2026
46861b9
sys-apps/baselayout: Bump to drop /usr/lib/debug dirs and symlinks
chewi Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,11 @@ CONFIG_PROTECT="

# Remove libtool .la files for non-plugin libraries.
# Remove Gentoo init files since we use systemd.
# Remove build-id, there is some issue with it causing collisions.
# Remove default files from sys-power/acpid.
# Do not install default repos.conf, we always put repository configuration in /etc.
INSTALL_MASK="
/usr/lib*/*.la
/etc/init.d /etc/conf.d /etc/user/conf.d /etc/user/init.d
/usr/lib/debug/.build-id
/etc/acpi
/usr/share/portage/config/repos.conf
"
Expand Down
13 changes: 13 additions & 0 deletions sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,19 @@ cros_pre_pkg_setup_sysroot_build_bin_dir() {
PATH+=":${CROS_BUILD_BOARD_BIN}"
}

# Remove any debug build-id symlinks that are broken because of INSTALL_MASK,
# and also remove their associated debug files to avoid wasting space.
cros_post_pkg_preinst_rm_masked_debug_files() {
local link debug dir=${ED}/usr/lib/debug
[[ -d ${dir}/.build-id ]] || return
while read -d $'\n' -r link; do
debug=$(realpath "${link}.debug") || die
rm -f -- "${link}" "${link}.debug" "${debug}" || die
done < <(find "${dir}"/.build-id -xtype l ! -name "*.debug")
# -delete implies -depth so entire empty trees are deleted.
find "${dir}" -type d -empty -delete || die
}

# Avoid modifications of the preexisting users - these are provided by
# our baselayout and usermod can't change anything there anyway (it
# complains that the user is not in /etc/passwd).
Expand Down
2 changes: 1 addition & 1 deletion sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
DIST flatcar-baselayout-bb76459c3338ce0e76c4e48d545795bfbc9dbfd9.tar.gz 37869 BLAKE2B 2d7ca48708e4eb3dc2f68ed6fb2b86bb9a903031e3249f55f8b8a0e1d6d08ef35caa40a50560c87bd0bad2c69fc9089425469a56b66a9c9ac9eee69bc83fbe5d SHA512 4f294d82eec5d53b1b444561f01b33b768e88c44ef7d8d3d7a5ce12a42c06048656a9f8bbdcb3a2c4751eb3f92639ccbdbb6a316e35b85a242476e1de5cd3fe1
DIST flatcar-baselayout-e721701eb2847df30d64b34a194f205ab3e5e40f.tar.gz 37838 BLAKE2B 96f8d39319fbaf9949eda64ff3a55731578f9e71ffffe07e67c253774af86bc33e798c5e23b3836dfae26912c34b1cd25da76405633f3d662efb7e1fdad617b8 SHA512 c142672f275914ca7e8ba39b3bdd9041ed221dcc81187a8c309569b7d4c0902527a12de4295992cfa2c21202c2c6bce5a6c7ab2a9ed2026fa50674878a147c67
0 ...ps/baselayout/baselayout-3.6.8-r20.ebuild → ...ps/baselayout/baselayout-3.6.8-r21.ebuild
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Copy Markdown
Member

@krnowak krnowak Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR for baselayout is missing, I think.

Copy link
Copy Markdown
Contributor Author

@chewi chewi Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Waiting for this to pass CI first!

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"
Expand Down