diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-11-06 21:14:40 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-11-07 08:59:50 +0100 |
commit | 28de491cabcc2ab8aeac49ec62bbf8f89422cd41 (patch) | |
tree | 57817bacb515f48298ac1060cfd6e3e70920470a /source | |
parent | ff1ff4e8b953a974555ba646d342767187e967f2 (diff) | |
download | current-28de491cabcc2ab8aeac49ec62bbf8f89422cd41.tar.gz |
Wed Nov 6 21:14:40 UTC 201920191106211440
a/cpio-2.13-x86_64-1.txz: Upgraded.
a/kernel-generic-4.19.82-x86_64-1.txz: Upgraded.
a/kernel-huge-4.19.82-x86_64-1.txz: Upgraded.
a/kernel-modules-4.19.82-x86_64-1.txz: Upgraded.
ap/hplip-3.19.11-x86_64-1.txz: Upgraded.
d/kernel-headers-4.19.82-x86-1.txz: Upgraded.
d/mercurial-5.2-x86_64-1.txz: Upgraded.
k/kernel-source-4.19.82-noarch-1.txz: Upgraded.
l/python-six-1.13.0-x86_64-1.txz: Upgraded.
l/shared-mime-info-1.15-x86_64-1.txz: Upgraded.
l/zstd-1.4.4-x86_64-1.txz: Upgraded.
n/ModemManager-1.12.0-x86_64-1.txz: Upgraded.
n/NetworkManager-1.20.6-x86_64-1.txz: Upgraded.
n/curl-7.67.0-x86_64-1.txz: Upgraded.
n/libmbim-1.20.2-x86_64-1.txz: Upgraded.
x/mesa-19.2.3-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
-rwxr-xr-x | source/a/cpio/cpio.SlackBuild | 2 | ||||
-rwxr-xr-x | source/k/build-all-kernels.sh | 21 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-4.19.82 (renamed from source/k/kernel-configs/config-generic-4.19.81) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-4.19.82.x64 (renamed from source/k/kernel-configs/config-generic-4.19.81.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-smp-4.19.82-smp (renamed from source/k/kernel-configs/config-generic-smp-4.19.81-smp) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-4.19.82 (renamed from source/k/kernel-configs/config-huge-4.19.81) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-4.19.82.x64 (renamed from source/k/kernel-configs/config-huge-4.19.81.x64) | 2 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-smp-4.19.82-smp (renamed from source/k/kernel-configs/config-huge-smp-4.19.81-smp) | 2 | ||||
-rwxr-xr-x | source/k/kernel-generic.SlackBuild | 8 | ||||
-rwxr-xr-x | source/k/kernel-modules.SlackBuild | 10 | ||||
-rwxr-xr-x | source/k/kernel-source.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/python-six/python-six.SlackBuild | 2 | ||||
-rw-r--r-- | source/n/curl/cacert.pem | 48 |
13 files changed, 44 insertions, 61 deletions
diff --git a/source/a/cpio/cpio.SlackBuild b/source/a/cpio/cpio.SlackBuild index 6ea2828a..ef1145a7 100755 --- a/source/a/cpio/cpio.SlackBuild +++ b/source/a/cpio/cpio.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cpio VERSION=$(ls $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/k/build-all-kernels.sh b/source/k/build-all-kernels.sh index b1ea6890..5d1d5daa 100755 --- a/source/k/build-all-kernels.sh +++ b/source/k/build-all-kernels.sh @@ -29,14 +29,23 @@ cd $(dirname $0) ; CWD=$(pwd) BUILD=${BUILD:-1} if [ -z "$VERSION" ]; then - # Get $VERSION from the newest kernel tarball: - VERSION=${VERSION:-$(/bin/ls -t linux-*.tar.?z | head -n 1 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} + # Get the filename of the newest kernel tarball: + KERNEL_SOURCE_FILE="$(/bin/ls -t linux-*.tar.?z | head -n 1 )" + if echo $KERNEL_SOURCE_FILE | grep -q rc ; then # need to get rc versions a bit differently + VERSION=$(/bin/ls -t linux-*.tar.?z | head -n 1 | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev) + else # normal release version + VERSION=$(/bin/ls -t linux-*.tar.?z | head -n 1 | rev | cut -f 3- -d . | cut -f 1 -d - | rev) + fi fi TMP=${TMP:-/tmp} # By default, install the packages as we build them and update the initrd. INSTALL_PACKAGES=${INSTALL_PACKAGES:-YES} +# Clean kernels before building them. Not doing so quit working some time +# after 4.19.x. +export KERNEL_CLEAN=YES + # A list of recipes for build may be passed in the $RECIPES variable, otherwise # we have defaults based on uname -m: if [ -z "$RECIPES" ]; then @@ -131,12 +140,12 @@ for recipe in $RECIPES ; do # Update initrd: if [ "${INSTALL_PACKAGES}" = "YES" ]; then - # We should already have this... - #LOCALVERSION="$(cat $TMP/package-kernel-source/usr/src/linux/.config 2> /dev/null | grep CONFIG_LOCALVERSION= | cut -f 2 -d = | tr -d \")" + INITRD_VERSION="$(grep "Kernel Configuration" $TMP/package-kernel-source/usr/src/linux/.config | cut -f 3 -d ' ')" + INITRD_LOCALVERSION="$(cat $TMP/package-kernel-source/usr/src/linux/.config 2> /dev/null | grep CONFIG_LOCALVERSION= | cut -f 2 -d = | tr -d \")" if [ -r /etc/mkinitrd.conf ]; then - mkinitrd -F /etc/mkinitrd.conf -k ${VERSION}${LOCALVERSION} + mkinitrd -F /etc/mkinitrd.conf -k ${INITRD_VERSION}${INITRD_LOCALVERSION} else # try this? - sh /usr/share/mkinitrd/mkinitrd_command_generator.sh -k ${VERSION}${LOCALVERSION} | sed "s/-c -k/-k/g" | bash + sh /usr/share/mkinitrd/mkinitrd_command_generator.sh -k ${INITRD_VERSION}${INITRD_LOCALVERSION} | sed "s/-c -k/-k/g" | bash fi fi diff --git a/source/k/kernel-configs/config-generic-4.19.81 b/source/k/kernel-configs/config-generic-4.19.82 index d972b372..a5d987c4 100644 --- a/source/k/kernel-configs/config-generic-4.19.81 +++ b/source/k/kernel-configs/config-generic-4.19.82 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.81 Kernel Configuration +# Linux/x86 4.19.82 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-4.19.81.x64 b/source/k/kernel-configs/config-generic-4.19.82.x64 index ce88bfe4..1b839674 100644 --- a/source/k/kernel-configs/config-generic-4.19.81.x64 +++ b/source/k/kernel-configs/config-generic-4.19.82.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.81 Kernel Configuration +# Linux/x86 4.19.82 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-4.19.81-smp b/source/k/kernel-configs/config-generic-smp-4.19.82-smp index 3c80869b..9b598701 100644 --- a/source/k/kernel-configs/config-generic-smp-4.19.81-smp +++ b/source/k/kernel-configs/config-generic-smp-4.19.82-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.81 Kernel Configuration +# Linux/x86 4.19.82 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.81 b/source/k/kernel-configs/config-huge-4.19.82 index fc31401d..7f06c286 100644 --- a/source/k/kernel-configs/config-huge-4.19.81 +++ b/source/k/kernel-configs/config-huge-4.19.82 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.81 Kernel Configuration +# Linux/x86 4.19.82 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.81.x64 b/source/k/kernel-configs/config-huge-4.19.82.x64 index fba40249..258b1a79 100644 --- a/source/k/kernel-configs/config-huge-4.19.81.x64 +++ b/source/k/kernel-configs/config-huge-4.19.82.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.81 Kernel Configuration +# Linux/x86 4.19.82 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-4.19.81-smp b/source/k/kernel-configs/config-huge-smp-4.19.82-smp index 8d204f4b..b2cadf8b 100644 --- a/source/k/kernel-configs/config-huge-smp-4.19.81-smp +++ b/source/k/kernel-configs/config-huge-smp-4.19.82-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.81 Kernel Configuration +# Linux/x86 4.19.82 Kernel Configuration # # diff --git a/source/k/kernel-generic.SlackBuild b/source/k/kernel-generic.SlackBuild index 4b31162a..76ae1452 100755 --- a/source/k/kernel-generic.SlackBuild +++ b/source/k/kernel-generic.SlackBuild @@ -97,6 +97,14 @@ if [ ! -z "${KERNEL_CLEAN}" ]; then ( cd ${KERNEL_SOURCE} echo "Cleaning kernel source (make clean)..." make clean + # Make sure header files aren't missing... + make prepare + # Don't package the kernel in the sources: + find . -name "*Image" -exec rm "{}" \+ + # No need for these: + rm -f .config.old .version modules.* + find . -name "*.cmd" -exec rm -f "{}" \+ + rm .*.d ) fi diff --git a/source/k/kernel-modules.SlackBuild b/source/k/kernel-modules.SlackBuild index 8bf42a5e..891dc513 100755 --- a/source/k/kernel-modules.SlackBuild +++ b/source/k/kernel-modules.SlackBuild @@ -83,6 +83,14 @@ if [ ! -z "${KERNEL_CLEAN}" ]; then ( cd ${KERNEL_SOURCE} echo "Cleaning kernel source (make clean)..." make clean + # Make sure header files aren't missing... + make prepare + # Don't package the kernel in the sources: + find . -name "*Image" -exec rm "{}" \+ + # No need for these: + rm -f .config.old .version modules.* + find . -name "*.cmd" -exec rm -f "{}" \+ + rm .*.d ) fi @@ -95,6 +103,8 @@ fi ( cd ${KERNEL_SOURCE} echo "Running make oldconfig..." make oldconfig + echo "Running a preliminary make (needed to create modules.builtin.modinfo)..." + make $NUMJOBS || exit 1 echo "Building kernel modules..." make $NUMJOBS modules || exit 1 echo "Installing kernel modules to $PKG..." diff --git a/source/k/kernel-source.SlackBuild b/source/k/kernel-source.SlackBuild index 866e94b7..26b5ed92 100755 --- a/source/k/kernel-source.SlackBuild +++ b/source/k/kernel-source.SlackBuild @@ -155,7 +155,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 + rm -f .config.old .version modules.* find . -name "*.cmd" -exec rm -f "{}" \+ rm .*.d # Still some dotfiles laying around... probably fine though diff --git a/source/l/python-six/python-six.SlackBuild b/source/l/python-six/python-six.SlackBuild index 4cb4bf42..fae7e8b7 100755 --- a/source/l/python-six/python-six.SlackBuild +++ b/source/l/python-six/python-six.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-six VERSION=${VERSION:-$(echo six-*.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/n/curl/cacert.pem b/source/n/curl/cacert.pem index 65be2181..edc5090c 100644 --- a/source/n/curl/cacert.pem +++ b/source/n/curl/cacert.pem @@ -1,7 +1,7 @@ ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Wed Aug 28 03:12:10 2019 GMT +## Certificate data from Mozilla as of: Wed Oct 16 03:12:09 2019 GMT ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates @@ -14,7 +14,7 @@ ## Just configure this file as the SSLCACertificateFile. ## ## Conversion done with mk-ca-bundle.pl version 1.27. -## SHA256: fffa309937c3be940649293f749b8207fabc6eb224e50e4bb3f2c5e44e0d6a6b +## SHA256: c979c6f35714a0fedb17d9e5ba37adecbbc91a8faf4186b4e23d6f9ca44fd6cb ## @@ -592,28 +592,6 @@ mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K -----END CERTIFICATE----- -Certplus Class 2 Primary CA -=========================== ------BEGIN CERTIFICATE----- -MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE -BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN -OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy -dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR -5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ -Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO -YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e -e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME -CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ -YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t -L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD -P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R -TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+ -7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW -//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7 -l7+ijrRU ------END CERTIFICATE----- - DST Root CA X3 ============== -----BEGIN CERTIFICATE----- @@ -921,28 +899,6 @@ PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg== -----END CERTIFICATE----- -Deutsche Telekom Root CA 2 -========================== ------BEGIN CERTIFICATE----- -MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT -RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG -A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5 -MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G -A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS -b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5 -bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI -KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY -AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK -Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV -jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV -HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr -E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy -zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8 -rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G -dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU -Cm26OWMohpLzGITY+9HPBVZkVw== ------END CERTIFICATE----- - Cybertrust Global Root ====================== -----BEGIN CERTIFICATE----- |