Skip to content

CLK 6.18 Namespacing (continued)#1155

Open
bmastbergen wants to merge 3 commits intociq-6.18.yfrom
{bmastbergen}_ciq-6.18.y-namespacing
Open

CLK 6.18 Namespacing (continued)#1155
bmastbergen wants to merge 3 commits intociq-6.18.yfrom
{bmastbergen}_ciq-6.18.y-namespacing

Conversation

@bmastbergen
Copy link
Copy Markdown
Collaborator

CLK 6.18 has already been namespaced, but based on the current namespacing design needs a couple of additional tweaks. This brings it in line with the proposed CLK 6.12 namespacing PR here: #1065 as well as the Namespace Kernel Package Design document here: https://ciqinc.atlassian.net/wiki/spaces/ENG/pages/2327904257/Namespaced+Kernel+Package+Design

Adds 'Provides: kernel = version' to base package for compatibility
with packages depending on generic kernel capability.
Add versioned Provides for kernel-headers, kernel-devel, and
kernel-devel-<arch> so the namespaced CLK packages satisfy the same
dependency capabilities as stock Rocky kernel packages.

Remove Conflicts on kernel-headers and kernel-cross-headers since the
namespaced packages now provide those capabilities directly.
@bmastbergen bmastbergen force-pushed the {bmastbergen}_ciq-6.18.y-namespacing branch from 8a22ccd to 965fd43 Compare May 1, 2026 19:08
PlaidCat
PlaidCat previously approved these changes May 4, 2026
Copy link
Copy Markdown
Collaborator

@PlaidCat PlaidCat left a comment

Choose a reason for hiding this comment

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

:shipit:

@PlaidCat PlaidCat requested review from a team, ajorgens-ciq and jdieter May 4, 2026 17:52
- Add set -e so the script exits on any command failure
- Add -f (--fail) to curl so HTTP errors are caught
- Verify the downloaded crate against the known SHA256 from crates.io
  before extracting
@bmastbergen
Copy link
Copy Markdown
Collaborator Author

Added the bundle_bindgen.sh enhancements brought up in the 6.12 PR.

Copy link
Copy Markdown
Collaborator

@PlaidCat PlaidCat left a comment

Choose a reason for hiding this comment

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

Thanks for adding the SHA check.

:shipit:

Copy link
Copy Markdown

@ajorgens-ciq ajorgens-ciq left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This seems unrelated to namespacing, but I'm not here to impose my own PR standards on another team.

Obsoletes: glibc-kernheaders < 3.0-46
Provides: glibc-kernheaders = 3.0-46
Provides: kernel-headers = %{specversion}-%{release}
Conflicts: kernel-headers
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Aren't we still replacing the files provided by kernel-headers? If so, we should still conflict here.

%package cross-headers
Summary: Header files for the Linux kernel for use by cross-glibc
Provides: kernel-cross-headers = %{specversion}-%{release}
Conflicts: kernel-cross-headers
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Aren't we still replacing the files provided by kernel-cross-headers? If so, we should still conflict here.

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

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants