summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2024-06-23 20:42:35 +0000
committer Eric Hameleers <alien@slackware.com>2024-06-23 22:58:03 +0200
commitd62c03181e919ed358a68bf831593d5b540d04a3 (patch)
tree56075297004ba44384caa23add0c584134d5b634
parent56f32a284b081ee617e6f485125cfb2d378a6654 (diff)
downloadcurrent-d62c03181e919ed358a68bf831593d5b540d04a3.tar.gz
current-d62c03181e919ed358a68bf831593d5b540d04a3.tar.xz
Sun Jun 23 20:42:35 UTC 202420240623204235
a/grub-2.12-x86_64-4.txz: Rebuilt. Leave os-prober disabled by default, but add an example to /etc/default/grub to make it easy to enable it. Thanks to gmgf.
-rw-r--r--ChangeLog.rss17
-rw-r--r--ChangeLog.txt5
-rw-r--r--FILELIST.TXT46
-rw-r--r--source/a/grub/etc.default.grub4
-rwxr-xr-xsource/a/grub/grub.SlackBuild2
5 files changed, 48 insertions, 26 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss
index dda009b71..9ee9be41f 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>Sun, 23 Jun 2024 18:58:33 GMT</pubDate>
- <lastBuildDate>Sun, 23 Jun 2024 19:28:29 GMT</lastBuildDate>
+ <pubDate>Sun, 23 Jun 2024 20:42:35 GMT</pubDate>
+ <lastBuildDate>Sun, 23 Jun 2024 20:57:56 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.17</generator>
<item>
+ <title>Sun, 23 Jun 2024 20:42:35 GMT</title>
+ <pubDate>Sun, 23 Jun 2024 20:42:35 GMT</pubDate>
+ <link>https://git.slackware.nl/current/tag/?h=20240623204235</link>
+ <guid isPermaLink="false">20240623204235</guid>
+ <description>
+ <![CDATA[<pre>
+a/grub-2.12-x86_64-4.txz: Rebuilt.
+ Leave os-prober disabled by default, but add an example to /etc/default/grub
+ to make it easy to enable it. Thanks to gmgf.
+ </pre>]]>
+ </description>
+ </item>
+ <item>
<title>Sun, 23 Jun 2024 18:58:33 GMT</title>
<pubDate>Sun, 23 Jun 2024 18:58:33 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20240623185833</link>
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8dfb7f26e..a3f2c4cd4 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,8 @@
+Sun Jun 23 20:42:35 UTC 2024
+a/grub-2.12-x86_64-4.txz: Rebuilt.
+ Leave os-prober disabled by default, but add an example to /etc/default/grub
+ to make it easy to enable it. Thanks to gmgf.
++--------------------------+
Sun Jun 23 18:58:33 UTC 2024
a/grub-2.12-x86_64-3.txz: Rebuilt.
A few more changes, and moved out of /testing.
diff --git a/FILELIST.TXT b/FILELIST.TXT
index 17100748f..32c7fe63b 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Sun Jun 23 19:02:12 UTC 2024
+Sun Jun 23 20:46:12 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-06-23 18:58 .
+drwxr-xr-x 12 root root 4096 2024-06-23 20:42 .
-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 1154244 2024-06-22 20:11 ./CHECKSUMS.md5
--rw-r--r-- 1 root root 195 2024-06-22 20:11 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 1153054 2024-06-23 19:02 ./CHECKSUMS.md5
+-rw-r--r-- 1 root root 195 2024-06-23 19:02 ./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 1105198 2024-06-23 18:58 ./ChangeLog.txt
+-rw-r--r-- 1 root root 1105419 2024-06-23 20:42 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2024-06-23 18:50 ./EFI/BOOT
-rw-r--r-- 1 root root 1200128 2024-06-23 18:50 ./EFI/BOOT/bootx64.efi
@@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2024-06-23 18:50 ./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 1510785 2024-06-22 20:10 ./FILELIST.TXT
+-rw-r--r-- 1 root root 1509284 2024-06-23 19:02 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
--rw-r--r-- 1 root root 912447 2024-06-23 19:01 ./PACKAGES.TXT
+-rw-r--r-- 1 root root 912447 2024-06-23 20:45 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT
-rw-r--r-- 1 root root 3623 2024-06-21 18:40 ./README.initrd
-rw-r--r-- 1 root root 34114 2023-12-11 20:35 ./README_CRYPT.TXT
@@ -662,13 +662,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 2024-06-23 19:01 ./slackware64
--rw-r--r-- 1 root root 355833 2024-06-23 19:01 ./slackware64/CHECKSUMS.md5
--rw-r--r-- 1 root root 195 2024-06-23 19:01 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 440674 2024-06-23 19:00 ./slackware64/FILE_LIST
--rw-r--r-- 1 root root 4696964 2024-06-23 19:01 ./slackware64/MANIFEST.bz2
+drwxr-xr-x 17 root root 4096 2024-06-23 20:45 ./slackware64
+-rw-r--r-- 1 root root 355833 2024-06-23 20:45 ./slackware64/CHECKSUMS.md5
+-rw-r--r-- 1 root root 195 2024-06-23 20:45 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 440674 2024-06-23 20:44 ./slackware64/FILE_LIST
+-rw-r--r-- 1 root root 4693377 2024-06-23 20:45 ./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 2024-06-23 19:00 ./slackware64/a
+drwxr-xr-x 2 root root 32768 2024-06-23 20:44 ./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
@@ -795,9 +795,9 @@ drwxr-xr-x 2 root root 32768 2024-06-23 19:00 ./slackware64/a
-rw-r--r-- 1 root root 291 2023-05-14 00:12 ./slackware64/a/grep-3.11-x86_64-1.txt
-rw-r--r-- 1 root root 271096 2023-05-14 00:12 ./slackware64/a/grep-3.11-x86_64-1.txz
-rw-r--r-- 1 root root 163 2023-05-14 00:12 ./slackware64/a/grep-3.11-x86_64-1.txz.asc
--rw-r--r-- 1 root root 269 2024-06-23 18:45 ./slackware64/a/grub-2.12-x86_64-3.txt
--rw-r--r-- 1 root root 10449952 2024-06-23 18:45 ./slackware64/a/grub-2.12-x86_64-3.txz
--rw-r--r-- 1 root root 195 2024-06-23 18:45 ./slackware64/a/grub-2.12-x86_64-3.txz.asc
+-rw-r--r-- 1 root root 269 2024-06-23 20:40 ./slackware64/a/grub-2.12-x86_64-4.txt
+-rw-r--r-- 1 root root 10451412 2024-06-23 20:40 ./slackware64/a/grub-2.12-x86_64-4.txz
+-rw-r--r-- 1 root root 195 2024-06-23 20:40 ./slackware64/a/grub-2.12-x86_64-4.txz.asc
-rw-r--r-- 1 root root 314 2023-08-20 19:07 ./slackware64/a/gzip-1.13-x86_64-1.txt
-rw-r--r-- 1 root root 117772 2023-08-20 19:07 ./slackware64/a/gzip-1.13-x86_64-1.txz
-rw-r--r-- 1 root root 163 2023-08-20 19:07 ./slackware64/a/gzip-1.13-x86_64-1.txz.asc
@@ -5786,11 +5786,11 @@ 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-06-23 19:02 ./source
--rw-r--r-- 1 root root 621418 2024-06-23 19:02 ./source/CHECKSUMS.md5
--rw-r--r-- 1 root root 195 2024-06-23 19:02 ./source/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 866481 2024-06-23 19:01 ./source/FILE_LIST
--rw-r--r-- 1 root root 29696391 2024-06-23 19:01 ./source/MANIFEST.bz2
+drwxr-xr-x 18 root root 4096 2024-06-23 20:46 ./source
+-rw-r--r-- 1 root root 621418 2024-06-23 20:46 ./source/CHECKSUMS.md5
+-rw-r--r-- 1 root root 195 2024-06-23 20:46 ./source/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 866481 2024-06-23 20:45 ./source/FILE_LIST
+-rw-r--r-- 1 root root 29705346 2024-06-23 20:45 ./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 2024-06-23 18:42 ./source/a
-rw-r--r-- 1 root root 339 2023-09-28 19:06 ./source/a/FTBFSlog
@@ -6212,10 +6212,10 @@ drwxr-xr-x 2 root root 4096 2024-06-23 18:43 ./source/a/grub
-rw-r--r-- 1 root root 5719 2024-03-31 20:37 ./source/a/grub/09_slackware_linux
-rw-r--r-- 1 root root 1320 2023-12-21 07:17 ./source/a/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch
-rw-r--r-- 1 root root 307 2021-09-10 18:36 ./source/a/grub/doinst.sh.gz
--rw-r--r-- 1 root root 926 2016-06-13 03:14 ./source/a/grub/etc.default.grub
+-rw-r--r-- 1 root root 1041 2024-06-23 20:33 ./source/a/grub/etc.default.grub
-rw-r--r-- 1 root root 6675608 2023-12-20 16:53 ./source/a/grub/grub-2.12.tar.xz
-rw-r--r-- 1 root root 566 2023-12-20 16:53 ./source/a/grub/grub-2.12.tar.xz.sig
--rwxr-xr-x 1 root root 8477 2024-06-23 18:42 ./source/a/grub/grub.SlackBuild
+-rwxr-xr-x 1 root root 8477 2024-06-23 20:22 ./source/a/grub/grub.SlackBuild
-rw-r--r-- 1 root root 1458 2016-12-25 09:49 ./source/a/grub/grub.dejavusansmono.gfxterm.font.diff
-rw-r--r-- 1 root root 619 2012-09-29 04:34 ./source/a/grub/initrd_naming.patch
-rw-r--r-- 1 root root 721 2023-12-21 19:34 ./source/a/grub/slack-desc
diff --git a/source/a/grub/etc.default.grub b/source/a/grub/etc.default.grub
index b2d4080a0..622d9b71a 100644
--- a/source/a/grub/etc.default.grub
+++ b/source/a/grub/etc.default.grub
@@ -26,3 +26,7 @@ GRUB_CMDLINE_LINUX=""
# Uncomment to disable generation of recovery mode menu entries
#GRUB_DISABLE_RECOVERY="true"
+
+# os-prober is disabled by default.
+# If you want to use it, uncomment this line:
+#GRUB_DISABLE_OS_PROBER="false"
diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild
index 0c5d57ed0..cd83fd2f0 100755
--- a/source/a/grub/grub.SlackBuild
+++ b/source/a/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:-3}
+BUILD=${BUILD:-4}
# If you use stack-protector, then grub will not work with legacy BIOS:
STACKPROTECT=${STACKPROTECT:---enable-stack-protector=no}