diff --git a/build_library/extra_sysexts.sh b/build_library/extra_sysexts.sh index e57f670cb3..dc350ec3e5 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 3f529c7243..99f5543afd 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 -r SYSEXT_NAME PACKAGE_ATOMS USEFLAGS ARCHES <<< "$sysext" + + arch_array=("${ARCHES//,/ }") + if [[ -n $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=,