Skip to content
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

Jump to bottom

1.20.x: kernel updates, statically linked modprobe #3997

Merged
merged 5 commits into from
May 28, 2024
Merged

1.20.x: kernel updates, statically linked modprobe #3997

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89628d9
kernel-5.10: update to 5.10.216
larvacea May 20, 2024
bb0f8d5
kernel-5.15: update to 5.15.158
larvacea May 20, 2024
c5f75f3
kernel-6.1: update to 6.1.90
larvacea May 17, 2024
4e310ff
kmod: Build kmod as a static binary
vigh-m May 23, 2024
33d737d
v1.20.1: initial CHANGELOG, Release.toml
larvacea May 28, 2024
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
4 changes: 2 additions & 2 deletions packages/kernel-5.10/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ path = "../packages.rs"

[[package.metadata.build-package.external-files]]
# Use latest-srpm-url.sh to get this.
url = "https://cdn.amazonlinux.com/blobstore/962957e692b6ca23e981930d7a3dc644768e89d2ac321745883eaa99bc55e67a/kernel-5.10.215-203.850.amzn2.src.rpm"
sha512 = "4abdbacaf18bf224c56d4648803a5cad0b1c6a6fab7ffbdff9d38ac6deeb485abb2d4dea4daa61ffa271a848e634969e94bd4438dd48529213518e0671000455"
url = "https://cdn.amazonlinux.com/blobstore/0a25c63e615af935b4980fb447cdd9e44e2fab61ef15b47c60d34e50907e8a12/kernel-5.10.216-204.855.amzn2.src.rpm"
sha512 = "c32d9c1b3bddcc4a9f5c014be07681e7990d5cedccf7242e7a943f8f2fb270ae419e9bec44215ff1df4d8afede5af5b16926507af5b86f9dd8982b04648b2cde"

[build-dependencies]
microcode = { path = "../microcode" }
4 changes: 2 additions & 2 deletions packages/kernel-5.10/kernel-5.10.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
%global debug_package %{nil}

Name: %{_cross_os}kernel-5.10
Version: 5.10.215
Version: 5.10.216
Release: 1%{?dist}
Summary: The Linux kernel
License: GPL-2.0 WITH Linux-syscall-note
URL: https://www.kernel.org/
# Use latest-srpm-url.sh to get this.
Source0: https://cdn.amazonlinux.com/blobstore/962957e692b6ca23e981930d7a3dc644768e89d2ac321745883eaa99bc55e67a/kernel-5.10.215-203.850.amzn2.src.rpm
Source0: https://cdn.amazonlinux.com/blobstore/0a25c63e615af935b4980fb447cdd9e44e2fab61ef15b47c60d34e50907e8a12/kernel-5.10.216-204.855.amzn2.src.rpm
Source100: config-bottlerocket

# Help out-of-tree module builds run `make prepare` automatically.
Expand Down
4 changes: 2 additions & 2 deletions packages/kernel-5.15/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ path = "../packages.rs"

[[package.metadata.build-package.external-files]]
# Use latest-srpm-url.sh to get this.
url = "https://cdn.amazonlinux.com/blobstore/72726a4adc0c205ce087f838249744029fc8e51b85ea0e3d395cb10ac99d4864/kernel-5.15.156-102.160.amzn2.src.rpm"
sha512 = "0964d79ecb44e23273633a831022cd4d43ca9eeb2f029f994d5f52dc1aceed11b985a2b8acf978524033d738e3a4670ea87566e87bfb4c3a6d7bd37b5a6d8e22"
url = "https://cdn.amazonlinux.com/blobstore/f75f72cbdb5b3da04159fef0093b7ca471b95b58172bc9630600bc94668e247a/kernel-5.15.158-103.164.amzn2.src.rpm"
sha512 = "3ba3616cfcbc230208c84dffbbe1648e57a295dd828288e1e330e988f1f14a9a10fc6e6f251573d20e6679e802ac3b3ca53dfef39d1e19f61af4ede42a035af0"

[build-dependencies]
microcode = { path = "../microcode" }
4 changes: 2 additions & 2 deletions packages/kernel-5.15/kernel-5.15.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
%global debug_package %{nil}

Name: %{_cross_os}kernel-5.15
Version: 5.15.156
Version: 5.15.158
Release: 1%{?dist}
Summary: The Linux kernel
License: GPL-2.0 WITH Linux-syscall-note
URL: https://www.kernel.org/
# Use latest-srpm-url.sh to get this.
Source0: https://cdn.amazonlinux.com/blobstore/72726a4adc0c205ce087f838249744029fc8e51b85ea0e3d395cb10ac99d4864/kernel-5.15.156-102.160.amzn2.src.rpm
Source0: https://cdn.amazonlinux.com/blobstore/f75f72cbdb5b3da04159fef0093b7ca471b95b58172bc9630600bc94668e247a/kernel-5.15.158-103.164.amzn2.src.rpm
Source100: config-bottlerocket

# Help out-of-tree module builds run `make prepare` automatically.
Expand Down
4 changes: 2 additions & 2 deletions packages/kernel-6.1/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ path = "../packages.rs"

[[package.metadata.build-package.external-files]]
# Use latest-srpm-url.sh to get this.
url = "https://cdn.amazonlinux.com/al2023/blobstore/1abc503d6f7da124bf9e7c306ab8119b4b85c9207c943fb2c5a617d0d1716362/kernel-6.1.87-99.174.amzn2023.src.rpm"
sha512 = "2aaab825ca6bed61366fcdbc67d954191190a6010a9b083c824c9adeeb308000fa7af5b867b450d4bf5c6a9be4234e909ae5210a7157af5e7edcc4ff291a2f61"
url = "https://cdn.amazonlinux.com/al2023/blobstore/4deb8487627a15345b5963c9825994ff2ec7c42015380406ab8640590242fe7c/kernel-6.1.90-99.173.amzn2023.src.rpm"
sha512 = "a055bc88f4d99dd8df2b1272eaecdeb2a25e12e0f5a6639eba8c16ce6dcec0d2b2c8371dc87b507058ff232138e5ab5319a9b5b95314111d3fc5c2f25161c3e4"

[build-dependencies]
microcode = { path = "../microcode" }
4 changes: 2 additions & 2 deletions packages/kernel-6.1/kernel-6.1.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
%global debug_package %{nil}

Name: %{_cross_os}kernel-6.1
Version: 6.1.87
Version: 6.1.90
Release: 1%{?dist}
Summary: The Linux kernel
License: GPL-2.0 WITH Linux-syscall-note
URL: https://www.kernel.org/
# Use latest-srpm-url.sh to get this.
Source0: https://cdn.amazonlinux.com/al2023/blobstore/1abc503d6f7da124bf9e7c306ab8119b4b85c9207c943fb2c5a617d0d1716362/kernel-6.1.87-99.174.amzn2023.src.rpm
Source0: https://cdn.amazonlinux.com/al2023/blobstore/4deb8487627a15345b5963c9825994ff2ec7c42015380406ab8640590242fe7c/kernel-6.1.90-99.173.amzn2023.src.rpm
Source100: config-bottlerocket

# This list of FIPS modules is extracted from /etc/fipsmodules in the initramfs
Expand Down
26 changes: 26 additions & 0 deletions packages/kmod/kmod.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,48 @@ cp COPYING COPYING.LGPL
cp tools/COPYING COPYING.GPL

%build

%define _configure ../configure

mkdir static-build
pushd static-build

%cross_configure \
--with-zlib \
--with-zstd \
--without-openssl

%make_build LDFLAGS="-all-static"

popd

mkdir dynamic-build
pushd dynamic-build

%cross_configure \
--with-zlib \
--with-zstd \
--without-openssl

%make_build

popd

%install
pushd dynamic-build
%make_install
popd

pushd static-build
install -p tools/kmod %{buildroot}%{_cross_bindir}

for b in depmod insmod lsmod modinfo modprobe rmmod ; do
ln -s kmod %{buildroot}%{_cross_bindir}/${b}
done

install -d %{buildroot}%{_cross_sbindir}
ln -s ../bin/kmod %{buildroot}%{_cross_sbindir}/modprobe
popd

%files
%license COPYING.LGPL COPYING.GPL
Expand Down