Repository navigation
build: KEEL_APT_TRACK picks the Keel track; the plan drops tklbam, hubdns and the release meta package - #32
Merged
Merged
Conversation
added 2 commits
October 2, 2026 18:14
…backup and DNS A Keel image installs from Debian and the Keel archive alone since #30, but the bootstrap had no Keel source, so the plan could not install keel-archive-keyring, inithooks and the rest from it. conf/bootstrap_apt now writes keel.sources into the bootstrap too, naming the armored public key mk/turnkey.mk copies in from keys/ (the key the archive publishes at its root; the package installs the same one as a binary keyring, and the overlay replaces the file). KEEL_APT_TRACK, a conf variable, says which track the build installs from: stable (default) reads trixie alone, testing also enables trixie-testing, where every package lands first, for an image of the testing channel (handbook decision 0043). The conf script keel-apt makes such an image follow the testing track and removes the bootstrap's key copy; any other value stops the build in both places. plans/turnkey/base no longer installs tklbam, hubdns and webmin-tklbam (backup is Keel Backup, decision 0040; DNS registration is Keel Cloud), which also drops turnkey-pypy2 and py3curl-wrapper, wanted by nothing else. mk/turnkey.mk no longer builds fab's release meta package (turnkey-<app>-<version>): keel-core is the meta package (decision 0047); /etc/turnkey_version is still written (decision 0014). tests/apt-sources.bats: the bootstrap's keel.sources, the track decision for each value, the conf script on each track, and the plan.
3 of 4 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
keel-archive-keyring,inithooksand the other Keel packages from it.conf/bootstrap_aptnow writeskeel.sourcesinto the bootstrap, naming the armored public keymk/turnkey.mkcopies in from the newkeys/keel-archive-keyring.asc(the key the archive publishes at its root). The package later installs the same key as.gpgand the overlay replaces the file; the conf script removes the bootstrap's copy.KEEL_APT_TRACK(conf variable, defaultstable):testingenablestrixie-testingin the bootstrap, so the build installs from the testing track, andconf/turnkey.d/keel-aptmakes the image follow it (the overlay's stanza turned on). Any other value stops the build. This is what step 4 of the attended release needs: images built fromtrixie-testing.tklbam,hubdns,webmin-tklbamleaveplans/turnkey/base(Keel Backup, decision 0040; Keel Cloud); that also dropsturnkey-pypy2andpy3curl-wrapper, which nothing else wanted (checked withapt-cache rdependsagainst TurnKey's archive).mk/turnkey.mkno longer runsmake-release-deb.py(turnkey-<app>-<version>); keel-core is the meta package (decision 0047)./etc/turnkey_versionis still written (decision 0014). Note common#5 (/etc/keel_version) is still open.Tests
tests/apt-sources.bats: 44 pass locally. New: the bootstrap writeskeel.sources(stable on, testing off, key path, and the key inkeys/is AD0964BE…3180); the track decision for unset/stable/testing/other; the conf script on the default track (file untouched, key copy removed), on testing (only the stanza'sEnabledchanges, apt would fetch both suites), and its refusals; the plan has none of the five packages and the makefile nomake-release-deb.For the maintainer
KEEL_APT_TRACK=testingfollows the testing track once installed. Say if a testing-channel image should rather stay on stable.keys/keel-archive-keyring.ascis the public key only, the same file the archive serves.