diff --git a/Cargo.lock b/Cargo.lock index 3fb3ba7ae..75c260c50 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,7 +118,6 @@ dependencies = [ "kmod", "kmod-5_10-nvidia", "kmod-5_15-nvidia", - "kmod-6_1-neuron", "kmod-6_1-nvidia", "kubernetes-1_24", "kubernetes-1_25", @@ -482,13 +481,6 @@ dependencies = [ "kernel-5_15", ] -[[package]] -name = "kmod-6_1-neuron" -version = "0.1.0" -dependencies = [ - "kernel-6_1", -] - [[package]] name = "kmod-6_1-nvidia" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 1e26fe5ba..aa2cb4255 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,6 @@ members = [ "packages/kmod", "packages/kmod-5.10-nvidia", "packages/kmod-5.15-nvidia", - "packages/kmod-6.1-neuron", "packages/kmod-6.1-nvidia", "packages/kubernetes-1.24", "packages/kubernetes-1.25", diff --git a/kits/bottlerocket-core-kit/Cargo.toml b/kits/bottlerocket-core-kit/Cargo.toml index 0372e0d52..ead068446 100644 --- a/kits/bottlerocket-core-kit/Cargo.toml +++ b/kits/bottlerocket-core-kit/Cargo.toml @@ -58,7 +58,6 @@ keyutils = { path = "../../packages/keyutils" } kmod-5_10-nvidia = { path = "../../packages/kmod-5.10-nvidia" } kmod-5_15-nvidia = { path = "../../packages/kmod-5.15-nvidia" } kmod-6_1-nvidia = { path = "../../packages/kmod-6.1-nvidia" } -kmod-6_1-neuron = { path = "../../packages/kmod-6.1-neuron" } kmod = { path = "../../packages/kmod" } kubernetes-1_24 = { path = "../../packages/kubernetes-1.24" } kubernetes-1_25 = { path = "../../packages/kubernetes-1.25" } diff --git a/packages/kmod-6.1-neuron/.gitignore b/packages/kmod-6.1-neuron/.gitignore deleted file mode 100644 index e7a9c1347..000000000 --- a/packages/kmod-6.1-neuron/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.rpm diff --git a/packages/kmod-6.1-neuron/0001-kbuild-do-not-outline-atomics-for-arm64.patch b/packages/kmod-6.1-neuron/0001-kbuild-do-not-outline-atomics-for-arm64.patch deleted file mode 100644 index c52edefb9..000000000 --- a/packages/kmod-6.1-neuron/0001-kbuild-do-not-outline-atomics-for-arm64.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 5c77e9c0db55dd35f162ec41fa5a62856121f5da Mon Sep 17 00:00:00 2001 -From: Ben Cressey -Date: Fri, 28 Jun 2024 02:06:55 +0000 -Subject: [PATCH] kbuild: do not outline atomics for arm64 - -Signed-off-by: Ben Cressey ---- - usr/src/aws-neuronx-2.18.12.0/Kbuild | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/usr/src/aws-neuronx-2.18.12.0/Kbuild b/usr/src/aws-neuronx-2.18.12.0/Kbuild -index 11f8490..6535608 100644 ---- a/usr/src/aws-neuronx-2.18.12.0/Kbuild -+++ b/usr/src/aws-neuronx-2.18.12.0/Kbuild -@@ -16,3 +16,4 @@ neuron-objs += v3/notific.o v3/neuron_dhal_v3.o - - ccflags-y += -O3 -Wall -Werror -Wno-declaration-after-statement -Wunused-macros -Wunused-local-typedefs - ccflags-y += -I$(src)/ -+ccflags-$(CONFIG_ARM64) += -mno-outline-atomics --- -2.45.1 - diff --git a/packages/kmod-6.1-neuron/Cargo.toml b/packages/kmod-6.1-neuron/Cargo.toml deleted file mode 100644 index 63cb6b0b3..000000000 --- a/packages/kmod-6.1-neuron/Cargo.toml +++ /dev/null @@ -1,20 +0,0 @@ -[package] -name = "kmod-6_1-neuron" -version = "0.1.0" -edition = "2021" -publish = false -build = "../build.rs" - -[lib] -path = "../packages.rs" - -[package.metadata.build-package] -package-name = "kmod-6.1-neuron" -releases-url = "https://awsdocs-neuron.readthedocs-hosted.com/en/latest/release-notes/runtime/aws-neuronx-dkms/index.html" - -[[package.metadata.build-package.external-files]] -url = "https://yum.repos.neuron.amazonaws.com/aws-neuronx-dkms-2.18.12.0.noarch.rpm" -sha512 = "4ed92e661d0ba368eaf8f60e1a68c202062a26819231fcfd42a5ff05d20ad2f34b82b23359a88e80eea22ee5d0056ad769b6febd5d7e7b161da0e36434ba2579" - -[build-dependencies] -kernel-6_1 = { path = "../kernel-6.1" } diff --git a/packages/kmod-6.1-neuron/kmod-6.1-neuron.spec b/packages/kmod-6.1-neuron/kmod-6.1-neuron.spec deleted file mode 100644 index ab1a72932..000000000 --- a/packages/kmod-6.1-neuron/kmod-6.1-neuron.spec +++ /dev/null @@ -1,77 +0,0 @@ -Name: %{_cross_os}kmod-6.1-neuron -Version: 2.18.12.0 -Release: 1%{?dist} -Epoch: 1 -Summary: Neuron drivers for the 6.1 kernel -License: GPL-2.0-only -URL: https://awsdocs-neuron.readthedocs-hosted.com/en/latest/ - -Source0: https://yum.repos.neuron.amazonaws.com/aws-neuronx-dkms-%{version}.noarch.rpm -Source1: neuron-modules-load.conf -Source2: neuron-systemd-modules-load.drop-in.conf -Patch0001: 0001-kbuild-do-not-outline-atomics-for-arm64.patch - -BuildRequires: %{_cross_os}kernel-6.1-archive - -%description -%{summary}. - -%package devel -Summary: Files for development using the Neuron drivers -Requires: %{name} - -%description devel -%{summary}. - -%prep -rpm2cpio %{SOURCE0} | cpio -idmv -tar -xf %{_cross_datadir}/bottlerocket/kernel-devel.tar.xz -%autopatch -p1 - -%global neuron_sources usr/src/aws-neuronx-%{version} -%global kernel_sources %{_builddir}/kernel-devel - -%build -pushd %{_builddir}/%{neuron_sources} -%make_build \ - -C %{kernel_sources} \ - M=${PWD} \ - ARCH=%{_cross_karch} \ - CROSS_COMPILE=%{_cross_target}- \ - INSTALL_MOD_STRIP=1 \ - %{nil} -gzip -9 neuron.ko -popd - -%install -pushd %{_builddir}/%{neuron_sources} -export KVER="$(cat %{kernel_sources}/include/config/kernel.release)" -export KMODDIR="%{_cross_libdir}/modules/${KVER}/extra" -install -d "%{buildroot}${KMODDIR}" -install -p -m 0644 neuron.ko.gz "%{buildroot}${KMODDIR}" -popd - -# Install modules-load.d drop-in to autoload required kernel modules -install -d %{buildroot}%{_cross_libdir}/modules-load.d -install -p -m 0644 %{S:1} %{buildroot}%{_cross_libdir}/modules-load.d/neuron.conf - -# Install systemd-modules-load drop-in to ensure that depmod runs. -install -d %{buildroot}%{_cross_unitdir}/systemd-modules-load.service.d -install -p -m 0644 %{S:2} %{buildroot}%{_cross_unitdir}/systemd-modules-load.service.d/neuron.conf - -# Install the shared header file -install -d %{buildroot}%{_cross_includedir}/share -install -p -m 0644 %{_builddir}/%{neuron_sources}/share/neuron_driver_shared.h %{buildroot}/%{_cross_includedir}/share/neuron_driver_shared.h -install -p -m 0644 %{_builddir}/%{neuron_sources}/neuron_ioctl.h %{buildroot}/%{_cross_includedir}/neuron_ioctl.h - -%files -%license %{neuron_sources}/LICENSE -%{_cross_attribution_file} -%{_cross_libdir}/modules/*/extra/neuron.ko.gz -%{_cross_libdir}/modules-load.d/neuron.conf -%{_cross_unitdir}/systemd-modules-load.service.d/neuron.conf - -%files devel -%dir %{_cross_includedir}/share/ -%{_cross_includedir}/share/neuron_driver_shared.h -%{_cross_includedir}/neuron_ioctl.h diff --git a/packages/kmod-6.1-neuron/latest-srpm-url.sh b/packages/kmod-6.1-neuron/latest-srpm-url.sh deleted file mode 100755 index 5bb6c85ec..000000000 --- a/packages/kmod-6.1-neuron/latest-srpm-url.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -cmd=" -dnf install -q -y --releasever=latest yum-utils && -dnf download -q --repofrompath neuron,https://yum.repos.neuron.amazonaws.com --repo=neuron --urls aws-neuronx-dkms -" -docker run --rm amazonlinux:2023 bash -c "${cmd}" \ - | grep '^http' \ - | xargs --max-args=1 --no-run-if-empty realpath --canonicalize-missing --relative-to=. \ - | sed 's_:/_://_' diff --git a/packages/kmod-6.1-neuron/neuron-modules-load.conf b/packages/kmod-6.1-neuron/neuron-modules-load.conf deleted file mode 100644 index aba019c2e..000000000 --- a/packages/kmod-6.1-neuron/neuron-modules-load.conf +++ /dev/null @@ -1 +0,0 @@ -neuron diff --git a/packages/kmod-6.1-neuron/neuron-systemd-modules-load.drop-in.conf b/packages/kmod-6.1-neuron/neuron-systemd-modules-load.drop-in.conf deleted file mode 100644 index 0b1302960..000000000 --- a/packages/kmod-6.1-neuron/neuron-systemd-modules-load.drop-in.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Service] -ExecStartPre=-/usr/bin/depmod