Skip to content

fix: the project packages come from the Keel archive, not the build host staging - #15

Merged
marcos-mendez merged 3 commits into
mainfrom
fix/keel-archive-not-staging
Oct 7, 2026
Merged

marcos-mendez merged 3 commits into
mainfrom
fix/keel-archive-not-staging

Conversation

@marcos-mendez

Copy link
Copy Markdown
Contributor

Supersedes #13 (its commits are included). Same change as Keel-Linux/keel-mariadb#23.

  • Staging gone. No copy of the build host's trixie-staging in the bootstrap, no 1001 pin in conf.d/main, no bin/keel-archive-check. That distribution holds inithooks keel5, confconsole keel2 and keel 0.3.5; pinned at 1001 the upgrade would have downgraded the layer.
  • Keel archive. inithooks, confconsole and keel come from archive.keellinux.org through the parent layer's source and 990 pin (common#30), trixie-testing included with KEEL_APT_TRACK=testing (common#32). conf.d/main updates and upgrades them, then bin/keel-project-packages (copied in by root.patched/pre, removed by conf.d/main) requires each to be apt's candidate from the Keel archive in the track's suite. The version floors go.
  • Overlay (from fix: drop the overlay's Keel source and 1001 pin; pin staging for the build only #13): no keel.sources, no 1001 pin.

Tests: tests/apt-files.bats, tests/project-packages.bats. Coverage: every measured file at 100 percent locally.

appliance / boot-published-layer cannot pass: no postgresql layer is published; the maintainer bypasses it.

navigator added 3 commits October 2, 2026 14:49
… build only

The overlay shipped /etc/apt/sources.list.d/keel.sources (apt.keellinux.org,
disabled) and /etc/apt/preferences.d/keel at 1001. At 1001 apt downgrades
every package newer than the archive's (tracker#23), and at those paths
both files override the source and the 990 pin Keel-Linux/common#30 ships.

The 1001 pin was also what let the build time archive beat TurnKey's 999
pin during the upgrade in conf.d/main. That is now a build-only pin on the
staging Label, removed with the build time source, and the build fails if
any apt file of the image still names the build time archive.
require-changelog wants a new top entry, not a bullet in the base branch's.
…ost's staging

Same change as Keel-Linux/keel-mariadb#23. The recipe copied the build
host's trixie-staging into the bootstrap and pinned it at 1001 before
upgrading inithooks and confconsole; that distribution holds inithooks
2.3.6+keel5, confconsole 2.2.3+keel2 and keel 0.3.5, so the upgrade would
have downgraded the layer. The staging block, pin and check go, and so does
bin/keel-archive-check.

inithooks, confconsole and keel come from archive.keellinux.org through the
parent layer's source and 990 pin (common#30), trixie-testing included with
KEEL_APT_TRACK=testing (common#32). conf.d/main updates, upgrades the three,
then bin/keel-project-packages (copied in by root.patched/pre, removed by
conf.d/main) proves each is apt's candidate from the Keel archive in the
track's suite. The version floors go.

Builds on #13, which this supersedes. tests/apt-files.bats and
tests/project-packages.bats check the recipe.
@marcos-mendez
marcos-mendez merged commit f699f6f into main Oct 7, 2026
3 of 4 checks passed
@marcos-mendez
marcos-mendez deleted the fix/keel-archive-not-staging branch October 7, 2026 23:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant