Remove outdated references to make

Signed-off-by: Ethan Dye <[email protected]>

install.bash

@@ -33,7 +33,7 @@ if [[ $OS == "alpine" ]] && ! [[ "$(apk info 2> /dev/null | grep -E '^(gcc|meson
   echo "Installing needed packages (gcc, meson, fts-dev, linux-headers, util-linux-misc, musl-dev)"
   apk add gcc meson fts-dev linux-headers util-linux-misc musl-dev || exit 1
 elif ! dpkg -s 'gcc' 'meson' 'libc6-dev' &> /dev/null; then
-  echo "Installing needed packages (gcc, make, libc6-dev)"
+  echo "Installing needed packages (gcc, meson, libc6-dev)"
   apt-get install --yes gcc meson libc6-dev || exit 1
 fi
 

tests/install-packages.bash

@@ -2,7 +2,7 @@
 
 export DEBIAN_FRONTEND="noninteractive"
 
-apt-get --quiet install --yes gcc make libc6-dev
+apt-get --quiet install --yes gcc meson libc6-dev
 apt-get --quiet autoremove --yes
 systemctl mask rpi-eeprom-update.service hciuart.service systemd-logind.service
 rm -f /var/lib/apt/lists/lock

update.bash

@@ -12,12 +12,12 @@ if ! [[ -f /usr/local/sbin/zram-config || -f /usr/sbin/zram-config ]]; then
   exit 1
 fi
 
-if [[ $OS == "alpine" ]] && ! [[ "$(apk info 2> /dev/null | grep -E '^(gcc|make|fts-dev|linux-headers|util-linux-misc|musl-dev)' | tr '\n' ' ')" == "fts-dev gcc make util-linux-misc musl-dev linux-headers " ]]; then
-  echo "Installing needed packages (gcc, make, fts-dev, linux-headers, util-linux-misc, musl-dev)"
-  apk add gcc make fts-dev linux-headers util-linux-misc musl-dev || exit 1
-elif ! dpkg -s 'gcc' 'make' 'libc6-dev' &> /dev/null; then
-  echo "Installing needed packages (gcc, make, libc6-dev)"
-  apt-get install --yes gcc make libc6-dev || exit 1
+if [[ $OS == "alpine" ]] && ! [[ "$(apk info 2> /dev/null | grep -E '^(gcc|meson|fts-dev|linux-headers|util-linux-misc|musl-dev)' | tr '\n' ' ')" == "fts-dev gcc meson util-linux-misc musl-dev linux-headers " ]]; then
+  echo "Installing needed packages (gcc, meson, fts-dev, linux-headers, util-linux-misc, musl-dev)"
+  apk add gcc meson fts-dev linux-headers util-linux-misc musl-dev || exit 1
+elif ! dpkg -s 'gcc' 'meson' 'libc6-dev' &> /dev/null; then
+  echo "Installing needed packages (gcc, meson, libc6-dev)"
+  apt-get install --yes gcc meson libc6-dev || exit 1
 fi
 
 if [[ $OS == "ubuntu" ]] && [[ $(bc -l <<< "$(grep -o '^VERSION_ID=.*$' /etc/os-release | cut -d'=' -f2 | tr -d '"') >= 21.10") -eq 1 ]]; then
@@ -35,7 +35,9 @@ if [[ $1 != "custom" ]]; then
   git -C "$BASEDIR" reset --hard origin/main
 fi
 
-make --always-make --directory="${BASEDIR}/overlayfs-tools"
+meson setup --clearcache --reconfigure overlayfs-tools/builddir overlayfs-tools || exit 1
+meson compile -C overlayfs-tools/builddir || exit 1
+meson install -C overlayfs-tools/builddir || exit 1
 
 echo "Stopping zram-config service"
 if [[ $OS == "alpine" ]]; then