Thu Jul 25 05:34:53 UTC 202420240725053453

testing/packages/grub-2.12-x86_64-13.txz:  Rebuilt.
  Support the GRUB_DISABLE_KERNEL_SYMLINKS variable in 10_linux.
  Thanks to Daedra.

5 files changed, 58 insertions, 21 deletions

diff --git a/ChangeLog.rss b/ChangeLog.rss
index 79ab81b4e..0a29c7528 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,10 +11,23 @@
       <description>Tracking Slackware development in git.</description>
       <language>en-us</language>
       <id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
-      <pubDate>Thu, 25 Jul 2024 02:39:18 GMT</pubDate>
-      <lastBuildDate>Thu, 25 Jul 2024 04:11:32 GMT</lastBuildDate>
+      <pubDate>Thu, 25 Jul 2024 05:34:53 GMT</pubDate>
+      <lastBuildDate>Thu, 25 Jul 2024 05:57:22 GMT</lastBuildDate>
       <generator>maintain_current_git.sh v 1.17</generator>
       <item>
+         <title>Thu, 25 Jul 2024 05:34:53 GMT</title>
+         <pubDate>Thu, 25 Jul 2024 05:34:53 GMT</pubDate>
+         <link>https://git.slackware.nl/current/tag/?h=20240725053453</link>
+         <guid isPermaLink="false">20240725053453</guid>
+         <description>
+           <![CDATA[<pre>
+testing/packages/grub-2.12-x86_64-13.txz:  Rebuilt.
+  Support the GRUB_DISABLE_KERNEL_SYMLINKS variable in 10_linux.
+  Thanks to Daedra.
+           </pre>]]>
+         </description>
+      </item>
+      <item>
          <title>Thu, 25 Jul 2024 02:39:18 GMT</title>
          <pubDate>Thu, 25 Jul 2024 02:39:18 GMT</pubDate>
          <link>https://git.slackware.nl/current/tag/?h=20240725023918</link>
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8dd96f633..87633e862 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,8 @@
+Thu Jul 25 05:34:53 UTC 2024
+testing/packages/grub-2.12-x86_64-13.txz:  Rebuilt.
+  Support the GRUB_DISABLE_KERNEL_SYMLINKS variable in 10_linux.
+  Thanks to Daedra.
++--------------------------+
 Thu Jul 25 02:39:18 UTC 2024
 Well folks, we have some more interesting stuff in /testing now.
 Our good friend LuckyCyborg posted a while back about our trials with
diff --git a/FILELIST.TXT b/FILELIST.TXT
index 89f24aace..01a2f0e27 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,21 +1,21 @@
-Thu Jul 25 02:44:56 UTC 2024
+Thu Jul 25 05:35:33 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-07-25 02:39 .
+drwxr-xr-x 12 root root      4096 2024-07-25 05:34 .
 -rw-r--r--  1 root root   1133358 2024-07-24 22:43 ./:wq
 -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   1154829 2024-07-23 19:33 ./CHECKSUMS.md5
--rw-r--r--  1 root root       195 2024-07-23 19:33 ./CHECKSUMS.md5.asc
+-rw-r--r--  1 root root   1162820 2024-07-25 02:45 ./CHECKSUMS.md5
+-rw-r--r--  1 root root       195 2024-07-25 02:45 ./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   1135626 2024-07-25 02:39 ./ChangeLog.txt
+-rw-r--r--  1 root root   1135821 2024-07-25 05:34 ./ChangeLog.txt
 drwxr-xr-x  3 root root      4096 2013-03-20 22:17 ./EFI
 drwxr-xr-x  2 root root      4096 2024-07-18 19:17 ./EFI/BOOT
 -rw-r--r--  1 root root   1200128 2024-06-23 18:50 ./EFI/BOOT/bootx64.efi
@@ -26,7 +26,7 @@ drwxr-xr-x  2 root root      4096 2024-07-18 19:17 ./EFI/BOOT
 -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   1511563 2024-07-23 19:33 ./FILELIST.TXT
+-rw-r--r--  1 root root   1521594 2024-07-25 02:44 ./FILELIST.TXT
 -rw-r--r--  1 root root      1572 2012-08-29 18:27 ./GPG-KEY
 -rw-r--r--  1 root root    913372 2024-07-25 02:44 ./PACKAGES.TXT
 -rw-r--r--  1 root root      8034 2022-02-02 03:36 ./README.TXT
