From 5ab7591ab4906d0dba118ab7878fee9972384e16 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 29 Jun 2023 19:32:12 +0000 Subject: Thu Jun 29 19:32:12 UTC 2023 a/kernel-firmware-20230625_ee91452-noarch-2.txz: Rebuilt. When building the package, install from the download directory rather than moving the download directory to the destination directory first. Evidently "cp -d foo foo" and "cat foo > foo" don't exactly behave the same. ;-) Support a COMPRESSION= variable which may be set to xz or zstd to compress the kernel modules. For now, we'll stick with uncompressed modules. isolinux/initrd.img: Rebuilt. Replaced corrupted firmware. usb-and-pxe-installers/usbboot.img: Rebuilt. Replaced corrupted firmware. --- ChangeLog.rss | 24 ++++++++- ChangeLog.txt | 12 +++++ FILELIST.TXT | 60 +++++++++++----------- .../a/kernel-firmware/kernel-firmware.SlackBuild | 26 +++++++--- 4 files changed, 82 insertions(+), 40 deletions(-) diff --git a/ChangeLog.rss b/ChangeLog.rss index 5d94f4068..6d1821aec 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,29 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Wed, 28 Jun 2023 20:22:39 GMT - Wed, 28 Jun 2023 21:37:47 GMT + Thu, 29 Jun 2023 19:32:12 GMT + Thu, 29 Jun 2023 20:33:28 GMT maintain_current_git.sh v 1.17 + + Thu, 29 Jun 2023 19:32:12 GMT + Thu, 29 Jun 2023 19:32:12 GMT + https://git.slackware.nl/current/tag/?h=20230629193212 + 20230629193212 + + +a/kernel-firmware-20230625_ee91452-noarch-2.txz: Rebuilt. + When building the package, install from the download directory rather than + moving the download directory to the destination directory first. Evidently + "cp -d foo foo" and "cat foo > foo" don't exactly behave the same. ;-) + Support a COMPRESSION= variable which may be set to xz or zstd to compress + the kernel modules. For now, we'll stick with uncompressed modules. +isolinux/initrd.img: Rebuilt. + Replaced corrupted firmware. +usb-and-pxe-installers/usbboot.img: Rebuilt. + Replaced corrupted firmware. + ]]> + + Wed, 28 Jun 2023 20:22:39 GMT Wed, 28 Jun 2023 20:22:39 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 161c1eebd..55a25fe97 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,15 @@ +Thu Jun 29 19:32:12 UTC 2023 +a/kernel-firmware-20230625_ee91452-noarch-2.txz: Rebuilt. + When building the package, install from the download directory rather than + moving the download directory to the destination directory first. Evidently + "cp -d foo foo" and "cat foo > foo" don't exactly behave the same. ;-) + Support a COMPRESSION= variable which may be set to xz or zstd to compress + the kernel modules. For now, we'll stick with uncompressed modules. +isolinux/initrd.img: Rebuilt. + Replaced corrupted firmware. +usb-and-pxe-installers/usbboot.img: Rebuilt. + Replaced corrupted firmware. ++--------------------------+ Wed Jun 28 20:22:39 UTC 2023 a/kernel-firmware-20230625_ee91452-noarch-1.txz: Upgraded. a/kernel-generic-6.1.36-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 831f06a02..bad0d0629 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,33 +1,33 @@ -Wed Jun 28 20:26:49 UTC 2023 +Thu Jun 29 19:37:14 UTC 2023 Here is the file list for this directory. If you are using a mirror site and find missing or extra files in the disk subdirectories, please have the archive administrator refresh the mirror. -drwxr-xr-x 12 root root 4096 2023-06-28 20:22 . +drwxr-xr-x 12 root root 4096 2023-06-29 19:32 . -rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0 -rw-r--r-- 1 root root 16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1113459 2023-06-26 19:49 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-06-26 19:49 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1113451 2023-06-28 20:27 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-06-28 20:27 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT --rw-r--r-- 1 root root 678761 2023-06-28 20:22 ./ChangeLog.txt +-rw-r--r-- 1 root root 679392 2023-06-29 19:32 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI -drwxr-xr-x 2 root root 4096 2023-06-28 20:22 ./EFI/BOOT +drwxr-xr-x 2 root root 4096 2023-06-29 19:31 ./EFI/BOOT -rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi -rw-r--r-- 1 root root 78 2013-09-23 20:35 ./EFI/BOOT/grub-embedded.cfg -rw-r--r-- 1 root root 893 2018-04-17 21:17 ./EFI/BOOT/grub.cfg -rw-r--r-- 2 root root 12088448 2023-06-28 19:41 ./EFI/BOOT/huge.s --rw-r--r-- 2 root root 43440832 2023-06-28 20:22 ./EFI/BOOT/initrd.img +-rw-r--r-- 2 root root 45917412 2023-06-29 19:31 ./EFI/BOOT/initrd.img -rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1452401 2023-06-26 19:49 ./FILELIST.TXT +-rw-r--r-- 1 root root 1452393 2023-06-28 20:26 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 873723 2023-06-28 20:26 ./PACKAGES.TXT +-rw-r--r-- 1 root root 873728 2023-06-29 19:36 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT -rw-r--r-- 1 root root 3629 2023-06-28 20:12 ./README.initrd -rw-r--r-- 1 root root 34162 2022-01-30 20:35 ./README_CRYPT.TXT @@ -633,12 +633,12 @@ drwxr-xr-x 2 root root 4096 2023-05-28 18:27 ./extra/xv -rw-r--r-- 1 root root 233 2023-05-28 18:16 ./extra/xv/xv-4.1.1-x86_64-1.txt -rw-r--r-- 1 root root 1098144 2023-05-28 18:16 ./extra/xv/xv-4.1.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-05-28 18:16 ./extra/xv/xv-4.1.1-x86_64-1.txz.asc -drwxr-xr-x 3 root root 4096 2023-06-28 20:22 ./isolinux +drwxr-xr-x 3 root root 4096 2023-06-29 19:31 ./isolinux -rw-r--r-- 1 root root 6185 2022-02-03 06:53 ./isolinux/README.TXT -rw-r--r-- 1 root root 788 2007-03-17 19:50 ./isolinux/README_SPLIT.TXT -rw-r--r-- 1 root root 1474560 2021-06-15 19:16 ./isolinux/efiboot.img -rw-r--r-- 1 root root 574 2013-10-24 00:19 ./isolinux/f2.txt --rw-r--r-- 2 root root 43440832 2023-06-28 20:22 ./isolinux/initrd.img +-rw-r--r-- 2 root root 45917412 2023-06-29 19:31 ./isolinux/initrd.img -rw-r--r-- 1 root root 50 2003-01-18 00:02 ./isolinux/iso.sort -rw-r--r-- 1 root root 24576 2016-05-27 20:36 ./isolinux/isolinux.bin -rw-r--r-- 1 root root 578 2013-03-27 03:29 ./isolinux/isolinux.cfg @@ -677,13 +677,13 @@ drwxr-xr-x 2 root root 4096 2022-02-03 07:02 ./patches -rw-r--r-- 1 root root 575 2022-02-03 07:02 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2022-02-03 07:02 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2022-02-03 07:02 ./patches/PACKAGES.TXT -drwxr-xr-x 17 root root 4096 2023-06-28 20:26 ./slackware64 --rw-r--r-- 1 root root 341003 2023-06-28 20:26 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-06-28 20:26 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 422744 2023-06-28 20:25 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4298878 2023-06-28 20:25 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2023-06-29 19:36 ./slackware64 +-rw-r--r-- 1 root root 341003 2023-06-29 19:36 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-06-29 19:36 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 422744 2023-06-29 19:36 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4304363 2023-06-29 19:36 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT -drwxr-xr-x 2 root root 32768 2023-06-28 20:25 ./slackware64/a +drwxr-xr-x 2 root root 32768 2023-06-29 19:35 ./slackware64/a -rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt -rw-r--r-- 1 root root 10720 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz -rw-r--r-- 1 root root 163 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz.asc @@ -848,9 +848,9 @@ drwxr-xr-x 2 root root 32768 2023-06-28 20:25 ./slackware64/a -rw-r--r-- 1 root root 461 2021-02-13 11:08 ./slackware64/a/kbd-1.15.3-x86_64-6.txt -rw-r--r-- 1 root root 1137072 2021-02-13 11:08 ./slackware64/a/kbd-1.15.3-x86_64-6.txz -rw-r--r-- 1 root root 163 2021-02-13 11:08 ./slackware64/a/kbd-1.15.3-x86_64-6.txz.asc --rw-r--r-- 1 root root 422 2023-06-28 18:47 ./slackware64/a/kernel-firmware-20230625_ee91452-noarch-1.txt --rw-r--r-- 1 root root 146144 2023-06-28 18:47 ./slackware64/a/kernel-firmware-20230625_ee91452-noarch-1.txz --rw-r--r-- 1 root root 163 2023-06-28 18:47 ./slackware64/a/kernel-firmware-20230625_ee91452-noarch-1.txz.asc +-rw-r--r-- 1 root root 422 2023-06-29 19:12 ./slackware64/a/kernel-firmware-20230625_ee91452-noarch-2.txt +-rw-r--r-- 1 root root 256649728 2023-06-29 19:12 ./slackware64/a/kernel-firmware-20230625_ee91452-noarch-2.txz +-rw-r--r-- 1 root root 163 2023-06-29 19:12 ./slackware64/a/kernel-firmware-20230625_ee91452-noarch-2.txz.asc -rw-r--r-- 1 root root 624 2023-06-28 19:44 ./slackware64/a/kernel-generic-6.1.36-x86_64-1.txt -rw-r--r-- 1 root root 8778804 2023-06-28 19:44 ./slackware64/a/kernel-generic-6.1.36-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-06-28 19:44 ./slackware64/a/kernel-generic-6.1.36-x86_64-1.txz.asc @@ -5591,13 +5591,13 @@ drwxr-xr-x 2 root root 4096 2023-03-08 20:34 ./slackware64/y -rw-r--r-- 1 root root 1491108 2023-02-19 18:31 ./slackware64/y/nethack-3.6.7-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-02-19 18:31 ./slackware64/y/nethack-3.6.7-x86_64-1.txz.asc -rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile -drwxr-xr-x 18 root root 4096 2023-06-28 20:26 ./source --rw-r--r-- 1 root root 599866 2023-06-28 20:26 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-06-28 20:26 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 834106 2023-06-28 20:26 ./source/FILE_LIST --rw-r--r-- 1 root root 24608100 2023-06-28 20:26 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2023-06-29 19:37 ./source +-rw-r--r-- 1 root root 599866 2023-06-29 19:37 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-06-29 19:37 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 834106 2023-06-29 19:37 ./source/FILE_LIST +-rw-r--r-- 1 root root 24611516 2023-06-29 19:37 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT -drwxr-xr-x 124 root root 4096 2023-06-28 20:06 ./source/a +drwxr-xr-x 124 root root 4096 2023-06-29 19:08 ./source/a -rw-r--r-- 1 root root 234 2022-10-16 18:39 ./source/a/FTBFSlog drwxr-xr-x 2 root root 4096 2022-02-15 18:15 ./source/a/aaa_base -rw-r--r-- 1 root root 11041 2022-02-15 04:49 ./source/a/aaa_base/_aaa_base.tar.gz @@ -6110,8 +6110,8 @@ drwxr-xr-x 2 root root 4096 2012-06-28 17:34 ./source/a/kbd/sources -rw-r--r-- 1 root root 2338 2007-11-14 11:41 ./source/a/kbd/sources/ro_maps.tar.bz2 -rw-r--r-- 1 root root 3543 2002-05-24 21:22 ./source/a/kbd/sources/speakup-jfw.tar.gz -rw-r--r-- 1 root root 2246 2001-10-05 13:14 ./source/a/kbd/sources/speakupmap.map.gz -drwxr-xr-x 2 root root 4096 2021-01-20 18:21 ./source/a/kernel-firmware --rwxr-xr-x 1 root root 3869 2021-01-20 18:21 ./source/a/kernel-firmware/kernel-firmware.SlackBuild +drwxr-xr-x 2 root root 4096 2023-06-29 19:08 ./source/a/kernel-firmware +-rwxr-xr-x 1 root root 4213 2023-06-29 19:08 ./source/a/kernel-firmware/kernel-firmware.SlackBuild -rw-r--r-- 1 root root 885 2018-02-27 06:13 ./source/a/kernel-firmware/slack-desc drwxr-xr-x 2 root root 4096 2023-03-07 21:39 ./source/a/kmod -rw-r--r-- 1 root root 565418 2022-06-30 15:24 ./source/a/kmod/kmod-30.tar.lz @@ -15396,9 +15396,9 @@ drwxr-xr-x 2 root root 4096 2023-06-12 19:44 ./testing/source/rust -rw-r--r-- 1 root root 1670 2023-06-12 18:51 ./testing/source/rust/rust.url -rw-r--r-- 1 root root 145507120 2023-06-01 18:51 ./testing/source/rust/rustc-1.70.0-src.tar.lz -rw-r--r-- 1 root root 910 2018-02-27 06:49 ./testing/source/rust/slack-desc -drwxr-xr-x 2 root root 4096 2023-06-28 20:22 ./usb-and-pxe-installers +drwxr-xr-x 2 root root 4096 2023-06-29 19:31 ./usb-and-pxe-installers -rw-r--r-- 1 root root 31203 2011-03-21 21:21 ./usb-and-pxe-installers/README_PXE.TXT -rw-r--r-- 1 root root 9197 2013-09-25 04:33 ./usb-and-pxe-installers/README_USB.TXT -rw-r--r-- 1 root root 574 2013-03-27 04:59 ./usb-and-pxe-installers/pxelinux.cfg_default --rw-r--r-- 1 root root 56591360 2023-06-28 20:22 ./usb-and-pxe-installers/usbboot.img +-rw-r--r-- 1 root root 59069440 2023-06-29 19:31 ./usb-and-pxe-installers/usbboot.img -rw-r--r-- 1 root root 16314 2022-03-24 20:54 ./usb-and-pxe-installers/usbimg2disk.sh diff --git a/source/a/kernel-firmware/kernel-firmware.SlackBuild b/source/a/kernel-firmware/kernel-firmware.SlackBuild index 3068b4601..11d3c58d9 100755 --- a/source/a/kernel-firmware/kernel-firmware.SlackBuild +++ b/source/a/kernel-firmware/kernel-firmware.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2011, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2011, 2016, 2018, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,11 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=kernel-firmware ARCH=noarch -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} +# Compress the firmware blobs? +# Default is "none" for no compression. +# Other types known to be currently supported are "xz" and "zstd". +COMPRESSION=${COMPRESSION:-none} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information @@ -56,13 +60,19 @@ DATE="$(lynx -dump -width=256 https://git.kernel.org/pub/scm/linux/kernel/git/fi HEADISAT="$(lynx -dump -width=256 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=HEAD | grep " commit " | head -n 1 | cut -f 2 -d ] | cut -b 1-7)" find . -name ".git*" -exec rm -rf "{}" \+ chown -R root:root . -mkdir -p lib -mv linux-firmware lib/firmware -# Make sure that symlinks are created by running "make install": -( cd lib/firmware - echo "Running make DESTDIR=$PKG install..." - make DESTDIR=$PKG install 2> /dev/null +mkdir -p lib/firmware + +# Install the firmware from the download directory using "make $INSTALLTARGET": +case $COMPRESSION in + xz) INSTALLTARGET="install-xz" ;; + zstd) INSTALLTARGET="install-zst" ;; + *) INSTALLTARGET="install" ;; +esac +( cd linux-firmware + echo "Running make DESTDIR=$PKG ${INSTALLTARGET}..." + make DESTDIR=$PKG $INSTALLTARGET 2> /dev/null ) +rm -rf linux-firmware # Remove sources for carl9170fw: ( cd $PKG/lib/firmware -- cgit v1.2.3-79-gdb01