Skip to content

fix: drop the overlay's Keel source and 1001 pin; pin staging for the build only - #13

Open
marcos-mendez wants to merge 2 commits into
mainfrom
fix/drop-keel-apt-overlay
Open

marcos-mendez wants to merge 2 commits into
mainfrom
fix/drop-keel-apt-overlay

Conversation

@marcos-mendez

Copy link
Copy Markdown
Contributor

Summary

  • Overlay files dropped. The overlay no longer ships /etc/apt/sources.list.d/keel.sources (apt.keellinux.org, disabled) or /etc/apt/preferences.d/keel (Pin-Priority 1001).
  • The 1001 pin had a second job. It let the build-time staging archive (Origin "Keel Linux") win over TurnKey's o=turnkeylinux pin at 999 when conf.d/main upgrades inithooks and confconsole. Without it, apt would pick TurnKey's 2.3.6. So conf.d/main now writes /etc/apt/preferences.d/keel-staging:
    • Pin: release l=Keel Linux staging, at 1001, written just before the upgrade;
    • removed together with keel-staging.list (common#30's final removelist removes it too);
    • pinned by Label, so common#30's "Keel pin must be 990" check does not match it.
  • New leftover check. The old grep -q '^Enabled: no' keel.sources becomes: 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/apt-files.bats (5 tests, RED first): neither overlay file, the staging pin written before the upgrade and removed right after the staging list, the leftover check in place, conf.d/main parses. conf.d/main itself runs only in a build chroot, so these are static checks.
  • CI green
  • The next build's boot test: the image has neither file nor any staging pin, and inithooks/confconsole are still the staging versions.

… 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.
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