diff options
Diffstat (limited to 'testing')
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 |