Repository navigation
fix: drop the overlay's Keel source and 1001 pin; pin staging for the build only - #18
Open
marcos-mendez wants to merge 2 commits into
Open
marcos-mendez wants to merge 2 commits into
marcos-mendez wants to merge 2 commits into
Conversation
… 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; conf.d/zz-project-packages removes it with the build time source and fails if any apt file of the image still names that archive.
3 of 5 tasks
require-changelog wants a new top entry, not a bullet in the base branch's.
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
/etc/apt/sources.list.d/keel.sources(apt.keellinux.org, disabled) or/etc/apt/preferences.d/keel(Pin-Priority 1001).conf/turnkey.d/keel-apttherefore stops this build until this lands.o=turnkeylinuxpin at 999 whenconf.d/mainupgrades inithooks and confconsole. Without it, apt would pick TurnKey's 2.3.6. Soconf.d/mainnow writes/etc/apt/preferences.d/keel-staging:Pin: release l=Keel Linux staging, at 1001, written just before the upgrade;conf.d/zz-project-packagestogether withkeel-staging.list(common#30's final removelist removes it too);grep -q '^Enabled: no' keel.sourcesbecomes: fail the build if any apt source or pin of the image still names the build-time archive (trixie-staging,/srv/keel-apt,l=Keel Linux staging). This holds on today's common, where the image has no Keel source, and on common#30, where common ships it enabled.Merge order: this PR, then the pool, then common#30 together with inithooks#34.
Test plan
tests/project-packages.bats(16 tests, RED first, kcov 100 percent, 35/35): the pin is removed, a leftover source or staging pin fails the build, and common's Keel source and 990 pin are left in place.tests/apt-files.bats(3 tests): neither overlay file, and the staging pin written before the upgrade.