summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-03-05 02:58:29 +0000
committerEric Hameleers <alien@slackware.com>2021-03-05 08:59:49 +0100
commitc83bba620077d6ddda032baf77afc934976dab32 (patch)
tree2e322e6384f6328c0eff1b32b7cf8630fd18aff6 /source
parente8e6e4d6db4d812e29be1138206db7d9d77f587c (diff)
downloadcurrent-c83bba620077d6ddda032baf77afc934976dab32.tar.gz
Fri Mar 5 02:58:29 UTC 202120210305025829
a/kernel-generic-5.10.20-x86_64-1.txz: Upgraded. a/kernel-huge-5.10.20-x86_64-1.txz: Upgraded. a/kernel-modules-5.10.20-x86_64-1.txz: Upgraded. ap/sysstat-12.5.3-x86_64-1.txz: Upgraded. d/kernel-headers-5.10.20-x86-1.txz: Upgraded. k/kernel-source-5.10.20-noarch-1.txz: Upgraded. l/pipewire-0.3.23-x86_64-1.txz: Upgraded. n/dovecot-2.3.14-x86_64-1.txz: Upgraded. x/OpenCC-1.1.2-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/linux-5.11.x/kernel-generic-5.11.3-x86_64-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-headers-5.11.3-x86-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-huge-5.11.3-x86_64-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-modules-5.11.3-x86_64-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-source-5.11.3-noarch-1.txz: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
-rwxr-xr-xsource/ap/sysstat/sysstat.SlackBuild2
-rw-r--r--source/installer/ChangeLog.txt4
-rwxr-xr-xsource/installer/build_installer.sh25
-rwxr-xr-xsource/k/build-all-kernels.sh1
-rw-r--r--source/k/kernel-configs/config-generic-5.10.20 (renamed from source/k/kernel-configs/config-generic-5.10.19)3
-rw-r--r--source/k/kernel-configs/config-generic-5.10.20.x64 (renamed from source/k/kernel-configs/config-generic-5.10.19.x64)3
-rw-r--r--source/k/kernel-configs/config-generic-smp-5.10.20-smp (renamed from source/k/kernel-configs/config-generic-smp-5.10.19-smp)3
-rw-r--r--source/k/kernel-configs/config-huge-5.10.20 (renamed from source/k/kernel-configs/config-huge-5.10.19)3
-rw-r--r--source/k/kernel-configs/config-huge-5.10.20.x64 (renamed from source/k/kernel-configs/config-huge-5.10.19.x64)3
-rw-r--r--source/k/kernel-configs/config-huge-smp-5.10.20-smp (renamed from source/k/kernel-configs/config-huge-smp-5.10.19-smp)3
-rwxr-xr-xsource/k/kernel-source.SlackBuild1
-rwxr-xr-xsource/n/dovecot/dovecot.SlackBuild2
-rwxr-xr-xsource/x/OpenCC/OpenCC.SlackBuild2
13 files changed, 29 insertions, 26 deletions
diff --git a/source/ap/sysstat/sysstat.SlackBuild b/source/ap/sysstat/sysstat.SlackBuild
index abbe3729..6f772d5d 100755
--- a/source/ap/sysstat/sysstat.SlackBuild
+++ b/source/ap/sysstat/sysstat.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sysstat
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
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 94a7d798..d8050c51 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,7 @@
+Thu Mar 4 09:17:54 UTC 2021
+ build_installer.sh: Updated support for AArch64.
+ MoZes.
++--------------------------+
Sat Feb 20 20:40:32 UTC 2021
Updated /sbin/rescan-scsi-bus to fix a misplaced "break". Thanks to andygoth.
+--------------------------+
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index c2e23ea0..cc3b09a8 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -3,7 +3,7 @@ set +o posix
# $Id: build_installer.sh,v 1.129 2011/04/13 23:03:07 eha Exp eha $
#
-# Copyright 2005-2018 Stuart Winter, Surrey, England, UK
+# Copyright 2005-2021 Stuart Winter, Surrey, England, UK
# Copyright 2008, 2009, 2010, 2011, 2017 Eric Hameleers, Eindhoven, Netherlands
# Copyright 2011-2020 Patrick Volkerding, Sebeka, MN, USA
# All rights reserved.
@@ -186,9 +186,9 @@ case $ARCH in
KEXTRAV[0]="-armv7"
;;
aarch64)
- KERNELS[0]=aarch64
+ KERNELS[0]=armv8
# The -extraversion (appended to the $KVER) for the KERNELS[*]:
- KEXTRAV[0]="-aarch64"
+ KEXTRAV[0]="-armv8"
;;
i?86)
# What kernel directories are in this installer?
@@ -510,7 +510,7 @@ mkdir -p -m755 etc/rc.d
mkdir -p -m755 etc/dropbear
mkdir -p -m755 floppy
mkdir -p -m755 lib/modules
-[ "$ARCH" = "x86_64" ] && mkdir -p -m755 lib64
+[[ "${ARCH}" =~ (x86_64$|aarch64$) ]] && mkdir -p -m755 lib64
mkdir -p -m700 lost+found
mkdir -p -m755 mnt
mkdir -p -m755 proc
@@ -1836,7 +1836,7 @@ sed -i 's?(version.*)?(version '"$INSTALLERVERSION"')?g' etc/issue
case $ARCH in
- arm*)
+ arm*|aarch64)
#
# ARM modifications:
#
@@ -1911,19 +1911,14 @@ cd $PKG/$ARCH-installer-filesystem/
echo "--- Creating your new initrd.img ---"
# Leave a note in the installer image to help us work out which build version
# it is -- just aids with bug reports for now:
-cat <<"EOF" > .installer-version
-Version details:
-----------------
-Installer............: $Revision: 1.129 $ ($Date: 2011/04/13 23:03:07 $)
-EOF
-cat << EOF >> .installer-version
-For Slackware version: $INSTALLERVERSION
-Build date...........: $( date )
+cat << EOF > .installer-version
+For Slackware version : $INSTALLERVERSION
+Build date............: $( date )
Build details:
--------------
-Installer arch.......: $ARCH
-Build host...........: $( uname -a )
+Installer arch target : $ARCH
+Build host............: $( uname -a )
EOF
diff --git a/source/k/build-all-kernels.sh b/source/k/build-all-kernels.sh
index 561b8e32..09e684b1 100755
--- a/source/k/build-all-kernels.sh
+++ b/source/k/build-all-kernels.sh
@@ -89,7 +89,6 @@ for recipe in $RECIPES ; do
echo "* Building kernels for recipe ${recipe}..."
echo "*************************************************"
echo
- sleep 3
# Build kernel-source package:
KERNEL_SOURCE_PACKAGE_NAME=$(PRINT_PACKAGE_NAME=YES KERNEL_CONFIG="config-generic${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX}" VERSION=$VERSION BUILD=$BUILD ./kernel-source.SlackBuild)
diff --git a/source/k/kernel-configs/config-generic-5.10.19 b/source/k/kernel-configs/config-generic-5.10.20
index bc3f5173..46d883d0 100644
--- a/source/k/kernel-configs/config-generic-5.10.19
+++ b/source/k/kernel-configs/config-generic-5.10.20
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.19 Kernel Configuration
+# Linux/x86 5.10.20 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
CONFIG_CC_IS_GCC=y
@@ -225,6 +225,7 @@ CONFIG_BPF_PRELOAD=y
CONFIG_BPF_PRELOAD_UMD=m
CONFIG_USERFAULTFD=y
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set
# CONFIG_EMBEDDED is not set
diff --git a/source/k/kernel-configs/config-generic-5.10.19.x64 b/source/k/kernel-configs/config-generic-5.10.20.x64
index 5aff1582..cce6324b 100644
--- a/source/k/kernel-configs/config-generic-5.10.19.x64
+++ b/source/k/kernel-configs/config-generic-5.10.20.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.19 Kernel Configuration
+# Linux/x86 5.10.20 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
CONFIG_CC_IS_GCC=y
@@ -251,6 +251,7 @@ CONFIG_BPF_PRELOAD=y
CONFIG_BPF_PRELOAD_UMD=m
CONFIG_USERFAULTFD=y
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set
# CONFIG_EMBEDDED is not set
diff --git a/source/k/kernel-configs/config-generic-smp-5.10.19-smp b/source/k/kernel-configs/config-generic-smp-5.10.20-smp
index e65bb016..19d7b7bb 100644
--- a/source/k/kernel-configs/config-generic-smp-5.10.19-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.10.20-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.19 Kernel Configuration
+# Linux/x86 5.10.20 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
CONFIG_CC_IS_GCC=y
@@ -240,6 +240,7 @@ CONFIG_BPF_PRELOAD=y
CONFIG_BPF_PRELOAD_UMD=m
CONFIG_USERFAULTFD=y
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set
# CONFIG_EMBEDDED is not set
diff --git a/source/k/kernel-configs/config-huge-5.10.19 b/source/k/kernel-configs/config-huge-5.10.20
index 88716a9d..b62df0a0 100644
--- a/source/k/kernel-configs/config-huge-5.10.19
+++ b/source/k/kernel-configs/config-huge-5.10.20
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.19 Kernel Configuration
+# Linux/x86 5.10.20 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
CONFIG_CC_IS_GCC=y
@@ -225,6 +225,7 @@ CONFIG_BPF_PRELOAD=y
CONFIG_BPF_PRELOAD_UMD=m
CONFIG_USERFAULTFD=y
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set
# CONFIG_EMBEDDED is not set
diff --git a/source/k/kernel-configs/config-huge-5.10.19.x64 b/source/k/kernel-configs/config-huge-5.10.20.x64
index 28a6e932..a82ef506 100644
--- a/source/k/kernel-configs/config-huge-5.10.19.x64
+++ b/source/k/kernel-configs/config-huge-5.10.20.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.19 Kernel Configuration
+# Linux/x86 5.10.20 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
CONFIG_CC_IS_GCC=y
@@ -251,6 +251,7 @@ CONFIG_BPF_PRELOAD=y
CONFIG_BPF_PRELOAD_UMD=m
CONFIG_USERFAULTFD=y
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set
# CONFIG_EMBEDDED is not set
diff --git a/source/k/kernel-configs/config-huge-smp-5.10.19-smp b/source/k/kernel-configs/config-huge-smp-5.10.20-smp
index 2990de37..1c5bc0f0 100644
--- a/source/k/kernel-configs/config-huge-smp-5.10.19-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.10.20-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.19 Kernel Configuration
+# Linux/x86 5.10.20 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
CONFIG_CC_IS_GCC=y
@@ -240,6 +240,7 @@ CONFIG_BPF_PRELOAD=y
CONFIG_BPF_PRELOAD_UMD=m
CONFIG_USERFAULTFD=y
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
CONFIG_RSEQ=y
# CONFIG_DEBUG_RSEQ is not set
# CONFIG_EMBEDDED is not set
diff --git a/source/k/kernel-source.SlackBuild b/source/k/kernel-source.SlackBuild
index d52e1cb6..c4b90cd7 100755
--- a/source/k/kernel-source.SlackBuild
+++ b/source/k/kernel-source.SlackBuild
@@ -107,7 +107,6 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
fi
echo "Using kernel config: $CWD/kernel-configs/${KERNEL_CONFIG}"
-sleep 1
rm -rf $PKG
mkdir -p $TMP $PKG
diff --git a/source/n/dovecot/dovecot.SlackBuild b/source/n/dovecot/dovecot.SlackBuild
index ada75532..1c5dfaff 100755
--- a/source/n/dovecot/dovecot.SlackBuild
+++ b/source/n/dovecot/dovecot.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=dovecot
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/x/OpenCC/OpenCC.SlackBuild b/source/x/OpenCC/OpenCC.SlackBuild
index ab4f36d6..98272cfa 100755
--- a/source/x/OpenCC/OpenCC.SlackBuild
+++ b/source/x/OpenCC/OpenCC.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=OpenCC
VERSION=${VERSION:-$(echo OpenCC-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev | cut -f 2- -d .)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}