From 23201e8a5ad81fea4274306ba61d98ddd58525e9 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sat, 5 Oct 2024 21:24:49 +0000 Subject: [PATCH] Sat Oct 5 21:24:49 UTC 2024 isolinux/initrd.img: Rebuilt. usb-and-pxe-installers/usbboot.img: Rebuilt. --- ChangeLog.rss | 16 ++++++- ChangeLog.txt | 4 ++ FILELIST.TXT | 44 +++++++++---------- source/a/mkinitrd/busybox-dot-config | 2 +- source/a/mkinitrd/mkinitrd.SlackBuild | 9 ++-- source/installer/ChangeLog.txt | 4 ++ .../sources/busybox/busybox-dot-config | 2 +- 7 files changed, 51 insertions(+), 30 deletions(-) diff --git a/ChangeLog.rss b/ChangeLog.rss index 14b14096f..8b61f198c 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,21 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Sat, 5 Oct 2024 19:17:05 GMT - Sat, 5 Oct 2024 20:02:37 GMT + Sat, 5 Oct 2024 21:24:49 GMT + Sat, 5 Oct 2024 22:04:35 GMT maintain_current_git.sh v 1.17 + + Sat, 5 Oct 2024 21:24:49 GMT + Sat, 5 Oct 2024 21:24:49 GMT + https://git.slackware.nl/current/tag/?h=20241005212449 + 20241005212449 + + +isolinux/initrd.img: Rebuilt. +usb-and-pxe-installers/usbboot.img: Rebuilt. + ]]> + + Sat, 5 Oct 2024 19:17:05 GMT Sat, 5 Oct 2024 19:17:05 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index d6a062659..0ded9d675 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,7 @@ +Sat Oct 5 21:24:49 UTC 2024 +isolinux/initrd.img: Rebuilt. +usb-and-pxe-installers/usbboot.img: Rebuilt. ++--------------------------+ Sat Oct 5 19:17:05 UTC 2024 ap/tmux-3.5a-x86_64-1.txz: Upgraded. d/tree-sitter-0.24.1-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 99e193cc4..24d5a2ada 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,31 +1,31 @@ -Sat Oct 5 19:20:41 UTC 2024 +Sat Oct 5 21:26:31 UTC 2024 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 2024-10-05 19:17 . +drwxr-xr-x 12 root root 4096 2024-10-05 21:24 . -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 1162500 2024-10-04 23:42 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-10-04 23:42 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1162431 2024-10-05 19:21 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-10-05 19:21 ./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 1195337 2024-10-05 19:17 ./ChangeLog.txt +-rw-r--r-- 1 root root 1195472 2024-10-05 21:24 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI -drwxr-xr-x 2 root root 4096 2024-10-05 19:16 ./EFI/BOOT +drwxr-xr-x 2 root root 4096 2024-10-05 21:24 ./EFI/BOOT -rw-r--r-- 1 root root 1200128 2024-09-12 20:40 ./EFI/BOOT/bootx64.efi -rw-r--r-- 2 root root 13496832 2024-10-04 19:29 ./EFI/BOOT/generic.s -rw-r--r-- 1 root root 78 2013-09-23 20:35 ./EFI/BOOT/grub-embedded.cfg -rw-r--r-- 1 root root 917 2024-09-12 20:08 ./EFI/BOOT/grub.cfg --rw-r--r-- 2 root root 97624204 2024-10-05 19:16 ./EFI/BOOT/initrd.img +-rw-r--r-- 2 root root 94188836 2024-10-05 21:23 ./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 1521381 2024-10-04 23:41 ./FILELIST.TXT +-rw-r--r-- 1 root root 1521295 2024-10-05 19:20 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY -rw-r--r-- 1 root root 916006 2024-10-05 19:20 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT @@ -618,12 +618,12 @@ drwxr-xr-x 2 root root 4096 2024-09-02 19:58 ./extra/xv -rw-r--r-- 1 root root 233 2024-09-02 18:18 ./extra/xv/xv-6.0.1-x86_64-1.txt -rw-r--r-- 1 root root 1118652 2024-09-02 18:18 ./extra/xv/xv-6.0.1-x86_64-1.txz -rw-r--r-- 1 root root 195 2024-09-02 18:18 ./extra/xv/xv-6.0.1-x86_64-1.txz.asc -drwxr-xr-x 3 root root 4096 2024-10-05 19:16 ./isolinux +drwxr-xr-x 3 root root 4096 2024-10-05 21:23 ./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 2024-09-12 20:40 ./isolinux/efiboot.img -rw-r--r-- 1 root root 583 2024-09-12 20:07 ./isolinux/f2.txt --rw-r--r-- 2 root root 97624204 2024-10-05 19:16 ./isolinux/initrd.img +-rw-r--r-- 2 root root 94188836 2024-10-05 21:23 ./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 602 2024-09-12 20:05 ./isolinux/isolinux.cfg @@ -5807,13 +5807,13 @@ drwxr-xr-x 2 root root 4096 2024-05-05 18:37 ./slackware64/y -rw-r--r-- 1 root root 1488844 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz -rw-r--r-- 1 root root 195 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz.asc -rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile -drwxr-xr-x 18 root root 4096 2024-10-05 19:20 ./source --rw-r--r-- 1 root root 626409 2024-10-05 19:20 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-10-05 19:20 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 872948 2024-10-05 19:20 ./source/FILE_LIST --rw-r--r-- 1 root root 30555162 2024-10-05 19:20 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2024-10-05 21:26 ./source +-rw-r--r-- 1 root root 626409 2024-10-05 21:26 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-10-05 21:26 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 872948 2024-10-05 21:26 ./source/FILE_LIST +-rw-r--r-- 1 root root 30567426 2024-10-05 21:26 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT -drwxr-xr-x 125 root root 4096 2024-10-04 19:01 ./source/a +drwxr-xr-x 125 root root 4096 2024-10-05 21:08 ./source/a -rw-r--r-- 1 root root 339 2023-09-28 19:06 ./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 @@ -6521,7 +6521,7 @@ drwxr-xr-x 2 root root 4096 2024-10-04 18:56 ./source/a/mkinitrd -rw-r--r-- 1 root root 2700 2023-03-31 17:12 ./source/a/mkinitrd/_initrd-tree.tar.gz -rw-r--r-- 1 root root 2565764 2024-09-26 21:31 ./source/a/mkinitrd/busybox-1.37.0.tar.bz2 -rw-r--r-- 1 root root 121 2024-09-26 21:31 ./source/a/mkinitrd/busybox-1.37.0.tar.bz2.sig --rw-r--r-- 1 root root 30242 2024-10-04 19:00 ./source/a/mkinitrd/busybox-dot-config +-rw-r--r-- 1 root root 30200 2024-10-05 20:43 ./source/a/mkinitrd/busybox-dot-config -rw-r--r-- 1 root root 373 2024-07-24 19:01 ./source/a/mkinitrd/doinst.sh -rw-r--r-- 1 root root 1678 2019-01-23 20:47 ./source/a/mkinitrd/geninitrd -rw-r--r-- 1 root root 818 2024-07-24 23:57 ./source/a/mkinitrd/geninitrd.default @@ -6529,7 +6529,7 @@ drwxr-xr-x 2 root root 4096 2024-10-04 18:56 ./source/a/mkinitrd -rw-r--r-- 1 root root 29903 2009-12-18 05:10 ./source/a/mkinitrd/keymaps.tar.gz -rw-r--r-- 1 root root 28806 2022-04-26 19:13 ./source/a/mkinitrd/mkinitrd -rw-r--r-- 1 root root 9549 2022-04-26 19:12 ./source/a/mkinitrd/mkinitrd.8 --rwxr-xr-x 1 root root 8007 2024-10-04 18:56 ./source/a/mkinitrd/mkinitrd.SlackBuild +-rwxr-xr-x 1 root root 8004 2024-10-05 21:07 ./source/a/mkinitrd/mkinitrd.SlackBuild -rw-r--r-- 1 root root 7449 2022-04-26 19:12 ./source/a/mkinitrd/mkinitrd.conf.5 -rw-r--r-- 1 root root 529 2017-06-29 16:52 ./source/a/mkinitrd/mkinitrd.conf.sample -rw-r--r-- 1 root root 535 2020-04-26 23:53 ./source/a/mkinitrd/mkinitrd.tempfile.to.mktemp.patch.gz @@ -8101,7 +8101,7 @@ drwxr-xr-x 2 root root 4096 2018-02-27 06:13 ./source/f -rw-r--r-- 1 root root 960 2018-02-27 06:13 ./source/f/slack-desc.linux-faqs -rw-r--r-- 1 root root 801 2018-02-27 06:13 ./source/f/slack-desc.linux-howtos drwxr-xr-x 3 root root 4096 2024-09-18 18:36 ./source/installer --rw-r--r-- 1 root root 52598 2024-10-05 19:04 ./source/installer/ChangeLog.txt +-rw-r--r-- 1 root root 52754 2024-10-05 21:16 ./source/installer/ChangeLog.txt -rw-r--r-- 1 root root 6849 2018-03-11 00:53 ./source/installer/README -rwxr-xr-x 1 root root 82791 2024-09-18 20:12 ./source/installer/build_installer.sh -rwxr-xr-x 1 root root 2252 2023-12-11 20:39 ./source/installer/installer.SlackBuild @@ -8114,7 +8114,7 @@ drwxr-xr-x 2 root root 4096 2023-01-19 20:29 ./source/installer/sources/b drwxr-xr-x 2 root root 4096 2024-10-04 19:04 ./source/installer/sources/busybox -rw-r--r-- 1 root root 2565764 2024-09-26 21:31 ./source/installer/sources/busybox/busybox-1.37.0.tar.bz2 -rw-r--r-- 1 root root 121 2024-09-26 21:31 ./source/installer/sources/busybox/busybox-1.37.0.tar.bz2.sig --rw-r--r-- 1 root root 30242 2024-10-04 19:00 ./source/installer/sources/busybox/busybox-dot-config +-rw-r--r-- 1 root root 30200 2024-10-05 20:43 ./source/installer/sources/busybox/busybox-dot-config drwxr-xr-x 2 root root 4096 2022-02-05 19:51 ./source/installer/sources/dnsmasq -rw-r--r-- 1 root root 898 2019-08-28 17:40 ./source/installer/sources/dnsmasq/dnsmasq-2.80-SIOCGSTAMP.patch.gz -rw-r--r-- 1 root root 531404 2021-09-08 21:53 ./source/installer/sources/dnsmasq/dnsmasq-2.86.tar.xz @@ -16121,9 +16121,9 @@ drwxr-xr-x 2 root root 4096 2024-09-10 18:15 ./testing/source/k/slack-desc -rw-r--r-- 1 root root 778 2018-02-27 06:16 ./testing/source/k/slack-desc/slack-desc.kernel-source -rw-r--r-- 1 root root 778 2018-02-27 06:16 ./testing/source/k/slack-desc/slack-desc.kernel-source.vanilla -rw-r--r-- 1 root root 999 2024-09-10 18:15 ./testing/source/k/slack-desc/slack-desc.kernel-template -drwxr-xr-x 2 root root 4096 2024-10-05 19:16 ./usb-and-pxe-installers +drwxr-xr-x 2 root root 4096 2024-10-05 21:24 ./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 598 2024-09-12 20:38 ./usb-and-pxe-installers/pxelinux.cfg_default --rw-r--r-- 1 root root 113497088 2024-10-05 19:16 ./usb-and-pxe-installers/usbboot.img +-rw-r--r-- 1 root root 110060544 2024-10-05 21:23 ./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/mkinitrd/busybox-dot-config b/source/a/mkinitrd/busybox-dot-config index b87c770b7..028071332 100644 --- a/source/a/mkinitrd/busybox-dot-config +++ b/source/a/mkinitrd/busybox-dot-config @@ -67,7 +67,7 @@ CONFIG_INSTALL_APPLET_SYMLINKS=y # CONFIG_INSTALL_SH_APPLET_SYMLINK is not set # CONFIG_INSTALL_SH_APPLET_HARDLINK is not set # CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree" +CONFIG_PREFIX="./_install" # # Debugging Options diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index 3392121cf..ff61747a5 100755 --- a/source/a/mkinitrd/mkinitrd.SlackBuild +++ b/source/a/mkinitrd/mkinitrd.SlackBuild @@ -70,14 +70,15 @@ if [ -d $CWD/fixes-$BB ]; then fi chown -R root:root . -sed -e \ - 's#^CONFIG_PREFIX=.*#CONFIG_PREFIX="'$PKG'/usr/share/mkinitrd/initrd-tree"#' \ - $CWD/busybox-dot-config > .config +cat $CWD/busybox-dot-config > .config make oldconfig || exit 1 make $NUMJOBS || make || exit 1 - mkdir -p $PKG/usr/share/mkinitrd/initrd-tree/{bin,sbin} make install || exit 1 +cd _install +cp --remove-destination -fav * $PKG/usr/share/mkinitrd/initrd-tree +cd .. + rm -f $PKG/usr/share/mkinitrd/initrd-tree/linuxrc # Copying additional files: diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 0ae3cffa9..578e30f50 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,7 @@ +Sat Oct 5 21:15:53 UTC 2024 + Ope, that last one didn't boot because of a wrong CONFIG_PREFIX in + busybox-dot-config. Fixed. ++--------------------------+ Sat Oct 5 19:01:54 UTC 2024 It's possible that an unformatted EFI System Partition could still have traces of an old filesystem (such as NTFS) that could cause it to "mount" diff --git a/source/installer/sources/busybox/busybox-dot-config b/source/installer/sources/busybox/busybox-dot-config index b87c770b7..028071332 100644 --- a/source/installer/sources/busybox/busybox-dot-config +++ b/source/installer/sources/busybox/busybox-dot-config @@ -67,7 +67,7 @@ CONFIG_INSTALL_APPLET_SYMLINKS=y # CONFIG_INSTALL_SH_APPLET_SYMLINK is not set # CONFIG_INSTALL_SH_APPLET_HARDLINK is not set # CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree" +CONFIG_PREFIX="./_install" # # Debugging Options