diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/a/kernel-firmware/kernel-firmware.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/util-linux/doinst.sh | 8 | ||||
-rwxr-xr-x | source/a/util-linux/util-linux.SlackBuild | 2 | ||||
-rw-r--r-- | source/installer/ChangeLog.txt | 5 | ||||
l--------- | source/installer/sources/initrd/etc/mtab (renamed from source/installer/sources/initrd/etc/mounts) | 0 | ||||
-rwxr-xr-x | source/installer/sources/initrd/etc/rc.d/rc.S | 6 | ||||
-rw-r--r-- | source/kde/kde/build/digikam | 2 | ||||
-rwxr-xr-x | source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/mozilla-nss/mozilla-nss.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/p11-kit/p11-kit.SlackBuild | 2 |
10 files changed, 19 insertions, 12 deletions
diff --git a/source/a/kernel-firmware/kernel-firmware.SlackBuild b/source/a/kernel-firmware/kernel-firmware.SlackBuild index 11d3c58d9..24f30f9c9 100755 --- a/source/a/kernel-firmware/kernel-firmware.SlackBuild +++ b/source/a/kernel-firmware/kernel-firmware.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=kernel-firmware ARCH=noarch -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Compress the firmware blobs? # Default is "none" for no compression. # Other types known to be currently supported are "xz" and "zstd". diff --git a/source/a/util-linux/doinst.sh b/source/a/util-linux/doinst.sh index 8277c0e65..0d9730801 100644 --- a/source/a/util-linux/doinst.sh +++ b/source/a/util-linux/doinst.sh @@ -31,3 +31,11 @@ done if [ -r etc/default/su.new ]; then config etc/default/su.new fi + +# Since libmount has dropped all support for an /etc/mtab file, if we find that +# we'll need to replace it with a symlink to /proc/mounts: +if [ ! -L etc/mtab ]; then + rm -f etc/mtab + ( cd etc ; ln -sf /proc/mounts mtab ) +fi + diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 673dba44a..23f636729 100755 --- a/source/a/util-linux/util-linux.SlackBuild +++ b/source/a/util-linux/util-linux.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=util-linux VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 9b48ad7fb..b6136575d 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,8 @@ +Fri Jun 30 19:34:16 UTC 2023 + Make /etc/mtab a symlink to /proc/mounts. (I thought we did this before?) + Remove /etc/mounts symlink. + In rc.S, don't try to initialize /etc/mtab or fake mount /. ++--------------------------+ Tue Jun 13 20:02:38 UTC 2023 Added liburcu and liburcu-common libraries for xfsprogs. +--------------------------+ diff --git a/source/installer/sources/initrd/etc/mounts b/source/installer/sources/initrd/etc/mtab index 4c0a0948b..4c0a0948b 120000 --- a/source/installer/sources/initrd/etc/mounts +++ b/source/installer/sources/initrd/etc/mtab diff --git a/source/installer/sources/initrd/etc/rc.d/rc.S b/source/installer/sources/initrd/etc/rc.d/rc.S index 42a00ba74..133a7bf3b 100755 --- a/source/installer/sources/initrd/etc/rc.d/rc.S +++ b/source/installer/sources/initrd/etc/rc.d/rc.S @@ -1,12 +1,6 @@ #!/bin/sh # rc.S: Basic system initialization. -# Any /etc/mtab that exists here is old, so we start with a new one: -/bin/rm -f /etc/mtab{,~,.tmp} && /bin/touch /etc/mtab - -# Add (fake) entry for / to /etc/mtab: -/sbin/mount -f -w /dev/initramfs / -t tmpfs 1> /dev/null - # Mount /proc: /sbin/mount -v proc /proc -t proc 1> /dev/null diff --git a/source/kde/kde/build/digikam b/source/kde/kde/build/digikam index 00750edc0..b8626c4cf 100644 --- a/source/kde/kde/build/digikam +++ b/source/kde/kde/build/digikam @@ -1 +1 @@ -3 +4 diff --git a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild index 17d9735ba..f6e40311b 100755 --- a/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild +++ b/source/l/gst-plugins-bad-free/gst-plugins-bad-free.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gst-plugins-bad-free VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild index fc491be0c..26cbab3b6 100755 --- a/source/l/mozilla-nss/mozilla-nss.SlackBuild +++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-nss SRCNAM=nss -VERSION=${VERSION:-3.90} +VERSION=${VERSION:-3.91} NSPR=${NSPR:-4.35} BUILD=${BUILD:-1} diff --git a/source/n/p11-kit/p11-kit.SlackBuild b/source/n/p11-kit/p11-kit.SlackBuild index cfd002ae0..d07499414 100755 --- a/source/n/p11-kit/p11-kit.SlackBuild +++ b/source/n/p11-kit/p11-kit.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=p11-kit VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} |