From 74927ac76d464ea81008e99f57e4eb6ebc197742 Mon Sep 17 00:00:00 2001
From: EWouters <6179932+EWouters@users.noreply.github.com>
Date: Thu, 15 Dec 2022 16:25:44 +0100
Subject: [PATCH] Meta: Fix `mke2fs` on MacOS

Use `Meta/.shell_include.sh` to find the `mke2fs` executable.
---
 Meta/.shell_include.sh   | 6 +++---
 Meta/build-image-qemu.sh | 6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Meta/.shell_include.sh b/Meta/.shell_include.sh
index 21da3119c6d..989f85d443d 100755
--- a/Meta/.shell_include.sh
+++ b/Meta/.shell_include.sh
@@ -20,9 +20,8 @@ die() {
 find_executable() {
   paths=("/usr/sbin" "/sbin")
 
-  if [ "$(uname -s)" = "Darwin" ]; then
-    paths+=("/usr/local/opt/e2fsprogs/bin" "/usr/local/opt/e2fsprogs/sbin")
-    paths+=("/opt/homebrew/opt/e2fsprogs/bin" "/opt/homebrew/opt/e2fsprogs/sbin")
+  if [ "$(uname -s)" = "Darwin" ] && [ -n "${HOMEBREW_PREFIX}" ]; then
+    paths+=("${HOMEBREW_PREFIX}/opt/e2fsprogs/bin" "${HOMEBREW_PREFIX}/opt/e2fsprogs/sbin")
   fi
 
   executable="${1}"
@@ -45,3 +44,4 @@ find_executable() {
 FUSE2FS_PATH="$(find_executable fuse2fs)"
 RESIZE2FS_PATH="$(find_executable resize2fs)"
 E2FSCK_PATH="$(find_executable e2fsck)"
+MKE2FS_PATH="$(find_executable mke2fs)"
diff --git a/Meta/build-image-qemu.sh b/Meta/build-image-qemu.sh
index ea9453e3504..53a9c483cec 100755
--- a/Meta/build-image-qemu.sh
+++ b/Meta/build-image-qemu.sh
@@ -119,11 +119,7 @@ if [ $USE_EXISTING -ne 1 ]; then
         (echo "e 0"; echo 83; echo n; echo 0; echo "*"; echo "quit") | fdisk -e "$VND"
         newfs_ext2fs -D $INODE_SIZE -n $INODE_COUNT "/dev/r${VND}i" || die "could not create filesystem"
     else
-        if [ -x /sbin/mke2fs ]; then
-            /sbin/mke2fs -q -I $INODE_SIZE -N $INODE_COUNT _disk_image || die "could not create filesystem"
-        else
-            mke2fs -q -I $INODE_SIZE -N $INODE_COUNT _disk_image || die "could not create filesystem"
-        fi
+        "${MKE2FS_PATH}" -q -I "${INODE_SIZE}" -N "${INODE_COUNT}" _disk_image || die "could not create filesystem"
     fi
     echo "done"
 fi