xx-verify: since file 5.46 it expects Linux i386

Signed-off-by: CrazyMax <[email protected]>
tonistiigi · Dec 6, 2024 · 2de9dd9 · 2de9dd9
1 parent 59bc5d8
commit 2de9dd9
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/xx-verify b/src/xx-verify
@@ -144,7 +144,8 @@ for f in "$@"; do
   fi
 
   expArch=""
-  expArch2="" # extra check for endianness
+  expArchAlt="" # alternate arch name
+  expArch2=""   # extra check for endianness
   case "$TARGETARCH" in
     "arm64")
       case "$TARGETOS" in
@@ -226,7 +227,8 @@ for f in "$@"; do
       expArch2="64-bit LSB"
       ;;
     "386")
-      expArch="Intel 80386"
+      expArch="Intel i386"
+      expArchAlt="Intel 80386"
       if [ "$TARGETOS" != "windows" ]; then
         expArch2="32-bit LSB"
       fi
@@ -239,8 +241,15 @@ for f in "$@"; do
   fi
 
   if ! echo "$out" | grep "$expArch" >/dev/null; then
-    echo >&2 "file ${f} does not match expected target architecture ${TARGETARCH}: $out"
-    exit 1
+    if [ -n "$expArchAlt" ]; then
+      if ! echo "$out" | grep "$expArchAlt" >/dev/null; then
+        echo >&2 "file ${f} does not match expected target architecture ${TARGETARCH}: $out"
+        exit 1
+      fi
+    else
+      echo >&2 "file ${f} does not match expected target architecture ${TARGETARCH}: $out"
+      exit 1
+    fi
   fi
 
   if [ -n "$expArch2" ]; then