Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

x11-drivers/nvidia-{drivers, metadata}: Bump to 525.85.12 #2480

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changelog/security/2023-02-23-nvidia-drivers-525.85.12.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- nvidia-drivers ([CVE-2022-31607](https://nvd.nist.gov/vuln/detail/CVE-2022-31607), [CVE-2022-31608](https://nvd.nist.gov/vuln/detail/CVE-2022-31608), [CVE-2022-31615](https://nvd.nist.gov/vuln/detail/CVE-2022-31615), [CVE-2022-34665](https://nvd.nist.gov/vuln/detail/CVE-2022-34665), [CVE-2022-34666](https://nvd.nist.gov/vuln/detail/CVE-2022-34666), [CVE-2022-34670](https://nvd.nist.gov/vuln/detail/CVE-2022-34670), [CVE-2022-34673](https://nvd.nist.gov/vuln/detail/CVE-2022-34673), [CVE-2022-34674](https://nvd.nist.gov/vuln/detail/CVE-2022-34674), [CVE-2022-34676](https://nvd.nist.gov/vuln/detail/CVE-2022-34676), [CVE-2022-34677](https://nvd.nist.gov/vuln/detail/CVE-2022-34677), [CVE-2022-34678](https://nvd.nist.gov/vuln/detail/CVE-2022-34678), [CVE-2022-34679](https://nvd.nist.gov/vuln/detail/CVE-2022-34679), [CVE-2022-34680](https://nvd.nist.gov/vuln/detail/CVE-2022-34680), [CVE-2022-34682](https://nvd.nist.gov/vuln/detail/CVE-2022-34682), [CVE-2022-34684](https://nvd.nist.gov/vuln/detail/CVE-2022-34684), [CVE-2022-42254](https://nvd.nist.gov/vuln/detail/CVE-2022-42254), [CVE-2022-42255](https://nvd.nist.gov/vuln/detail/CVE-2022-42255), [CVE-2022-42256](https://nvd.nist.gov/vuln/detail/CVE-2022-42256), [CVE-2022-42257](https://nvd.nist.gov/vuln/detail/CVE-2022-42257), [CVE-2022-42258](https://nvd.nist.gov/vuln/detail/CVE-2022-42258), [CVE-2022-42259](https://nvd.nist.gov/vuln/detail/CVE-2022-42259), [CVE-2022-42260](https://nvd.nist.gov/vuln/detail/CVE-2022-42260), [CVE-2022-42261](https://nvd.nist.gov/vuln/detail/CVE-2022-42261), [CVE-2022-42263](https://nvd.nist.gov/vuln/detail/CVE-2022-42263), [CVE-2022-42264](https://nvd.nist.gov/vuln/detail/CVE-2022-42264), [CVE-2022-42265](https://nvd.nist.gov/vuln/detail/CVE-2022-42265))
1 change: 1 addition & 0 deletions changelog/updates/2023-02-23-nvidia-drivers-525.85.12.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- nvidia-drivers ([525.85.12](https://docs.nvidia.com/datacenter/tesla/tesla-release-notes-525-85-12/index.html))
2 changes: 1 addition & 1 deletion coreos-base/coreos/coreos-0.0.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ RDEPEND="${RDEPEND}
sys-power/acpid
sys-process/lsof
sys-process/procps
x11-drivers/nvidia-metadata
x11-drivers/nvidia-drivers
"

# OEM specific bits that need to go in USR
Expand Down
12 changes: 0 additions & 12 deletions coreos-base/oem-azure/files/base/base.ign
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@
"source": "oem:///units/waagent.service"
},
"mode": 292
},
{
"filesystem": "root",
"path": "/etc/systemd/system/nvidia.service",
"contents": {
"source": "oem:///units/nvidia.service"
},
"mode": 292
}
]
},
Expand All @@ -27,10 +19,6 @@
{
"name": "waagent.service",
"enabled": true
},
{
"name": "nvidia.service",
"enabled": true
}
]
}
Expand Down
1 change: 0 additions & 1 deletion coreos-base/oem-azure/oem-azure-2.6.0.2-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ S="${WORKDIR}"

