Skip to content

Commit ee918fb

Browse files
committed
sysext: don't build nvidia-drivers on ARM
1 parent 9cb0d0c commit ee918fb

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

build_library/extra_sysexts.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ EXTRA_SYSEXTS=(
22
"zfs|sys-fs/zfs"
33
"podman|app-containers/podman,net-misc/passt"
44
"python|dev-lang/python,dev-python/pip"
5-
"nvidia-drivers-535|x11-drivers/nvidia-drivers:0/535|-kernel-open"
6-
"nvidia-drivers-535-open|x11-drivers/nvidia-drivers:0/535|kernel-open"
7-
"nvidia-drivers-550|x11-drivers/nvidia-drivers:0/550|-kernel-open"
8-
"nvidia-drivers-550-open|x11-drivers/nvidia-drivers:0/550|kernel-open"
5+
"nvidia-drivers-535|x11-drivers/nvidia-drivers:0/535|-kernel-open|amd64"
6+
"nvidia-drivers-535-open|x11-drivers/nvidia-drivers:0/535|kernel-open|amd64"
7+
"nvidia-drivers-550|x11-drivers/nvidia-drivers:0/550|-kernel-open|amd64"
8+
"nvidia-drivers-550-open|x11-drivers/nvidia-drivers:0/550|kernel-open|amd64"
9+
"nvidia-drivers-570|x11-drivers/nvidia-drivers:0/570|-kernel-open|amd64"
10+
"nvidia-drivers-570-open|x11-drivers/nvidia-drivers:0/570|kernel-open|amd64"
911
)
1012

1113
_get_unversioned_sysext_packages_unsorted() {

build_packages

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,21 @@ sudo -E "${EMERGE_CMD[@]}" "${EMERGE_FLAGS[@]}" "$@"
288288

289289
info "Merging sysext packages now"
290290
for sysext in "${EXTRA_SYSEXTS[@]}"; do
291-
IFS="|" read SYSEXT_NAME PACKAGE_ATOMS USEFLAGS < <(echo "$sysext");
291+
IFS="|" read -r SYSEXT_NAME PACKAGE_ATOMS USEFLAGS ARCHES <<< "$sysext"
292+
293+
arch_array=("${ARCHES//,/ }")
294+
if [[ -n $ARCHES ]]; then
295+
should_skip=1
296+
for arch in "${arch_array[@]}"; do
297+
if [[ $arch == "$ARCH" ]]; then
298+
should_skip=0
299+
fi
300+
done
301+
if [[ $should_skip -eq 1 ]]; then
302+
continue
303+
fi
304+
fi
305+
292306

293307
info "Building packages for $SYSEXT_NAME sysext with USE=$USEFLAGS"
294308
IFS=,

0 commit comments

Comments
 (0)