summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-xsource/a/elilo/elilo.SlackBuild2
-rw-r--r--source/a/elilo/eliloconfig17
-rwxr-xr-xsource/a/xz/xz.SlackBuild2
-rwxr-xr-xsource/ap/squashfs-tools/squashfs-tools.SlackBuild3
-rwxr-xr-xsource/n/curl/curl.SlackBuild2
-rwxr-xr-xsource/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild2
6 files changed, 18 insertions, 10 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
diff --git a/source/ap/squashfs-tools/squashfs-tools.SlackBuild b/source/ap/squashfs-tools/squashfs-tools.SlackBuild
index 5676784af..cb2195dc3 100755
--- a/source/ap/squashfs-tools/squashfs-tools.SlackBuild
+++ b/source/ap/squashfs-tools/squashfs-tools.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=squashfs-tools
VERSION=${VERSION:-$( echo squashfs-tools*.tar.?z | cut -d- -f3- | rev | cut -f3- -d . | rev )}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -126,6 +126,7 @@ cd ..
mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
cp -a \
ACKNOWLEDGEMENTS CHANGES COPYING* INSTALL *README* \
+ examples/pseudo-file.example \
$PKG/usr/doc/${PKGNAM}-$VERSION
mkdir -p $PKG/install
diff --git a/source/n/curl/curl.SlackBuild b/source/n/curl/curl.SlackBuild
index 5520efac3..94649e0dc 100755
--- a/source/n/curl/curl.SlackBuild
+++ b/source/n/curl/curl.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=curl
VERSION=${VERSION:-$(echo curl-*.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
diff --git a/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
index 0dd35f974..4417b923f 100755
--- a/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
+++ b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xfce4-screensaver
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then