From 0d2e0fc0deb305dd99ad0e7db9e327c00f6415a6 Mon Sep 17 00:00:00 2001 From: Jeremy Joplin Date: Fri, 30 Oct 2026 15:29:08 -0600 Subject: [PATCH] tools/phone-install-package: quote the dependencies sent to the phone The build dependencies went to the phone's shell unquoted, as "pacman -T $want". A versioned one is a redirect there. With omamobile-omarchy's omarchy>=4.0.6, pacman -T got "omarchy" and the rest, and its answer went into a file named "=4.0.6" in root's home, so "missing" came back empty. The build-only dependencies were never installed, and makepkg stopped with "Could not resolve all dependencies." On a Pixel 7 Pro, building omamobile-omarchy (its checkdepends include diffutils, which the phone didn't have) did exactly that and left /root/=4.0.6 holding "diffutils". omacam's libcamera<0.8 is an input redirect, so for omacam the shell refused the command outright ("0.8: No such file or directory"). Six packages on main have a versioned dependency: omacam, omamessages, omamobile-mmd, omamobile-omarchy, omamobile-shell and omaphone. The "pacman -S" of what is missing was unquoted the same way; it never ran with a version, since "missing" was always empty when one was there. Each dependency now goes in single quotes. pacman -T prints an unsatisfied dependency as given, version included, and pacman -S takes that form as a target. That makes a second case reachable: pacman -T also names an installed package that is older than a version asks for. Installing it as missing would upgrade one package on its own (a partial upgrade), mark it as a dependency with --asdeps, and, for a build-only one, remove it after the build. The tool now stops before it changes anything and says to update the phone first. tests/phone-install-package runs the tool against a stand-in phone: a local bash with stand-in pacman, makepkg, su, loginctl, getent and chown. PHONE_SSH points the tool at it, as it does for tools/phone-provision's tests. Case 1 has installed runtime dependencies omarchy>=4.0.6 and omarchy<5 and a missing check dependency diffutils>=3.10. Case 2 has diffutils installed but too old. Against main's tool with only the PHONE_SSH line added, all eight checks fail. With this change they pass. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01TTVics5jHkiz34wzjZWkb9 --- tests/all | 5 +- tests/phone-install-package | 120 ++++++++++++++++++++++++++++++++++++ tools/phone-install-package | 22 ++++++- 3 files changed, 142 insertions(+), 5 deletions(-) create mode 100755 tests/phone-install-package diff --git a/tests/all b/tests/all index 53ae48b40..a6bf7d7e5 100755 --- a/tests/all +++ b/tests/all @@ -2,7 +2,8 @@ # SPDX-License-Identifier: MIT # The installer's tests (no phone, nothing flashed): tools/install-phone # against a fake fastboot, tools/phone-provision against a synthetic backup -# (and a container standing in for the phone, with Docker), the initramfs's +# (and a container standing in for the phone, with Docker), +# tools/phone-install-package against a stand-in phone, the initramfs's # first-boot growth, the bring-up overlays, the simplefb trigger, the init's per-board steps, the storage guard's packed # allowlist and the USB product string, bin/omamobile's boot-image layouts # and flash against a fake fastboot, omamobile-firstboot's own tests, and the @@ -23,7 +24,7 @@ sh -n device/flame/initramfs/init sh -n device/flame/initramfs/build bash -n tools/build-flame-probe echo "ok - scripts parse" -for t in tests/pr-check tests/kernel-pr-check tests/alarm-wake-test tests/install-phone tests/phone-provision tests/initramfs-grow tests/images-layout tests/device-overlays tests/simplefb-trigger tests/initramfs-steps tests/storage-guard tests/usb-product tests/boot-method tests/flame-probe packages/omamobile-firstboot/test/all packages/omamobile-device-felix/test/all packages/omamobile-device-lynx/test/all packages/omamobile-device-panther/test/all tests/local-builds; do +for t in tests/pr-check tests/kernel-pr-check tests/alarm-wake-test tests/install-phone tests/phone-provision tests/phone-install-package tests/initramfs-grow tests/images-layout tests/device-overlays tests/simplefb-trigger tests/initramfs-steps tests/storage-guard tests/usb-product tests/boot-method tests/flame-probe packages/omamobile-firstboot/test/all packages/omamobile-device-felix/test/all packages/omamobile-device-lynx/test/all packages/omamobile-device-panther/test/all tests/local-builds; do echo "# $t" "$t" done diff --git a/tests/phone-install-package b/tests/phone-install-package new file mode 100755 index 000000000..a78d0041a --- /dev/null +++ b/tests/phone-install-package @@ -0,0 +1,120 @@ +#!/bin/bash +# SPDX-License-Identifier: MIT +# Tests for tools/phone-install-package against a stand-in phone (no phone, +# no Docker): each command the tool sends runs in a local bash with stand-in +# pacman, makepkg, su, loginctl, getent and chown first on PATH. +# 1. Versioned runtime dependencies that are installed (omarchy>=4.0.6, +# omarchy<5) and a versioned check dependency that isn't (diffutils>=3.10): +# the missing one goes in before the build and out after it, each +# dependency reaches pacman as one argument, and nothing is redirected +# into or out of a file on the phone. +# 2. A check dependency that is installed but older than its version asks +# for: the tool stops before it installs, builds or removes anything. +set -euo pipefail +cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." +fail() { printf 'not ok - %s\n' "$1" >&2; exit 1; } +pass() { printf 'ok - %s\n' "$1"; } +t=$(mktemp -d) +trap 'rm -rf "$t"' EXIT +mkdir -p "$t/bin" "$t/root" "$t/home/alice" "$t/installed" "$t/pkgs/fakepkg" +echo '# made up for tests/phone-install-package' > "$t/pkgs/fakepkg/PKGBUILD" + +# The phone's root shell: the command runs in root's home, as over ssh +cat > "$t/phone-ssh" < "$t/bin/loginctl" <<'EOF' +#!/bin/bash +echo '1000 alice' +EOF +cat > "$t/bin/getent" < "$t/bin/su" <<'EOF' +#!/bin/bash +[[ $1 == - && $2 == alice && $3 == -c ]] || { echo "su: unexpected $*" >&2; exit 1; } +exec bash -c "$4" +EOF +cat > "$t/bin/chown" <<'EOF' +#!/bin/bash +exit 0 +EOF +# makepkg without -s, as the tool runs it: it refuses while a dependency is +# missing. The case's .SRCINFO is in $t/srcinfo. +cat > "$t/bin/makepkg" <> "$t/pacman.calls" +[[ -e $t/installed/diffutils ]] || { echo '==> ERROR: Could not resolve all dependencies.'; exit 8; } +touch fakepkg-1-1-any.pkg.tar.zst +echo '==> Finished making: fakepkg 1-1' +EOF +# pacman: every call logged with its arguments one per field. -T answers +# from installed/ and from too-old (dependencies an installed package is +# too old for), -Qq lists installed/, -S and -Rns add and remove there. +cat > "$t/bin/pacman" <> "$t/pacman.calls" +op=\$1; shift +case \$op in + -T) rc=0 + for d in "\$@"; do + if [[ ! -e $t/installed/\${d%%[<>=]*} ]] || grep -qx -- "\$d" "$t/too-old"; then echo "\$d"; rc=127; fi + done + exit \$rc ;; + -Qq) ls "$t/installed" ;; + -S) for d in "\$@"; do [[ \$d == -* ]] || touch "$t/installed/\${d%%[<>=]*}"; done ;; + -Rns) for d in "\$@"; do [[ \$d == -* ]] || rm -f "$t/installed/\$d"; done ;; + -U) echo 'installing fakepkg...' ;; + -Q) echo "\$1 1-1" ;; +esac +EOF +chmod +x "$t/phone-ssh" "$t/bin/"* +unset PHONE_USER +run() { : > "$t/pacman.calls" + PHONE_SSH=$t/phone-ssh tools/phone-install-package "$t/pkgs/fakepkg" > "$t/out" 2>&1; } + +# --- 1. a missing versioned check dependency --------------------------------- +touch "$t/installed/bash" "$t/installed/omarchy" +: > "$t/too-old" +printf 'pkgbase = fakepkg\n\tpkgver = 1\n\tpkgrel = 1\n\tcheckdepends = diffutils>=3.10\n\tdepends = omarchy>=4.0.6\n\tdepends = omarchy<5\n\tdepends = bash\n\npkgname = fakepkg\n' > "$t/srcinfo" +# The tool's exit status alone doesn't show the build: makepkg's goes through tail +run && grep -qx '==> Finished making: fakepkg 1-1' "$t/out" || + { cat "$t/out"; fail "a build against the stand-in phone succeeds"; } +pass "a build against the stand-in phone succeeds" + +t_call=$(grep '^|-T|' "$t/pacman.calls" || true) +[[ $t_call == *'|omarchy>=4.0.6|'* && $t_call == *'|omarchy<5|'* && $t_call == *'|diffutils>=3.10|'* ]] || + { cat "$t/pacman.calls"; fail "pacman -T gets each versioned dependency as one argument"; } +pass "pacman -T gets each versioned dependency as one argument" + +[[ -z $(ls -A "$t/root") ]] || { ls -A "$t/root"; fail "nothing is redirected into a file in root's home"; } +pass "nothing is redirected into a file in root's home" + +grep -qx '|-S|--needed|--noconfirm|--asdeps|diffutils>=3.10|' "$t/pacman.calls" && + grep -q '^build dependencies: diffutils>=3.10 *$' "$t/out" || + { cat "$t/out" "$t/pacman.calls"; fail "the missing check dependency is installed for the build"; } +pass "the missing check dependency is installed for the build" + +grep -qx '|-Rns|--noconfirm|diffutils|' "$t/pacman.calls" && [[ ! -e $t/installed/diffutils ]] && + grep -q '^removed build dependencies: diffutils *$' "$t/out" || + { cat "$t/out" "$t/pacman.calls"; fail "it is removed again after the build"; } +pass "it is removed again after the build" + +grep -q '^|-U|--noconfirm|.*/fakepkg-1-1-any.pkg.tar.zst|$' "$t/pacman.calls" && grep -qx 'fakepkg 1-1' "$t/out" || + { cat "$t/out" "$t/pacman.calls"; fail "the built package is installed"; } +pass "the built package is installed" + +# --- 2. an installed check dependency that is too old ------------------------ +touch "$t/installed/diffutils" +echo 'diffutils>=3.10' > "$t/too-old" +if run; then cat "$t/out"; fail "a dependency installed but too old stops the tool"; fi +grep -qx "The phone's packages are older than diffutils>=3.10 asks for: update it (omarchy update), then run this again" "$t/out" || + { cat "$t/out"; fail "a dependency installed but too old stops the tool"; } +pass "a dependency installed but too old stops the tool" + +! grep -qE '^\|(-S|-Rns|-U|makepkg)\|' "$t/pacman.calls" && [[ -e $t/installed/diffutils ]] || + { cat "$t/pacman.calls"; fail "and nothing is installed, built or removed"; } +pass "and nothing is installed, built or removed" diff --git a/tools/phone-install-package b/tools/phone-install-package index 4666a39d7..ab0100990 100755 --- a/tools/phone-install-package +++ b/tools/phone-install-package @@ -11,7 +11,7 @@ dir=${1:?Usage: tools/phone-install-package packages/} name=$(basename "$dir") [[ -f $dir/PKGBUILD ]] || { echo "No PKGBUILD in $dir" >&2; exit 1; } -ssh=tools/phone-ssh +ssh=${PHONE_SSH:-tools/phone-ssh} # tests/phone-install-package stands in for the phone # The phone's account: whoever is logged in on its screen (as tools/acpm-stage # and tools/speaker-trip-burst find it), or PHONE_USER=. makepkg runs # as that user, in its home; no account name is built in. @@ -33,11 +33,27 @@ tar cf - --exclude="./$name/pkg" --exclude="./$name/src/build" --exclude="*.pkg. srcinfo=$("$ssh" "su - '$phone_user' -c 'cd $build/$name && makepkg --printsrcinfo'") want=$(awk '$1 ~ /^(depends|makedepends|checkdepends)$/ {print $3}' <<<"$srcinfo" | sort -u | tr '\n' ' ') buildonly=$(awk '$1 ~ /^(makedepends|checkdepends)$/ {print $3}' <<<"$srcinfo" | sort -u | tr '\n' ' ') +# Each one goes to the phone's shell in single quotes: unquoted, a versioned +# one (omarchy>=4.0.6) was a redirect there, so pacman -T's answer went into +# a file named "=4.0.6" and the missing ones were never installed. +quoted() { printf "'%s' " "$@"; } missing="" -[[ -n ${want// } ]] && missing=$("$ssh" "pacman -T $want" || true) +[[ -n ${want// } ]] && missing=$("$ssh" "pacman -T $(quoted $want)" || true) +# pacman -T also names an installed package that is older than a version +# asks for. Updating it here would be a partial upgrade, --asdeps would make +# it a dependency, and a build-only one would be removed afterwards: that is +# the phone's own update to do. +old="" +if [[ -n $missing ]]; then + installed=$("$ssh" "pacman -Qq") + for dep in $missing; do + grep -qx -- "${dep%%[<>=]*}" <<<"$installed" && old+="$dep " + done +fi +[[ -z $old ]] || { echo "The phone's packages are older than ${old% } asks for: update it (omarchy update), then run this again" >&2; exit 1; } if [[ -n $missing ]]; then echo "build dependencies: $(tr '\n' ' ' <<<"$missing")" - "$ssh" "OMARCHY_ALLOW_DIRECT_PACMAN=1 pacman -S --needed --noconfirm --asdeps $(tr '\n' ' ' <<<"$missing") >/dev/null" + "$ssh" "OMARCHY_ALLOW_DIRECT_PACMAN=1 pacman -S --needed --noconfirm --asdeps $(quoted $missing) >/dev/null" fi remove="" for dep in $missing; do