3 files changed, 14 insertions, 7 deletions
diff --git a/source/a/elilo/elilo.SlackBuild b/source/a/elilo/elilo.SlackBuild
index 4f88c2f0e..ac31cacdf 100755
--- a/source/a/elilo/elilo.SlackBuild
+++ b/source/a/elilo/elilo.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=elilo
 VERSION=${VERSION:-$(echo $PKGNAM*.tar.?z* | rev | cut -f 2 -d - | rev)}
-BUILD=${BUILD:-13}
+BUILD=${BUILD:-14}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/a/elilo/eliloconfig b/source/a/elilo/eliloconfig
index 9d7475f9a..ae622634f 100644
--- a/source/a/elilo/eliloconfig
+++ b/source/a/elilo/eliloconfig
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2013, 2016, 2017  Patrick Volkerding, Sebeka, Minnesota, USA
+# Copyright 2013, 2016, 2017, 2023  Patrick Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -176,12 +176,19 @@ if [ "$REPLY" = "skip" ]; then
   exit
 fi
 
-if [ ! -d /sys/firmware/efi/vars ]; then
-  modprobe efivars 1> /dev/null 2> /dev/null
+# Make sure an interface to read/write EFI variables is present:
+if [ ! -d /sys/firmware/efi/efivars ]; then
+  modprobe efivarfs 1> /dev/null 2> /dev/null
   sleep 1 # Probably not needed, but playing it safe
+  # Take another look:
+  if [ ! -d /sys/firmware/efi/efivars ]; then
+    # Maybe we have an old kernel, so try the previous /sys/firmware/efi/vars interface instead:
+    modprobe efivars 1> /dev/null 2> /dev/null
+    sleep 1 # Probably not needed, but playing it safe
+  fi
 fi
-# If it's still gone, we fail silently:
-if [ ! -d /sys/firmware/efi/vars ]; then
+# At this point, we fail silently if we don't have either of these directories:
+if [ ! -d /sys/firmware/efi/efivars -a ! -d /sys/firmware/efi/vars ]; then
   exit
 fi
 
diff --git a/source/a/xz/xz.SlackBuild b/source/a/xz/xz.SlackBuild
index 5a3284a79..0dcb9079d 100755
--- a/source/a/xz/xz.SlackBuild
+++ b/source/a/xz/xz.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xz
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then