RDEPEND="
~app-emulation/wa-linux-agent-${PV}
x11-drivers/nvidia-drivers
"

src_prepare() {
Expand Down
12 changes: 0 additions & 12 deletions coreos-base/oem-ec2-compat/files/base/base-ec2.ign
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
"name": "amazon-ssm-agent.service",
"enabled": true,
"contents": "[Unit]\nDescription=amazon-ssm-agent\nAfter=network-online.target\n\n[Service]\nType=simple\nWorkingDirectory=/usr/share/oem\nExecStart=/usr/share/oem/bin/amazon-ssm-agent\nKillMode=process\nRestart=on-failure\nRestartForceExitStatus=SIGPIPE\nRestartSec=15min\n\n[Install]\nWantedBy=multi-user.target\n"
},
{
"name": "nvidia.service",
"enabled": true
}
]
},
Expand Down Expand Up @@ -44,14 +40,6 @@
"source": "oem:///eks/bootstrap.sh"
},
"mode": 493
},
{
"filesystem": "root",
"path": "/etc/systemd/system/nvidia.service",
"contents": {
"source": "oem:///units/nvidia.service"
},
"mode": 292
}
]
}
Expand Down
1 change: 0 additions & 1 deletion coreos-base/oem-ec2-compat/oem-ec2-compat-0.1.2-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ REQUIRED_USE="^^ ( ec2 openstack brightbox )"
RDEPEND="
ec2? ( app-emulation/amazon-ssm-agent )
coreos-base/flatcar-eks
x11-drivers/nvidia-drivers
"

# no source directory
Expand Down
2 changes: 1 addition & 1 deletion coreos-base/update_engine/update_engine-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ CROS_WORKON_REPO="https://github.com"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else
CROS_WORKON_COMMIT="c6f566d47d8949632f7f43871eb8d5c625af3209" # flatcar-master
CROS_WORKON_COMMIT="c6f566d47d8949632f7f43871eb8d5c625af3209" # nvidia-PR
KEYWORDS="amd64 arm64"
fi

Expand Down
1 change: 0 additions & 1 deletion coreos-devel/board-packages/board-packages-0.0.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,4 @@ RDEPEND="
coreos-base/coreos-dev
coreos-base/flatcar-eks
dev-lang/python-oem
x11-drivers/nvidia-drivers
"
2 changes: 1 addition & 1 deletion x11-drivers/nvidia-drivers/files/units/nvidia.service
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ After=network-online.target
Type=simple
Restart=no
Environment=PATH=/opt/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
ExecStart=/usr/share/oem/bin/setup-nvidia
ExecStart=/usr/lib/nvidia/bin/setup-nvidia

[Install]
WantedBy=multi-user.target
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@ IUSE=""
S="${WORKDIR}"

RDEPEND="
=x11-drivers/nvidia-metadata-${PV}
=x11-drivers/nvidia-metadata-${PV}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can move the contents of nvidia-metadata ebuild into this nvidia-drivers ebuild here to have all at one place now.

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe let's only focus on this here and then merge? Assuming that the driver still works.

"

src_install() {
insinto "/usr/share/oem"
doins -r "${FILESDIR}/units"
exeinto "/usr/share/oem/bin"
systemd_dounit "${FILESDIR}/units/nvidia.service"
exeinto "/usr/lib/nvidia/bin"
doexe "${FILESDIR}/bin/install-nvidia"
doexe "${FILESDIR}/bin/setup-nvidia"
pothos marked this conversation as resolved.
Show resolved Hide resolved
}
2 changes: 1 addition & 1 deletion x11-drivers/nvidia-metadata/files/nvidia-metadata
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
NVIDIA_DRIVER_VERSION=510.73.05
NVIDIA_DRIVER_VERSION=525.85.12
NVIDIA_PRODUCT_TYPE=tesla