rain/gnu-plus-dotfiles
rain/gnu-plus-dotfiles
1
0
Fork 0
Code Wiki Activity

Gentoo bootstrap: fix ambiguous package names + early-return on os_family mismatch

Browse source 
Three issues caught during tadbit onboarding:

1. run_once_00-install-bootstrap-tools.sh.tmpl (gentoo branch):
   'gnupg' is ambiguous (app-crypt/gnupg vs app-vim/gnupg). Use full
   category/package names: app-crypt/gnupg, app-crypt/age, etc.
   The previous 'for p in age curl ...' loop fed short names to
   emerge which printed '!!! The short ebuild name gnupg is
   ambiguous' and exited 1.

2. run_once_20-install-user-packages-gentoo.sh.tmpl:
   sys-devel/base-devel doesn't exist on Gentoo (it's an Arch/Fedora
   concept; Gentoo's toolchain is the @system set which is always
   installed). Removed base-devel from the package list.

3. Universal scripts (run_once_20 + run_once_40) were running on
   gentoo and hitting either 'die unsupported os_family' (universal
   20) or 'WARNING sway packages not configured for gentoo' (universal
   40). Added early-return: 'if os_family == gentoo, exit 0' at the
   top of each universal script so the gentoo-specific scripts
   handle the box. (Same pattern the chaotic-aur script already had.)

4. run_once_10-add-gentoo-overlays.sh.tmpl:
   The cached ~/.cache/eselect-repo/repositories.xml was corrupt on
   tadbit (lxml.etree.XMLSyntaxError on every 'eselect repository
   list' call). Added a sanity check: parse the XML with
   xml.etree.ElementTree, delete if invalid, re-fetch.

After these fixes, the bootstrap on tadbit is expected to run cleanly
with --keep-going (the four failures above all become no-ops).
This commit is contained in:
Rain 2026-06-23 16:18:54 -04:00
parent b5defc5a20
commit 4556813e78
5 changed files with 57 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
run_once_00-install-bootstrap-tools.sh.tmpl
View file

@ -59,9 +59,25 @@ fi
# main tree (app-crypt/age), curl/ca-certificates/git are @system.
# Skip the install only if everything is already present (no
# `emerge` no-op — emerge is slow and a fresh sync can take minutes).
#
# Use full category/package names for ambiguous short names:
# `gnupg` is ambiguous (app-crypt/gnupg vs app-vim/gnupg) and
# `base-devel` doesn't exist in main (use the @system set instead).
GENTOO_BOOTSTRAP_PKGS=(
app-crypt/age
app-crypt/gnupg
net-misc/curl
app-misc/ca-certificates
dev-vcs/git
net-misc/wget
)
MISSING_PKGS=()
for p in age curl ca-certificates git wget gnupg; do
if ! command -v "$p" >/dev/null 2>&1; then
for p in "${GENTOO_BOOTSTRAP_PKGS[@]}"; do
# bin name is the package basename; for @system packages like
# ca-certificates we accept that `command -v ca-certificates`
# may not exist (those are pseudo-packages). Use equery as fallback.
bin_name=$(basename "$p")
if ! command -v "$bin_name" >/dev/null 2>&1; then
MISSING_PKGS+=("$p")
fi
done