Unify Node.js installs for xarches

nodejs can now be installed like it is on x86_64 so avoid a spacial
case. In fact the special case prevented building a multi-arch image
for ubuntu-jammy.

Also clean up a left-over var from a removed feature.

Author: nickva

bin/apt-dependencies.sh

@@ -84,15 +84,12 @@ else
 fi
 
 # Node.js
-if [ "${ARCH}" == "ppc64le" -o "${ARCH}" == "s390x" ]; then
-  apt-get install --no-install-recommends -y nodejs npm
-else
-  wget https://deb.nodesource.com/setup_${NODEVERSION}.x
-  if /bin/bash setup_${NODEVERSION}.x; then
-    apt-get install --no-install-recommends -y nodejs
-  fi
-  rm setup_${NODEVERSION}.x
+wget https://deb.nodesource.com/setup_${NODEVERSION}.x
+if /bin/bash setup_${NODEVERSION}.x; then
+  apt-get install --no-install-recommends -y nodejs
 fi
+rm setup_${NODEVERSION}.x
+
 # maybe install node from scratch if pkg install failed...
 if [ -z "$(which node)" ]; then
   apt-get purge -y nodejs || true
@@ -120,8 +117,6 @@ EOF
   apt-get install --no-install-recommends -y ./nodejs*.deb
   rm nodejs-control nodejs*deb
 fi
-# update to latest npm
-npm install npm@latest -g --unsafe-perm
 
 # rest of python dependencies
 pip3 --default-timeout=10000 install --upgrade sphinx_rtd_theme nose requests hypothesis==3.79.0

build.sh

@@ -49,7 +49,6 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DEBIANS="debian-buster debian-bullseye"
 UBUNTUS="ubuntu-bionic ubuntu-focal ubuntu-jammy"
 CENTOSES="centos-7 rockylinux-8 rockylinux-9"
-ERLANGALL_BASE="debian-bullseye"
 XPLAT_BASE="debian-bullseye"
 XPLAT_ARCHES="arm64v8 ppc64le s390x"
 PASSED_BUILDARGS="$buildargs"