@@ -16013,16 +16013,16 @@ drwxr-xr-x  2 root root      4096 2023-02-19 18:29 ./source/y/nethack
 -rwxr-xr-x  1 root root      4972 2024-05-05 17:20 ./source/y/nethack/nethack.SlackBuild
 -rw-r--r--  1 root root        59 2023-02-19 18:28 ./source/y/nethack/nethack.url
 -rw-r--r--  1 root root      1031 2020-12-30 21:50 ./source/y/nethack/slack-desc
-drwxr-xr-x  4 root root      4096 2024-07-25 02:44 ./testing
--rw-r--r--  1 root root      7698 2024-07-25 02:44 ./testing/CHECKSUMS.md5
--rw-r--r--  1 root root       195 2024-07-25 02:44 ./testing/CHECKSUMS.md5.asc
--rw-r--r--  1 root root      9733 2024-07-25 02:44 ./testing/FILE_LIST
--rw-r--r--  1 root root   1481642 2024-07-25 02:44 ./testing/MANIFEST.bz2
--rw-r--r--  1 root root      4156 2024-07-25 02:44 ./testing/PACKAGES.TXT
-drwxr-xr-x  2 root root      4096 2024-07-25 02:44 ./testing/packages
--rw-r--r--  1 root root       269 2024-07-24 23:45 ./testing/packages/grub-2.12-x86_64-12.txt
--rw-r--r--  1 root root  12770252 2024-07-24 23:45 ./testing/packages/grub-2.12-x86_64-12.txz
--rw-r--r--  1 root root       195 2024-07-24 23:45 ./testing/packages/grub-2.12-x86_64-12.txz.asc
+drwxr-xr-x  4 root root      4096 2024-07-25 05:35 ./testing
+-rw-r--r--  1 root root      7785 2024-07-25 05:35 ./testing/CHECKSUMS.md5
+-rw-r--r--  1 root root       195 2024-07-25 05:35 ./testing/CHECKSUMS.md5.asc
+-rw-r--r--  1 root root      9836 2024-07-25 05:35 ./testing/FILE_LIST
+-rw-r--r--  1 root root   1484944 2024-07-25 05:35 ./testing/MANIFEST.bz2
+-rw-r--r--  1 root root      4156 2024-07-25 05:35 ./testing/PACKAGES.TXT
+drwxr-xr-x  2 root root      4096 2024-07-25 05:35 ./testing/packages
+-rw-r--r--  1 root root       269 2024-07-25 05:24 ./testing/packages/grub-2.12-x86_64-13.txt
+-rw-r--r--  1 root root  12761276 2024-07-25 05:24 ./testing/packages/grub-2.12-x86_64-13.txz
+-rw-r--r--  1 root root       195 2024-07-25 05:24 ./testing/packages/grub-2.12-x86_64-13.txz.asc
 -rw-r--r--  1 root root       489 2024-07-24 18:32 ./testing/packages/kernel-generic-6.10.1-x86_64-1.txt
 -rw-r--r--  1 root root  14513484 2024-07-24 18:32 ./testing/packages/kernel-generic-6.10.1-x86_64-1.txz
 -rw-r--r--  1 root root       195 2024-07-24 18:32 ./testing/packages/kernel-generic-6.10.1-x86_64-1.txz.asc
@@ -16042,20 +16042,21 @@ drwxr-xr-x  2 root root      4096 2024-07-25 02:44 ./testing/packages
 -rw-r--r--  1 root root    621720 2024-07-25 00:01 ./testing/packages/mkinitrd-1.4.11-x86_64-35.txz
 -rw-r--r--  1 root root       195 2024-07-25 00:01 ./testing/packages/mkinitrd-1.4.11-x86_64-35.txz.asc
 drwxr-xr-x  5 root root      4096 2024-07-24 23:37 ./testing/source
-drwxr-xr-x  2 root root      4096 2024-07-24 19:14 ./testing/source/grub
+drwxr-xr-x  2 root root      4096 2024-07-25 05:21 ./testing/source/grub
 -rw-r--r--  1 root root      1167 2023-12-21 19:26 ./testing/source/grub/0001-00_header-add-GRUB_COLOR_-variables.patch
 -rw-r--r--  1 root root       444 2024-01-02 19:45 ./testing/source/grub/0001-skip-new-and-orig-files-in-etc-grub.d.patch
 -rw-r--r--  1 root root       766 2023-12-21 19:30 ./testing/source/grub/0003-support-dropins-for-default-configuration.patch
 -rw-r--r--  1 root root       376 2024-06-26 17:44 ./testing/source/grub/0004-add-GRUB_DISABLE_KERNEL_SYMLINKS-variable.patch
 -rw-r--r--  1 root root      1103 2018-05-16 15:18 ./testing/source/grub/0198-align-struct-efi_variable-better.patch
 -rw-r--r--  1 root root      6576 2024-06-27 18:41 ./testing/source/grub/09_slackware_linux
