Fix version parsing and checks to also support gnu-efi >= 4.0

The current mechanism to parse gnu-efi's version is restricted to
gnu-efi 3.x series. Improve the calculation to also account for
gnu-efi 4.x series (and beyond).

Reported-by: Andreas Tobler <[email protected]>
Signed-off-by: Christian Storm <[email protected]>
Signed-off-by: Jan Kiszka <[email protected]>

Author: stormc

configure.ac

@@ -40,7 +40,7 @@ AC_PROG_CC
 AC_CHECK_TOOL(LD, ld)
 AC_CHECK_TOOL(OBJCOPY, objcopy)
 AC_CHECK_TOOL(GREP, grep)
-AC_CHECK_TOOL(TR, tr)
+AC_CHECK_TOOL(AWK, awk)
 
 dnl Dont try to use things like -std=c99 for efi compilation
 GNUEFI_CC=$CC
@@ -232,9 +232,9 @@ if test "x$PKG_CONFIG" = "xno"; then
 fi
 
 # Note: gnu-efi introduced pkg-config with version 3.0.16
-# GNU_EFI_VERSION resolves to gnu-efi's version without dots, e.g., GNU_EFI_VERSION=3016
+# GNU_EFI_VERSION resolves to gnu-efi's version without dots, e.g., GNU_EFI_VERSION=3000016
 # gnu-efi versions < 3.0.16 resolve to GNU_EFI_VERSION=0
-AC_SUBST([GNU_EFI_VERSION], [$( ($PKG_CONFIG --modversion "gnu-efi" 2>/dev/null || echo 0) | $TR -d '.' )])
+AC_SUBST([GNU_EFI_VERSION], [$( ($PKG_CONFIG --modversion "gnu-efi" 2>/dev/null || echo 0) | $AWK -F. '{print $1*1000000 + $2*1000 + $3}' )])
 AC_DEFINE_UNQUOTED([GNU_EFI_VERSION], [${GNU_EFI_VERSION}], [gnu-efi version])
 
 AC_SUBST([OBJCOPY_HAS_EFI_APP_TARGET], [$($OBJCOPY --info | $GREP -q pei- 2>/dev/null && echo "true")])

drivers/watchdog/wdfuncs_end.c

@@ -12,7 +12,7 @@
  * SPDX-License-Identifier:	GPL-2.0-only
  */
 
-#if GNU_EFI_VERSION < 3016
+#if GNU_EFI_VERSION < 3000016
 
 #include <efi.h>
 #include "utils.h"

drivers/watchdog/wdfuncs_start.c

@@ -12,7 +12,7 @@
  * SPDX-License-Identifier:	GPL-2.0-only
  */
 
-#if GNU_EFI_VERSION < 3016
+#if GNU_EFI_VERSION < 3000016
 
 #include <efi.h>
 #include "utils.h"

main.c

@@ -45,7 +45,7 @@ VOID register_watchdog(WATCHDOG_DRIVER *driver)
 
 static EFI_STATUS probe_watchdogs(UINTN timeout)
 {
-#if GNU_EFI_VERSION < 3016
+#if GNU_EFI_VERSION < 3000016
 	const unsigned long *entry = wdfuncs_start;
 	for (entry++; entry < wdfuncs_end; entry++) {
 		((void (*)(void))*entry)();