Skip to content

Add migration spec for kernel -> kernel-clk6.12 namespace transition#1349

Open
bmastbergen wants to merge 4 commits into
ciq-6.12.yfrom
{bmastbergen}_ciq-6.12.y-migrate
Open

Add migration spec for kernel -> kernel-clk6.12 namespace transition#1349
bmastbergen wants to merge 4 commits into
ciq-6.12.yfrom
{bmastbergen}_ciq-6.12.y-migrate

Conversation

@bmastbergen

@bmastbergen bmastbergen commented Jun 15, 2026

Copy link
Copy Markdown
Collaborator

Old PR that got closed because of CLK 6.12 rebase: #1292

Migration metapackage that transitions users from old non-namespaced CIQ kernel 6.12.x packages to the new kernel-clk6.12 namespace.

How it works

Each subpackage shim carries Obsoletes: <old-name> < 6.12.86 (so dnf upgrade discovers it automatically) and Requires: <namespaced-replacement> (to pull in the new package). Shims have no Provides for the old name, which avoids triggering the Conflicts directives on the namespaced packages.

Migration happens automatically via dnf upgrade. Each shim is discovered independently by the DNF solver via its Obsoletes.

What gets migrated

  • Non-installonly packages (kernel-headers, kernel-tools, kernel-tools-libs, kernel-devel, kernel-devel-matched, perf, python3-perf, libperf, libperf-devel, rtla, rv, kernel-doc, kernel-cross-headers, kernel-selftests-internal, kernel-ipaclones-internal, kernel-abi-stablelists, kernel-uki-virt-addons) are replaced in the transaction via Obsoletes
  • Installonly packages (kernel-core, kernel-modules, kernel-modules-core) are handled by a systemd oneshot cleanup service on reboot. We can't use Obsoletes for these because if the user is currently booted into the old 6.12 kernel, DNF refuses to remove kernel-core (it's a protected package), and the entire transaction fails. The cleanup service skips the running kernel and retries on subsequent boots until all old kernels are gone.
  • kernel-clk6.12-default is pulled in to set DEFAULTKERNEL=kernel-clk6.12-core in /etc/sysconfig/kernel, ensuring future namespaced kernel installs become the default boot entry
  • The cleanup script dynamically finds non-namespaced 6.12.x kernel-core packages (no hardcoded version list)
  • Per-subpackage %posttrans runs dnf mark install on each namespaced replacement so they survive shim removal

Prerequisite

The old non-namespaced repo (ciq-kernel-lt-6_12) must be disabled before migration. If both repos are enabled, DNF prefers same-name upgrades (e.g., kernel-headers 6.12.85 -> 6.12.88) over Obsoletes-based shims.

Known limitation

The kernel-clk6.12 meta-package does not get installed because kernel-clk6.12-core provides the kernel-clk6.12 virtual, letting DNF satisfy the dependency without the meta-package. All real packages (core, modules, modules-core) are installed and functional.

Tested scenarios

  • dnf upgrade discovers shims and migrates all packages
  • Only installed packages get migrated (selective)
  • No-op when no old packages installed
  • dnf install kernel-headers after migration says "already installed"
  • glibc-devel dependency on kernel-headers satisfied by namespaced package
  • Shim removal preserves all namespaced packages
  • dnf upgrade with old repo re-enabled: nothing to do (Conflicts blocks regression)
  • Explicit install of old package names blocked by Conflicts
  • Cleanup script handles multiple installed kernel versions (tested with 6.12.63, 6.12.74, 6.12.85 all installed simultaneously, all removed correctly)
  • Cleanup script self-removes migration shims after cleanup
  • Second dnf upgrade is a clean no-op
  • Full two-reboot cycle tested with multiple old kernels:
    • Boot 1 (into old 6.12.85): cleanup removed 6.12.74, skipped 6.12.85 (running), service stayed enabled, shims kept
    • Boot 2 (into namespaced 6.12.87+clk6.12): cleanup removed 6.12.85, removed all migration shims, disabled service
    • Final state: zero old packages, zero shims, all namespaced packages intact
  • dnf autoremove does not touch any namespaced packages (dnf mark install working)
  • kernel-clk6.12-default installed, DEFAULTKERNEL updated from kernel-core to kernel-clk6.12-core

