Skip to content

K2GO-399 chore(rootfs): drop the unused contrib component from the Debian base sources #566

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

Merged
luisguzman-adfa merged 2 commits into from
Sep 17, 2026
Merged

K2GO-399 chore(rootfs): drop the unused contrib component from the Debian base sources #566

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca6e088
K2GO-399 chore(rootfs): drop the unused contrib component from the De…
luisguzman-adfa Sep 17, 2026
edf2e62
K2GO-399 chore(rootfs): simplify the main-only log message
luisguzman-adfa Sep 17, 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
10 changes: 10 additions & 0 deletions tools/rootfs-builder/build-iiab-rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,16 @@ mkdir -p "$ROOTFS" # already wiped up front (START CLEAN); just (re)create it
tar --exclude='*/dev/*' --strip-components=1 -xJf "$BASE_LOCAL" -C "$ROOTFS"
[[ -e "$ROOTFS/bin/bash" || -L "$ROOTFS/bin/bash" ]] || die "Base has no /bin/bash; check the tarball."

# K2GO-399: keep the shipped rootfs DFSG-free (F-Droid). The proot-distro base enables
# the "contrib" component in /etc/apt/sources.list (Termux's base recipe), but nothing in
# the IIAB install pulls from it. Strip the non-main components here, before the install
# runs, so the rootfs and its apt config stay main-only. Post-extraction, so this also
# covers a --base-local base: one place enforces main-only.
if [[ -f "$ROOTFS/etc/apt/sources.list" ]]; then
sed -i -E 's/[[:space:]]+(contrib|non-free-firmware|non-free)\b//g' "$ROOTFS/etc/apt/sources.list"
log "apt components set to main-only (K2GO-399)."
fi

# DNS inside the rootfs (the app rewrites resolv.conf; we replicate so apt resolves)
printf 'nameserver 1.1.1.1\nnameserver 8.8.8.8\n' > "$ROOTFS/etc/resolv.conf"
printf '127.0.0.1 localhost\n' > "$ROOTFS/etc/hosts"
Expand Down
Loading