From 01f198fe136ccc55bf11931eecdff9b1d482ec8a Mon Sep 17 00:00:00 2001
From: Daniel Zatovic <daniel.zatovic@gmail.com>
Date: Mon, 7 Apr 2025 12:13:41 +0200
Subject: [PATCH] sysext: don't build nvidia-drivers on ARM

---
 build_library/extra_sysexts.sh | 10 ++++++----
 build_packages                 | 16 +++++++++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/build_library/extra_sysexts.sh b/build_library/extra_sysexts.sh
index ed5a872159..749868d4a9 100644
--- a/build_library/extra_sysexts.sh
+++ b/build_library/extra_sysexts.sh
@@ -2,10 +2,12 @@ EXTRA_SYSEXTS=(
   "zfs|sys-fs/zfs"
   "podman|app-containers/podman,net-misc/passt"
   "python|dev-lang/python,dev-python/pip"
-  "nvidia-drivers-535|x11-drivers/nvidia-drivers:0/535|-kernel-open"
-  "nvidia-drivers-535-open|x11-drivers/nvidia-drivers:0/535|kernel-open"
-  "nvidia-drivers-550|x11-drivers/nvidia-drivers:0/550|-kernel-open"
-  "nvidia-drivers-550-open|x11-drivers/nvidia-drivers:0/550|kernel-open"
+  "nvidia-drivers-535|x11-drivers/nvidia-drivers:0/535|-kernel-open|amd64"
+  "nvidia-drivers-535-open|x11-drivers/nvidia-drivers:0/535|kernel-open|amd64"
+  "nvidia-drivers-550|x11-drivers/nvidia-drivers:0/550|-kernel-open|amd64"
+  "nvidia-drivers-550-open|x11-drivers/nvidia-drivers:0/550|kernel-open|amd64"
+  "nvidia-drivers-570|x11-drivers/nvidia-drivers:0/570|-kernel-open|amd64"
+  "nvidia-drivers-570-open|x11-drivers/nvidia-drivers:0/570|kernel-open|amd64"
 )
 
 _get_unversioned_sysext_packages_unsorted() {
diff --git a/build_packages b/build_packages
index 6e42dbd60e..6e4528a8c6 100755
--- a/build_packages
+++ b/build_packages
@@ -288,7 +288,21 @@ sudo -E "${EMERGE_CMD[@]}" "${EMERGE_FLAGS[@]}" "$@"
 
 info "Merging sysext packages now"
 for sysext in "${EXTRA_SYSEXTS[@]}"; do
-  IFS="|" read SYSEXT_NAME PACKAGE_ATOMS USEFLAGS < <(echo "$sysext");
+  IFS="|" read SYSEXT_NAME PACKAGE_ATOMS USEFLAGS ARCHES < <(echo "$sysext");
+
+  arch_array=(${ARCHES//,/ })
+  if [[ ! -z "$ARCHES" ]]; then
+    should_skip=1
+    for arch in "${arch_array[@]}"; do
+      if [ "$arch" == "$ARCH" ]; then
+        should_skip=0
+      fi
+    done
+    if [ "$should_skip" -eq 1 ]; then
+      continue
+    fi
+  fi
+
 
   info "Building packages for $SYSEXT_NAME sysext with USE=$USEFLAGS"
   IFS=,