summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-11-16 03:31:45 +0000
committer Eric Hameleers <alien@slackware.com>2019-11-16 08:59:50 +0100
commit5639d3518ef4a35d74c6057cb69b994d3a927686 (patch)
treecc19d8a8d616b143f16fa1a573f08205cf2ab184 /testing
parent07858e75be1040d3eab888c2328a53440c28257d (diff)
downloadcurrent-5639d3518ef4a35d74c6057cb69b994d3a927686.tar.gz
current-5639d3518ef4a35d74c6057cb69b994d3a927686.tar.xz
Sat Nov 16 03:31:45 UTC 201920191116033145
ap/alsa-utils-1.2.1-x86_64-1.txz: Upgraded. l/alsa-lib-1.2.1-x86_64-1.txz: Upgraded. l/alsa-plugins-1.2.1-x86_64-1.txz: Upgraded. l/imagemagick-7.0.9_4-x86_64-1.txz: Upgraded. extra/pure-alsa-system/alsa-lib-1.2.1-x86_64-1_alsa.txz: Upgraded. extra/pure-alsa-system/alsa-plugins-1.2.1-x86_64-1_alsa.txz: Upgraded. testing/packages/kernel-generic-5.4.0_rc7-x86_64-2.txz: Rebuilt. testing/packages/kernel-headers-5.4.0_rc7-x86-2.txz: Rebuilt. testing/packages/kernel-huge-5.4.0_rc7-x86_64-2.txz: Rebuilt. testing/packages/kernel-modules-5.4.0_rc7-x86_64-2.txz: Rebuilt. testing/packages/kernel-source-5.4.0_rc7-noarch-2.txz: Rebuilt. CRYPTO_CRC32C_INTEL m -> y Make modules before cleaning up the source tree. This does some magic in Module.symvers that fixes building the NVIDIA kernel modules.
Diffstat (limited to 'testing')
-rwxr-xr-xtesting/source/k/build-all-kernels.sh2
-rw-r--r--testing/source/k/kernel-configs/config-generic-5.4-rc72
-rw-r--r--testing/source/k/kernel-configs/config-generic-5.4-rc7.x642
-rw-r--r--testing/source/k/kernel-configs/config-generic-smp-5.4-rc7-smp2
-rw-r--r--testing/source/k/kernel-configs/config-huge-5.4-rc72
-rw-r--r--testing/source/k/kernel-configs/config-huge-5.4-rc7.x642
-rw-r--r--testing/source/k/kernel-configs/config-huge-smp-5.4-rc7-smp2
-rwxr-xr-xtesting/source/k/kernel-generic.SlackBuild2
-rwxr-xr-xtesting/source/k/kernel-modules.SlackBuild2
-rwxr-xr-xtesting/source/k/kernel-source.SlackBuild7
10 files changed, 13 insertions, 12 deletions
diff --git a/testing/source/k/build-all-kernels.sh b/testing/source/k/build-all-kernels.sh
index 5d1d5daac..df1cea036 100755
--- a/testing/source/k/build-all-kernels.sh
+++ b/testing/source/k/build-all-kernels.sh
@@ -27,7 +27,7 @@
cd $(dirname $0) ; CWD=$(pwd)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -z "$VERSION" ]; then
# Get the filename of the newest kernel tarball:
KERNEL_SOURCE_FILE="$(/bin/ls -t linux-*.tar.?z | head -n 1 )"
diff --git a/testing/source/k/kernel-configs/config-generic-5.4-rc7 b/testing/source/k/kernel-configs/config-generic-5.4-rc7
index c10530957..b9f251b93 100644
--- a/testing/source/k/kernel-configs/config-generic-5.4-rc7
+++ b/testing/source/k/kernel-configs/config-generic-5.4-rc7
@@ -8313,7 +8313,7 @@ CONFIG_CRYPTO_VMAC=m
# Digest
#
CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32C_INTEL=y
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRC32_PCLMUL=m
CONFIG_CRYPTO_XXHASH=m
diff --git a/testing/source/k/kernel-configs/config-generic-5.4-rc7.x64 b/testing/source/k/kernel-configs/config-generic-5.4-rc7.x64
index 6dd8993ee..553d05569 100644
--- a/testing/source/k/kernel-configs/config-generic-5.4-rc7.x64
+++ b/testing/source/k/kernel-configs/config-generic-5.4-rc7.x64
@@ -8305,7 +8305,7 @@ CONFIG_CRYPTO_VMAC=m
# Digest
#
CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32C_INTEL=y
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRC32_PCLMUL=m
CONFIG_CRYPTO_XXHASH=m
diff --git a/testing/source/k/kernel-configs/config-generic-smp-5.4-rc7-smp b/testing/source/k/kernel-configs/config-generic-smp-5.4-rc7-smp
index b89d12332..640d60c23 100644
--- a/testing/source/k/kernel-configs/config-generic-smp-5.4-rc7-smp
+++ b/testing/source/k/kernel-configs/config-generic-smp-5.4-rc7-smp
@@ -8378,7 +8378,7 @@ CONFIG_CRYPTO_VMAC=m
# Digest
#
CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32C_INTEL=y
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRC32_PCLMUL=m
CONFIG_CRYPTO_XXHASH=m
diff --git a/testing/source/k/kernel-configs/config-huge-5.4-rc7 b/testing/source/k/kernel-configs/config-huge-5.4-rc7
index e64933ee1..a4768e605 100644
--- a/testing/source/k/kernel-configs/config-huge-5.4-rc7
+++ b/testing/source/k/kernel-configs/config-huge-5.4-rc7
@@ -8313,7 +8313,7 @@ CONFIG_CRYPTO_VMAC=m
# Digest
#
CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32C_INTEL=y
CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRC32_PCLMUL=m
CONFIG_CRYPTO_XXHASH=m
diff --git a/testing/source/k/kernel-configs/config-huge-5.4-rc7.x64 b/testing/source/k/kernel-configs/config-huge-5.4-rc7.x64
index 130ff4284..97a4cd439 100644
--- a/testing/source/k/kernel-configs/config-huge-5.4-rc7.x64
+++ b/testing/source/k/kernel-configs/config-huge-5.4-rc7.x64
@@ -8305,7 +8305,7 @@ CONFIG_CRYPTO_VMAC=m
# Digest
#
CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32C_INTEL=y
CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRC32_PCLMUL=m
CONFIG_CRYPTO_XXHASH=m
diff --git a/testing/source/k/kernel-configs/config-huge-smp-5.4-rc7-smp b/testing/source/k/kernel-configs/config-huge-smp-5.4-rc7-smp
index e18d3a4ec..1461d49e9 100644
--- a/testing/source/k/kernel-configs/config-huge-smp-5.4-rc7-smp
+++ b/testing/source/k/kernel-configs/config-huge-smp-5.4-rc7-smp
@@ -8378,7 +8378,7 @@ CONFIG_CRYPTO_VMAC=m
# Digest
#
CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32C_INTEL=y
CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRC32_PCLMUL=m
CONFIG_CRYPTO_XXHASH=m
diff --git a/testing/source/k/kernel-generic.SlackBuild b/testing/source/k/kernel-generic.SlackBuild
index 76ae14524..31d2301d0 100755
--- a/testing/source/k/kernel-generic.SlackBuild
+++ b/testing/source/k/kernel-generic.SlackBuild
@@ -102,7 +102,7 @@ if [ ! -z "${KERNEL_CLEAN}" ]; then
# Don't package the kernel in the sources:
find . -name "*Image" -exec rm "{}" \+
# No need for these:
- rm -f .config.old .version modules.*
+ rm -f .config.old .version
find . -name "*.cmd" -exec rm -f "{}" \+
rm .*.d
)
diff --git a/testing/source/k/kernel-modules.SlackBuild b/testing/source/k/kernel-modules.SlackBuild
index 891dc5131..94c2877fc 100755
--- a/testing/source/k/kernel-modules.SlackBuild
+++ b/testing/source/k/kernel-modules.SlackBuild
@@ -88,7 +88,7 @@ if [ ! -z "${KERNEL_CLEAN}" ]; then
# Don't package the kernel in the sources:
find . -name "*Image" -exec rm "{}" \+
# No need for these:
- rm -f .config.old .version modules.*
+ rm -f .config.old .version
find . -name "*.cmd" -exec rm -f "{}" \+
rm .*.d
)
diff --git a/testing/source/k/kernel-source.SlackBuild b/testing/source/k/kernel-source.SlackBuild
index 26b5ed924..a715aff46 100755
--- a/testing/source/k/kernel-source.SlackBuild
+++ b/testing/source/k/kernel-source.SlackBuild
@@ -146,8 +146,9 @@ echo "Untarring $CWD/linux-${VERSION}.tar.?z in $PKG/usr/src..."
echo "Saving new .config as: $CWD/kernel-configs/config-generic${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX}"
cp -a .config $CWD/kernel-configs/config-generic${LOCALVERSION}-${VERSION}${LOCALVERSION}${CONFIG_SUFFIX}
fi
- echo "Building kernel..."
- make ${NUMJOBS} bzImage || make bzImage || exit 1
+ echo "Building kernel and modules (needed before clean for building NVIDIA to work)..."
+ make ${NUMJOBS} || exit 1
+ make ${NUMJOBS} modules || exit 1
echo "Cleaning up..."
make clean
# Make sure header files aren't missing...
@@ -155,7 +156,7 @@ echo "Untarring $CWD/linux-${VERSION}.tar.?z in $PKG/usr/src..."
# Don't package the kernel in the sources:
find . -name "*Image" -exec rm "{}" \+
# No need for these:
- rm -f .config.old .version modules.*
+ rm -f .config.old .version
find . -name "*.cmd" -exec rm -f "{}" \+
rm .*.d
# Still some dotfiles laying around... probably fine though