+-rw-r--r--  1 root root       483 2024-07-25 05:21 ./testing/source/grub/10_linux.disable_kernel_symlinks.patch
 -rw-r--r--  1 root root       616 2024-07-24 19:14 ./testing/source/grub/10_linux.osname.patch
 -rw-r--r--  1 root root      1320 2023-12-21 07:17 ./testing/source/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch
 -rw-r--r--  1 root root       688 2024-06-23 22:41 ./testing/source/grub/doinst.sh
 -rw-r--r--  1 root root      1607 2024-06-25 18:33 ./testing/source/grub/etc.default.grub
 -rw-r--r--  1 root root   6675608 2023-12-20 16:53 ./testing/source/grub/grub-2.12.tar.xz
 -rw-r--r--  1 root root       566 2023-12-20 16:53 ./testing/source/grub/grub-2.12.tar.xz.sig
--rwxr-xr-x  1 root root      8734 2024-07-24 23:43 ./testing/source/grub/grub.SlackBuild
+-rwxr-xr-x  1 root root      8885 2024-07-25 05:22 ./testing/source/grub/grub.SlackBuild
 -rw-r--r--  1 root root      1458 2016-12-25 09:49 ./testing/source/grub/grub.dejavusansmono.gfxterm.font.diff
 -rw-r--r--  1 root root       619 2012-09-29 04:34 ./testing/source/grub/initrd_naming.patch
 -rw-r--r--  1 root root       721 2023-12-21 19:34 ./testing/source/grub/slack-desc
diff --git a/testing/source/grub/10_linux.disable_kernel_symlinks.patch b/testing/source/grub/10_linux.disable_kernel_symlinks.patch
new file mode 100644
index 000000000..f35e671c6
--- /dev/null
+++ b/testing/source/grub/10_linux.disable_kernel_symlinks.patch
@@ -0,0 +1,15 @@
+--- ./util/grub.d/10_linux.in.orig	2024-07-25 00:18:12.270876545 -0500
++++ ./util/grub.d/10_linux.in	2024-07-25 00:21:10.292942662 -0500
+@@ -209,6 +209,12 @@
+ 
+ is_top_level=true
+ for linux in ${reverse_sorted_list}; do
++
++  # Skip symbolic links to kernels if requested:
++  if [ -L "$linux" -a "$GRUB_DISABLE_KERNEL_SYMLINKS" = "true" ]; then
++      continue
++  fi
++
+   gettext_printf "Found linux image: %s\n" "$linux" >&2
+   basename=`basename $linux`
+   dirname=`dirname $linux`
diff --git a/testing/source/grub/grub.SlackBuild b/testing/source/grub/grub.SlackBuild
index 905b9d3a9..f93095658 100755
--- a/testing/source/grub/grub.SlackBuild
+++ b/testing/source/grub/grub.SlackBuild
@@ -28,7 +28,7 @@ PKGNAM=grub
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 # Better to use _ than ~ in the package filenames version:
 PKGVER=$(echo $VERSION | tr '~' '_')
-BUILD=${BUILD:-12}
+BUILD=${BUILD:-13}
 
 # If you use stack-protector, then grub will not work with legacy BIOS:
 STACKPROTECT=${STACKPROTECT:---enable-stack-protector=no}
@@ -117,6 +117,9 @@ cat $CWD/b835601c7639ed1890f2d3db91900a8506011a8e.patch | patch -p1 --verbose ||
 # For Slackware, opt-out of having our operating system renamed:
 cat $CWD/10_linux.osname.patch | patch -p1 --verbose || exit 1
 
+# Skip symlinks to kernels according to GRUB_DISABLE_KERNEL_SYMLINKS:
+cat $CWD/10_linux.disable_kernel_symlinks.patch | patch -p1 --verbose || exit 1
+
 # Still won't compile. Someday they'll remember how to cut a new release.
 touch grub-core/extra_deps.lst