From 142322a437e98e4a089d81f4511d2da2a8c1a8be Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 29 Dec 2023 21:02:02 +0000 Subject: Fri Dec 29 21:02:02 UTC 2023 a/sysvinit-scripts-15.1-noarch-10.txz: Rebuilt. rc.M: Fix the name of the LDAP name service daemon (rc.nss-pam-ldap). Thanks to 0XBF. d/subversion-1.14.3-x86_64-1.txz: Upgraded. l/libvisual-0.4.2-x86_64-1.txz: Upgraded. l/libvisual-plugins-0.4.2-x86_64-1.txz: Upgraded. l/netpbm-11.05.01-x86_64-1.txz: Upgraded. xfce/thunar-4.18.9-x86_64-1.txz: Upgraded. testing/packages/grub-2.12-x86_64-1.txz: Added. --- .../0001-00_header-add-GRUB_COLOR_-variables.patch | 41 ++++ .../grub/0001-skip-new-files-in-etc-grub.d.patch | 11 + ...support-dropins-for-default-configuration.patch | 28 +++ .../0198-align-struct-efi_variable-better.patch | 36 +++ .../b835601c7639ed1890f2d3db91900a8506011a8e.patch | 34 +++ testing/source/grub/doinst.sh | 18 ++ testing/source/grub/etc.default.grub | 28 +++ testing/source/grub/grub.SlackBuild | 244 +++++++++++++++++++++ .../grub/grub.dejavusansmono.gfxterm.font.diff | 41 ++++ testing/source/grub/initrd_naming.patch | 13 ++ testing/source/grub/slack-desc | 19 ++ 11 files changed, 513 insertions(+) create mode 100644 testing/source/grub/0001-00_header-add-GRUB_COLOR_-variables.patch create mode 100644 testing/source/grub/0001-skip-new-files-in-etc-grub.d.patch create mode 100644 testing/source/grub/0003-support-dropins-for-default-configuration.patch create mode 100644 testing/source/grub/0198-align-struct-efi_variable-better.patch create mode 100644 testing/source/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch create mode 100644 testing/source/grub/doinst.sh create mode 100644 testing/source/grub/etc.default.grub create mode 100755 testing/source/grub/grub.SlackBuild create mode 100644 testing/source/grub/grub.dejavusansmono.gfxterm.font.diff create mode 100644 testing/source/grub/initrd_naming.patch create mode 100644 testing/source/grub/slack-desc (limited to 'testing') diff --git a/testing/source/grub/0001-00_header-add-GRUB_COLOR_-variables.patch b/testing/source/grub/0001-00_header-add-GRUB_COLOR_-variables.patch new file mode 100644 index 000000000..867e8feeb --- /dev/null +++ b/testing/source/grub/0001-00_header-add-GRUB_COLOR_-variables.patch @@ -0,0 +1,41 @@ +From 21e5bcf22ab1a9f08c63e2a0212219d7482f77c1 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Wed, 10 Mar 2021 18:42:25 +0100 +Subject: [PATCH] 00_header: add GRUB_COLOR_* variables +--- + util/grub-mkconfig.in | 2 ++ + util/grub.d/00_header.in | 8 ++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index f8cbb8d7a..1189d95f9 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -246,6 +246,8 @@ export GRUB_DEFAULT \ + GRUB_BACKGROUND \ + GRUB_THEME \ + GRUB_GFXPAYLOAD_LINUX \ ++ GRUB_COLOR_NORMAL \ ++ GRUB_COLOR_HIGHLIGHT \ + GRUB_INIT_TUNE \ + GRUB_SAVEDEFAULT \ + GRUB_ENABLE_CRYPTODISK \ +diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in +index 93a90233e..c5955df00 100644 +--- a/util/grub.d/00_header.in ++++ b/util/grub.d/00_header.in +@@ -125,6 +125,14 @@ cat < +Date: Mon, 12 Jun 2023 07:42:01 +0200 +Subject: [PATCH 1/1] support dropins for default configuration + +--- + util/grub-mkconfig.in | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 1a945085c..4338dceef 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -160,6 +160,11 @@ fi + if test -f ${sysconfdir}/default/grub ; then + . ${sysconfdir}/default/grub + fi ++for dropin in ${sysconfdir}/default/grub.d/*.cfg ; do ++ if test -f "${dropin}" ; then ++ . "${dropin}" ++ fi ++done + + if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then + if [ -z "${GRUB_DISABLE_LINUX_UUID}" ]; then +-- +2.41.0 + diff --git a/testing/source/grub/0198-align-struct-efi_variable-better.patch b/testing/source/grub/0198-align-struct-efi_variable-better.patch new file mode 100644 index 000000000..8ce8bdc82 --- /dev/null +++ b/testing/source/grub/0198-align-struct-efi_variable-better.patch @@ -0,0 +1,36 @@ +From 2485633ada06c11c07a34a696a92b14e58f1e846 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Tue, 27 Feb 2018 13:55:35 -0500 +Subject: [PATCH 198/250] align struct efi_variable better... + +--- + include/grub/efiemu/runtime.h | 2 +- + include/grub/types.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h +index 9b6b729f4cc..856774a7c34 100644 +--- a/include/grub/efiemu/runtime.h ++++ b/include/grub/efiemu/runtime.h +@@ -33,5 +33,5 @@ struct efi_variable + grub_uint32_t namelen; + grub_uint32_t size; + grub_efi_uint32_t attributes; +-} GRUB_PACKED; ++} GRUB_PACKED GRUB_ALIGNED(8); + #endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */ +diff --git a/include/grub/types.h b/include/grub/types.h +index b93e4820194..f6a9723971d 100644 +--- a/include/grub/types.h ++++ b/include/grub/types.h +@@ -29,6 +29,7 @@ + #else + #define GRUB_PACKED __attribute__ ((packed)) + #endif ++#define GRUB_ALIGNED(x) __attribute__((aligned (x))) + + #ifdef GRUB_BUILD + # define GRUB_CPU_SIZEOF_VOID_P BUILD_SIZEOF_VOID_P +-- +2.14.3 + diff --git a/testing/source/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch b/testing/source/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch new file mode 100644 index 000000000..6670f7677 --- /dev/null +++ b/testing/source/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch @@ -0,0 +1,34 @@ +From b835601c7639ed1890f2d3db91900a8506011a8e Mon Sep 17 00:00:00 2001 +From: Oskari Pirhonen +Date: Thu, 21 Dec 2023 01:17:35 -0600 +Subject: build: Include grub-core/extra_deps.lst in dist + +Fixes build failure due to the extra_deps.lst file not existing in the +tarball. Found while trying to package GRUB 2.12 for Gentoo. + + make[3]: *** No rule to make target '/var/tmp/portage/sys-boot/grub-2.12/work/grub-2.12/grub-core/extra_deps.lst', needed by 'syminfo.lst'. Stop. + +Fixes: 89fbe0cac (grub-core/Makefile.am: Make path to extra_deps.lst relative to $(top_srcdir)/grub-core) +Fixes: 154dcb1ae (build: Allow explicit module dependencies) + +Signed-off-by: Oskari Pirhonen +Reviewed-by: Daniel Kiper +--- + conf/Makefile.extra-dist | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist +index 5e7126f..d9e2b8c 100644 +--- a/conf/Makefile.extra-dist ++++ b/conf/Makefile.extra-dist +@@ -21,6 +21,7 @@ EXTRA_DIST += conf/i386-cygwin-img-ld.sc + EXTRA_DIST += grub-core/Makefile.core.def + EXTRA_DIST += grub-core/Makefile.gcry.def + ++EXTRA_DIST += grub-core/extra_deps.lst + EXTRA_DIST += grub-core/genmoddep.awk + EXTRA_DIST += grub-core/genmod.sh.in + EXTRA_DIST += grub-core/gensyminfo.sh.in +-- +cgit v1.1 + diff --git a/testing/source/grub/doinst.sh b/testing/source/grub/doinst.sh new file mode 100644 index 000000000..54c06904f --- /dev/null +++ b/testing/source/grub/doinst.sh @@ -0,0 +1,18 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +# Process config files in etc/grub.d/: +for file in etc/grub.d/*.new ; do + config $file +done +config etc/default/grub.new diff --git a/testing/source/grub/etc.default.grub b/testing/source/grub/etc.default.grub new file mode 100644 index 000000000..b2d4080a0 --- /dev/null +++ b/testing/source/grub/etc.default.grub @@ -0,0 +1,28 @@ +# If you change this file, run grub-mkconfig -o /boot/grub/grub.cfg +# afterwards to update /boot/grub/grub.cfg. + +GRUB_DEFAULT=0 +#GRUB_HIDDEN_TIMEOUT=0 +GRUB_HIDDEN_TIMEOUT_QUIET=false +GRUB_TIMEOUT=10 +GRUB_DISTRIBUTOR=$( sed 's/Slackware /Slackware-/' /etc/slackware-version ) +GRUB_CMDLINE_LINUX_DEFAULT="" +GRUB_CMDLINE_LINUX="" + +# Uncomment to disable graphical terminal (grub-pc only) +#GRUB_TERMINAL=console + +# The resolution used on graphical terminal +# note that you can use only modes which your graphic card supports via VBE +# you can see them in real GRUB with the command `vbeinfo' +#GRUB_GFXMODE=640x480 +#GRUB_GFXMODE=1024x768x32 + +# Font used on the graphical terminal: +#GRUB_FONT=/usr/share/grub/dejavusansmono.pf2 + +# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux +#GRUB_DISABLE_LINUX_UUID=true + +# Uncomment to disable generation of recovery mode menu entries +#GRUB_DISABLE_RECOVERY="true" diff --git a/testing/source/grub/grub.SlackBuild b/testing/source/grub/grub.SlackBuild new file mode 100755 index 000000000..88666616c --- /dev/null +++ b/testing/source/grub/grub.SlackBuild @@ -0,0 +1,244 @@ +#!/bin/bash + +# Copyright 2013, 2016, 2017, 2018, 2019, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified 2016 by Eric Hameleers for Slackware Live Edition. + +cd $(dirname $0) ; CWD=$(pwd) + +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:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +# 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 +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$PKGVER-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-march=i386 -mcpu=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-march=i486 -mtune=i686" + EFI32_FLAGS=" --with-platform=efi --target=i386 --program-prefix= " + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-march=i586 -mtune=i686" + EFI32_FLAGS=" --with-platform=efi --target=i386 --program-prefix= " + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-march=i686" + EFI32_FLAGS=" --with-platform=efi --target=i386 --program-prefix= " + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="" + EFI32_FLAGS=" --with-platform=efi --target=i386 --program-prefix= " + EFI_FLAGS=" --with-platform=efi --target=x86_64 --program-prefix= " + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="" + LIBDIRSUFFIX="" +fi + +# Don't use icecream: +PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Use /boot/initrd.gz as a valid initrd name: +cat $CWD/initrd_naming.patch | patch -p1 --verbose || exit 1 + +# Support DejaVuSansMono font (dejavusansmono.pf2) by default: +cat $CWD/grub.dejavusansmono.gfxterm.font.diff | patch -p1 --verbose || exit 1 + +# Fix alignment error with gcc8: +cat $CWD/0198-align-struct-efi_variable-better.patch | patch -p1 --verbose || exit 1 + +# Skip processing any files in /etc/grub.d/ that end in .new: +cat $CWD/0001-skip-new-files-in-etc-grub.d.patch | patch -p1 --verbose || exit 1 + +# From Arch, add a couple more GRUB_COLOR options: +cat $CWD/0001-00_header-add-GRUB_COLOR_-variables.patch | patch -p1 --verbose || exit 1 + +# Also from Arch, support drop-in config bits in /etc/default/grub.d/: +cat $CWD/0003-support-dropins-for-default-configuration.patch | patch -p1 --verbose || exit 1 + +# Fix 2.12 release with upstream commit (won't compile otherwise): +cat $CWD/b835601c7639ed1890f2d3db91900a8506011a8e.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 + +# Regenerate build system to fix dependency on outdated automake: +autoreconf -vif + +build_grub() { + EFI_DO="$*" + # Configure: + CFLAGS="$SLKCFLAGS" \ + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --disable-werror \ + $EFI_DO || exit 1 + + # Build and install: + make clean || exit 1 + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 + + # Clear $EFI_DO : + unset EFI_DO +} + +# Build 32bit and 64bit efi targets if requested: +if [ -n "$EFI32_FLAGS" ]; then + build_grub $EFI32_FLAGS || exit 1 +fi +if [ -n "$EFI_FLAGS" ]; then + build_grub $EFI_FLAGS || exit 1 +fi +# Always end with regular build: +build_grub || exit 1 + +# Preserve files in /etc/grub.d/: +for file in $PKG/etc/grub.d/*_* ; do + mv ${file} ${file}.new +done + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Put bash-completion file in system directory: +mkdir -p $PKG/usr/share/bash-completion/completions/ +mv $PKG/etc/bash_completion.d/grub \ + $PKG/usr/share/bash-completion/completions/grub +rmdir --parents $PKG/etc/bash_completion.d 2>/dev/null + +# Install default options file: +mkdir -p $PKG/etc/default/grub.d +cat $CWD/etc.default.grub > $PKG/etc/default/grub.new + +# Create a directory for grub.cfg: +mkdir -p $PKG/boot/grub + +# Add fonts, if found on the system: +FONT_SIZE=${FONT_SIZE:-19} +if [ -r /usr/share/fonts/TTF/unifont.ttf ]; then + $PKG/usr/bin/grub-mkfont -o $PKG/usr/share/grub/unifont.pf2 -abv \ + -s $FONT_SIZE /usr/share/fonts/TTF/unifont.ttf +fi +if [ -r /usr/share/fonts/TTF/DejaVuSansMono.ttf ]; then + $PKG/usr/bin/grub-mkfont -o $PKG/usr/share/grub/dejavusansmono.pf2 -abv \ + -s $FONT_SIZE /usr/share/fonts/TTF/DejaVuSansMono.ttf +fi + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS BUGS COPYING* INSTALL NEWS README* THANKS TODO \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# Compress info files, if any: +if [ -d $PKG/usr/info ]; then + ( cd $PKG/usr/info + rm -f dir + gzip -9 * + ) +fi + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$PKGVER-$ARCH-$BUILD.txz + diff --git a/testing/source/grub/grub.dejavusansmono.gfxterm.font.diff b/testing/source/grub/grub.dejavusansmono.gfxterm.font.diff new file mode 100644 index 000000000..2890f16f9 --- /dev/null +++ b/testing/source/grub/grub.dejavusansmono.gfxterm.font.diff @@ -0,0 +1,41 @@ +--- ./util/grub.d/00_header.in.orig 2012-05-03 18:04:39.000000000 -0500 ++++ ./util/grub.d/00_header.in 2013-09-17 01:43:37.870841064 -0500 +@@ -143,7 +143,7 @@ + EOF + else + for dir in "${pkgdatadir}" "`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`" /usr/share/grub ; do +- for basename in unicode unifont ascii; do ++ for basename in unicode unifont dejavusansmono ascii; do + path="${dir}/${basename}.pf2" + if is_path_readable_by_grub "${path}" > /dev/null ; then + font_path="${path}" +@@ -156,7 +156,7 @@ + if [ -n "${font_path}" ] ; then + cat << EOF + if [ x\$feature_default_font_path = xy ] ; then +- font=unicode ++ font=dejavusansmono + else + EOF + # Make the font accessible +@@ -169,7 +169,7 @@ + EOF + else + cat << EOF +-if loadfont unicode ; then ++if loadfont dejavusansmono ; then + EOF + fi + fi +diff -Naur grub-2.02~beta2.orig/util/grub-install.c grub-2.02~beta2/util/grub-install.c +--- grub-2.02~beta2.orig/util/grub-install.c 2013-12-24 08:40:31.000000000 -0800 ++++ grub-2.02~beta2/util/grub-install.c.new 2015-01-27 22:07:56.714000000 -0800 +@@ -827,7 +827,7 @@ + grub_util_host_init (&argc, &argv); + product_version = xstrdup (PACKAGE_VERSION); + pkgdatadir = grub_util_get_pkgdatadir (); +- label_font = grub_util_path_concat (2, pkgdatadir, "unicode.pf2"); ++ label_font = grub_util_path_concat (2, pkgdatadir, "dejavusansmono.pf2"); + + argp_parse (&argp, argc, argv, 0, 0, 0); + diff --git a/testing/source/grub/initrd_naming.patch b/testing/source/grub/initrd_naming.patch new file mode 100644 index 000000000..6b62778b0 --- /dev/null +++ b/testing/source/grub/initrd_naming.patch @@ -0,0 +1,13 @@ +diff -Naur grub-2.00.orig/util/grub.d/10_linux.in grub-2.00/util/grub.d/10_linux.in +--- grub-2.00.orig/util/grub.d/10_linux.in 2012-04-18 23:24:38.000000000 +0200 ++++ grub-2.00/util/grub.d/10_linux.in 2012-06-30 07:53:03.765625589 +0200 +@@ -198,7 +198,8 @@ + "initramfs-genkernel-${version}" \ + "initramfs-genkernel-${alt_version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ +- "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do ++ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \ ++ "initrd.gz"; do + if test -e "${dirname}/${i}" ; then + initrd="$i" + break diff --git a/testing/source/grub/slack-desc b/testing/source/grub/slack-desc new file mode 100644 index 000000000..b07c8a3b2 --- /dev/null +++ b/testing/source/grub/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +grub: grub (the GRand Unified Bootloader) +grub: +grub: GNU GRUB, the GRand Unified Bootloader, is a flexible and powerful +grub: boot loader program for a wide range of architectures. +grub: +grub: Homepage: https://www.gnu.org/software/grub/ +grub: +grub: +grub: +grub: +grub: -- cgit v1.2.3