@bmastbergen
Add migration spec for kernel -> kernel-clk6.12 namespace transition
6effe5a 
RPM spec that transitions users from old non-namespaced CIQ kernel 6.12.x
packages to the new kernel-clk6.12 namespace. Uses rich deps to only
migrate packages the user actually has installed. Includes a systemd
oneshot service to clean up old installonly packages on next boot (can't
rpm -e from %posttrans due to RPM db lock).

Migration shims intentionally avoid Provides for non-namespaced names
(e.g. kernel-headers) since the namespaced packages already carry those
Provides, and adding them to the shims would trigger the corresponding
Conflicts directives.
@bmastbergen
migrate: use Obsoletes for dnf upgrade discovery, drop Provides and r…
2f1923e 
…ich deps

Switch shims from version-pinned Obsoletes to a version ceiling
(< 6.13) so dnf upgrade automatically discovers them as replacements
for installed non-namespaced packages. Remove Provides for old names
on shims to avoid triggering Conflicts on the namespaced packages.
Drop rich deps from base package since dnf upgrade discovers each shim
independently via Obsoletes.

Base package requires kernel-clk6.12-modules (to ensure the full kernel
is installed, not just core) and kernel-clk6.12-default (to set
DEFAULTKERNEL=kernel-clk6.12-core so future kernel installs become the
default boot entry).

Move dnf-mark-install to per-subpackage posttrans so namespaced packages
survive shim removal. Rewrite cleanup script to dynamically find
non-namespaced 6.12.x kernel-core packages instead of using a hardcoded
version list. Fix cleanup script to only disable itself when all
non-namespaced kernels are gone, not just when some were removed.

Note: the kernel-clk6.12 meta-package does not get installed because
kernel-clk6.12-core provides the kernel-clk6.12 virtual, letting DNF
satisfy the dependency without the meta-package. All real packages
(core, modules, modules-core) are installed and functional.
@bmastbergen
migrate: drop shims for packages the CLK kernel doesn't build
5046fc5 
Remove migration shims for kernel-cross-headers, kernel-ipaclones-internal,
kernel-abi-stablelists, and kernel-uki-virt-addons. The CLK 6.12 kernel
spec doesn't produce namespaced equivalents for these (with_cross_headers,
with_ipaclones, and with_efiuki are all disabled, and abi-stablelists
isn't in the spec at all). If a user had any of these installed, the shim's
Requires on a non-existent package would fail the transaction.
@bmastbergen
spec: make modules Provides variant-specific for debug builds
4e69079 
The kernel_modules_package and kernel_modules_core_package macros
provided the generic package name (e.g. kernel-clk6.12-modules) even
for debug variants. This caused DNF to treat kernel-clk6.12-debug-modules
as a valid provider of kernel-clk6.12-modules, pulling in the entire
debug kernel when only the non-debug modules were intended.

Include the variant name in the Provides so debug-modules only provides
kernel-clk6.12-debug-modules, not the generic kernel-clk6.12-modules.
For non-debug builds the expansion is unchanged.
@bmastbergen bmastbergen requested review from a team, jdieter and josephtate June 15, 2026 15:59
PlaidCat
PlaidCat approved these changes Jun 15, 2026
View reviewed changes

@PlaidCat PlaidCat left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

josephtate
josephtate approved these changes Jun 15, 2026
View reviewed changes

@josephtate josephtate left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

None of this deals at all with the kmods. That's going to need a separate migration.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@josephtate josephtate josephtate approved these changes

@PlaidCat PlaidCat PlaidCat approved these changes

@jdieter jdieter Awaiting requested review from jdieter

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@bmastbergen @josephtate @PlaidCat