summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-10-05 02:05:50 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-10-05 02:05:50 +0100
commitcd9552f5d54653e64894bca03b882b00467db63c (patch)
tree4635e3eaa0dee5627870b5a6e0c17283944a8135
parente96a48a737f2339c9e08b0b917e15037fd9fa741 (diff)
sys-boot/grub : silence fgrep
-rw-r--r--metadata/md5-cache/sys-boot/grub-2.04-r12 (renamed from metadata/md5-cache/sys-boot/grub-2.04-r11)4
-rw-r--r--metadata/pkg_desc_index2
-rw-r--r--sys-boot/grub/files/04-fgrep.patch75
-rw-r--r--sys-boot/grub/grub-2.04-r12.ebuild (renamed from sys-boot/grub/grub-2.04-r11.ebuild)1
4 files changed, 79 insertions, 3 deletions
diff --git a/metadata/md5-cache/sys-boot/grub-2.04-r11 b/metadata/md5-cache/sys-boot/grub-2.04-r12
index 97b602e9..eb893389 100644
--- a/metadata/md5-cache/sys-boot/grub-2.04-r11
+++ b/metadata/md5-cache/sys-boot/grub-2.04-r12
@@ -11,7 +11,7 @@ LICENSE=GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )
RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= sdl? ( media-libs/libsdl ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) grub_platforms_xen? ( app-emulation/xen-tools:= ) grub_platforms_xen-32? ( app-emulation/xen-tools:= ) grub_platforms_xen-pvh? ( app-emulation/xen-tools:= ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 !sys-boot/grub-static nls? ( sys-devel/gettext )
REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts )
RESTRICT=!test? ( test )
-SLOT=2/2.04-r11
+SLOT=2/2.04-r12
SRC_URI=mirror://gnu/grub/grub-2.04.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
_eclasses_=autotools 9e6965bfaa00f52cc61e0d4bc44c87b3 bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 8f942ebdcf04334697649d4a0bf65a32 flag-o-matic 29a755b1291d64133634d80b0328f153 gnuconfig b6b3e92f8b8c996400074b5f61a59256 libtool 241a8f577b9781a42a7421e53448a44e multibuild d26d81f242cb193d899a72bca423d0bd multilib 5ca4e49abed8e3a2f7b56920eadee157 pax-utils 91d47e5d20627c717aa878b9167c62a8 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 1542e649be915f43f6908a9e93909961 wrapper 4a1902f969e5718126434fc35f3a0d9c
-_md5_=75a85b0fc8e1f70b25158e2321984000
+_md5_=e09dbc3a4ff424c670f6d77cb2b8602e
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index ac244c24..c42e145d 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -43,7 +43,7 @@ sys-auth/elogind 246.10-r3: The systemd project's logind, extracted to a standal
sys-auth/polkit-qt 0.113.0-r11: PolicyKit Qt API wrapper library (meta package)
sys-auth/polkit-qt5 0.113.0-r10: Qt wrapper around polkit-1 client libraries
sys-boot/etcher 1.5.116: Flash OS images to SD cards & USB drives, safely and easily.
-sys-boot/grub 2.04-r11: GNU GRUB boot loader
+sys-boot/grub 2.04-r12: GNU GRUB boot loader
sys-boot/os-prober 1.77-r10: Utility to detect other OSs on a set of drives
sys-boot/plymouth 0.9.4-r11: Graphical boot animation (splash) and logger
sys-boot/unetbootin-static 625-r3: Universal Netboot Installer creates Live USB systems for various OS distributions
diff --git a/sys-boot/grub/files/04-fgrep.patch b/sys-boot/grub/files/04-fgrep.patch
new file mode 100644
index 00000000..93d50ffa
--- /dev/null
+++ b/sys-boot/grub/files/04-fgrep.patch
@@ -0,0 +1,75 @@
+diff -Nur a/grub-core/lib/libgcrypt/src/libgcrypt-config.in b/grub-core/lib/libgcrypt/src/libgcrypt-config.in
+--- a/grub-core/lib/libgcrypt/src/libgcrypt-config.in 2018-11-24 17:13:02.000000000 +0000
++++ b/grub-core/lib/libgcrypt/src/libgcrypt-config.in 2022-10-05 01:59:10.786495758 +0100
+@@ -142,7 +142,7 @@
+
+ tmp=""
+ for i in $includes $cflags_final; do
+- if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
++ if echo "$tmp" | grep -Fv -- "$i" >/dev/null; then
+ tmp="$tmp $i"
+ fi
+ done
+@@ -163,7 +163,7 @@
+
+ tmp=""
+ for i in $libdirs $libs_final; do
+- if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
++ if echo "$tmp" | grep -Fv -- "$i" >/dev/null; then
+ tmp="$tmp $i"
+ fi
+ done
+diff -Nur a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
+--- a/util/grub.d/10_hurd.in 2018-11-24 17:13:02.000000000 +0000
++++ b/util/grub.d/10_hurd.in 2022-10-05 02:02:09.500500296 +0100
+@@ -168,7 +168,7 @@
+ hurd_entry "$kernel" advanced
+ hurd_entry "$kernel" recovery
+
+- kernels=`echo $kernels | tr ' ' '\n' | fgrep -vx "$kernel" | tr '\n' ' '`
++ kernels=`echo $kernels | tr ' ' '\n' | grep -Fvx "$kernel" | tr '\n' ' '`
+ done
+
+ # If at least one kernel was found, then we need to
+diff -Nur a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
+--- a/util/grub.d/10_kfreebsd.in 2018-11-24 17:13:02.000000000 +0000
++++ b/util/grub.d/10_kfreebsd.in 2022-10-05 02:02:31.978500866 +0100
+@@ -231,7 +231,7 @@
+ kfreebsd_entry "${OS}" "${version}" recovery "-s"
+ fi
+
+- list=`echo $list | tr ' ' '\n' | fgrep -vx "$kfreebsd" | tr '\n' ' '`
++ list=`echo $list | tr ' ' '\n' | grep -Fvx "$kfreebsd" | tr '\n' ' '`
+ done
+
+ # If at least one kernel was found, then we need to
+diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+--- a/util/grub.d/10_linux.in 2018-11-24 17:13:02.000000000 +0000
++++ b/util/grub.d/10_linux.in 2022-10-05 02:01:43.687499640 +0100
+@@ -282,7 +282,7 @@
+ "single ${GRUB_CMDLINE_LINUX}"
+ fi
+
+- list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
++ list=`echo $list | tr ' ' '\n' | grep -Fvx "$linux" | tr '\n' ' '`
+ done
+
+ # If at least one kernel was found, then we need to
+diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+--- a/util/grub.d/20_linux_xen.in 2019-04-23 09:54:47.000000000 +0100
++++ b/util/grub.d/20_linux_xen.in 2022-10-05 02:00:13.501497350 +0100
+@@ -310,12 +310,12 @@
+ "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}"
+ fi
+
+- list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
++ list=`echo $list | tr ' ' '\n' | grep -Fvx "$linux" | tr '\n' ' '`
+ done
+ if [ x"$is_top_level" != xtrue ]; then
+ echo ' }'
+ fi
+- xen_list=`echo $xen_list | tr ' ' '\n' | fgrep -vx "$current_xen" | tr '\n' ' '`
++ xen_list=`echo $xen_list | tr ' ' '\n' | grep -Fvx "$current_xen" | tr '\n' ' '`
+ done
+
+ # If at least one kernel was found, then we need to
diff --git a/sys-boot/grub/grub-2.04-r11.ebuild b/sys-boot/grub/grub-2.04-r12.ebuild
index 3e439983..286d5017 100644
--- a/sys-boot/grub/grub-2.04-r11.ebuild
+++ b/sys-boot/grub/grub-2.04-r12.ebuild
@@ -42,6 +42,7 @@ PATCHES=(
"${FILESDIR}"/01-gfxpayload.patch
"${FILESDIR}"/02-KERNEL_GLOBS.patch
"${FILESDIR}"/03-sparc64-bios-boot.patch
+ "${FILESDIR}"/04-fgrep.patch
)
DEJAVU=dejavu-sans-ttf-2.37