Skip to content

CLK 6.18 Namespacing (continued) #1155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bmastbergen wants to merge 3 commits into
base: ciq-6.18.y
Choose a base branch
from
+15 −1
Open

CLK 6.18 Namespacing (continued) #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b721c9
Add generic kernel Provides to spec
bmastbergen Apr 15, 2026
dba6d7d
Add generic kernel-headers and kernel-devel Provides to spec
bmastbergen May 1, 2026
22f5955
bundle_bindgen: add set -e, curl --fail, and SHA256 verification
bmastbergen May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion ciq/SOURCES/bundle_bindgen.sh
View file
Open in desktop
Copy link
Copy Markdown

@ajorgens-ciq ajorgens-ciq May 5, 2026

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.

Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh
set -e

# Bundle the bindgen-cli source code to be included in the kernel build.
# https://crates.io/crates/bindgen-cli
Expand All @@ -12,9 +13,19 @@ SOURCES=$1
BINDGEN_CLI=bindgen-cli
BINDGEN_CLI_VERSION="0.71.1"
BINDGEN_CLI_CRATE=bindgen-cli.crate
BINDGEN_CLI_SHA256="fded10ca0956afd0cbe5cf89cc71ae1a679e65b8216c651fca17ba7de8ac54dc"
CRATESIO_API_ENDPOINT=https://crates.io/api/v1/crates/bindgen-cli/${BINDGEN_CLI_VERSION}/download

curl -sL $CRATESIO_API_ENDPOINT -o $SOURCES/$BINDGEN_CLI_CRATE
curl -sfL $CRATESIO_API_ENDPOINT -o $SOURCES/$BINDGEN_CLI_CRATE

echo "$BINDGEN_CLI_SHA256 $SOURCES/$BINDGEN_CLI_CRATE" | sha256sum -c - || {
echo "Error: SHA256 checksum mismatch for $BINDGEN_CLI_CRATE"
echo "Expected: $BINDGEN_CLI_SHA256"
echo "Got: $(sha256sum $SOURCES/$BINDGEN_CLI_CRATE | awk '{print $1}')"
rm -f $SOURCES/$BINDGEN_CLI_CRATE
exit 1
}

tar -xf $SOURCES/$BINDGEN_CLI_CRATE -C $SOURCES
mv $SOURCES/$BINDGEN_CLI-$BINDGEN_CLI_VERSION $SOURCES/$BINDGEN_CLI

Expand Down
3 changes: 3 additions & 0 deletions ciq/SPECS/kernel-clk6.18.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,6 +702,7 @@ Requires: %{name}-modules-uname-r = %{KVERREL}
Requires: %{name}-modules-core-uname-r = %{KVERREL}
Requires: ((%{name}-modules-extra-uname-r = %{KVERREL}) if %{name}-modules-extra-matched)
Provides: installonlypkg(kernel)
Provides: kernel = %{specversion}-%{pkg_release}
%endif


Expand Down Expand Up @@ -1484,6 +1485,8 @@ This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\
Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\
Provides: %{name}%{?1:-%{1}}-devel-%{_target_cpu} = %{specversion}-%{release}\
Provides: %{name}-devel-%{_target_cpu} = %{specversion}-%{release}%{uname_suffix %{?1}}\
Provides: kernel-devel = %{specversion}-%{release}\
Provides: kernel-devel-%{_target_cpu} = %{specversion}-%{release}\
Provides: kernel-devel-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
Provides: %{name}-devel-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
Provides: installonlypkg(kernel)\
Expand Down
Loading