[PR PATCH] grub: patch out creation of OS X menu entries on non-x86

[PR PATCH] grub: patch out creation of OS X menu entries on non-x86

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 420 bytes --]

There is a new pull request by q66 against master on the void-packages repository

https://github.com/void-power/void-packages grub-osx
https://github.com/void-linux/void-packages/pull/12046

grub: patch out creation of OS X menu entries on non-x86
@pullmoll, can you test this on your Mac machine? It should do the right thing.

A patch file from https://github.com/void-linux/void-packages/pull/12046.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-grub-osx-12046.patch --]
[-- Type: application/text/x-diff, Size: 1656 bytes --]

From a1ef2da8edf2f23b1e240a8bd2843664ef8928c0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 31 May 2019 02:08:17 +0200
Subject: [PATCH] grub: patch out creation of OS X menu entries on non-x86

---
 srcpkgs/grub/patches/os-prober-osx86.patch | 16 ++++++++++++++++
 srcpkgs/grub/template                      |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/grub/patches/os-prober-osx86.patch

diff --git a/srcpkgs/grub/patches/os-prober-osx86.patch b/srcpkgs/grub/patches/os-prober-osx86.patch
new file mode 100644
index 00000000000..70028c80d48
--- /dev/null
+++ b/srcpkgs/grub/patches/os-prober-osx86.patch
@@ -0,0 +1,16 @@
+Patches OS X detection out of os-prober hook on non-x86 architectures. The
+menu entries generated for those are invalid for non-x86 Mac stuff.
+--- util/grub.d/30_os-prober.in
++++ util/grub.d/30_os-prober.in
+@@ -42,6 +42,11 @@ if [ -z "${OSPROBED}" ] ; then
+ fi
+ 
+ osx_entry() {
++    # GRUB load OS X outside of x86, no entry
++    case "x`uname -m`" in
++        xi?86|xx86_64) ;;
++        *) return ;;
++    esac
+     if [ x$2 = x32 ]; then
+         # TRANSLATORS: it refers to kernel architecture (32-bit)
+ 	bitstr="$(gettext "(32-bit)")"
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 97ce99b71ff..c14322f4ed4 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.02
-revision=5
+revision=6
 hostmakedepends="flex freetype-devel font-unifont-bdf"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"

Re: [PR PATCH] [Updated] grub: patch out creation of OS X menu entries on non-x86

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 425 bytes --]

There is an updated pull request by q66 against master on the void-packages repository

https://github.com/void-power/void-packages grub-osx
https://github.com/void-linux/void-packages/pull/12046

grub: patch out creation of OS X menu entries on non-x86
@pullmoll, can you test this on your Mac machine? It should do the right thing.

A patch file from https://github.com/void-linux/void-packages/pull/12046.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-grub-osx-12046.patch --]
[-- Type: application/text/x-diff, Size: 1672 bytes --]

From 634c8aba93eb8dc7a28d4e1f356add16c577fce6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 31 May 2019 02:08:17 +0200
Subject: [PATCH] grub: patch out creation of OS X menu entries on non-x86

[ci skip]
---
 srcpkgs/grub/patches/os-prober-osx86.patch | 16 ++++++++++++++++
 srcpkgs/grub/template                      |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/grub/patches/os-prober-osx86.patch

diff --git a/srcpkgs/grub/patches/os-prober-osx86.patch b/srcpkgs/grub/patches/os-prober-osx86.patch
new file mode 100644
index 00000000000..5fabbeb6d99
--- /dev/null
+++ b/srcpkgs/grub/patches/os-prober-osx86.patch
@@ -0,0 +1,16 @@
+Patches OS X detection out of os-prober hook on non-x86 architectures. The
+menu entries generated for those are invalid for non-x86 Mac stuff.
+--- util/grub.d/30_os-prober.in
++++ util/grub.d/30_os-prober.in
+@@ -42,6 +42,11 @@ if [ -z "${OSPROBED}" ] ; then
+ fi
+ 
+ osx_entry() {
++    # GRUB won't load OS X outside of x86, no entry
++    case "x`uname -m`" in
++        xi?86|xx86_64) ;;
++        *) return ;;
++    esac
+     if [ x$2 = x32 ]; then
+         # TRANSLATORS: it refers to kernel architecture (32-bit)
+ 	bitstr="$(gettext "(32-bit)")"
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 97ce99b71ff..c14322f4ed4 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.02
-revision=5
+revision=6
 hostmakedepends="flex freetype-devel font-unifont-bdf"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"

Re: [PR PATCH] [Updated] grub: patch out creation of OS X menu entries on non-x86

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 425 bytes --]

There is an updated pull request by q66 against master on the void-packages repository

https://github.com/void-power/void-packages grub-osx
https://github.com/void-linux/void-packages/pull/12046

grub: patch out creation of OS X menu entries on non-x86
@pullmoll, can you test this on your Mac machine? It should do the right thing.

A patch file from https://github.com/void-linux/void-packages/pull/12046.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-grub-osx-12046.patch --]
[-- Type: application/text/x-diff, Size: 1672 bytes --]

From 634c8aba93eb8dc7a28d4e1f356add16c577fce6 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 31 May 2019 02:08:17 +0200
Subject: [PATCH] grub: patch out creation of OS X menu entries on non-x86

[ci skip]
---
 srcpkgs/grub/patches/os-prober-osx86.patch | 16 ++++++++++++++++
 srcpkgs/grub/template                      |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/grub/patches/os-prober-osx86.patch

diff --git a/srcpkgs/grub/patches/os-prober-osx86.patch b/srcpkgs/grub/patches/os-prober-osx86.patch
new file mode 100644
index 00000000000..5fabbeb6d99
--- /dev/null
+++ b/srcpkgs/grub/patches/os-prober-osx86.patch
@@ -0,0 +1,16 @@
+Patches OS X detection out of os-prober hook on non-x86 architectures. The
+menu entries generated for those are invalid for non-x86 Mac stuff.
+--- util/grub.d/30_os-prober.in
++++ util/grub.d/30_os-prober.in
+@@ -42,6 +42,11 @@ if [ -z "${OSPROBED}" ] ; then
+ fi
+ 
+ osx_entry() {
++    # GRUB won't load OS X outside of x86, no entry
++    case "x`uname -m`" in
++        xi?86|xx86_64) ;;
++        *) return ;;
++    esac
+     if [ x$2 = x32 ]; then
+         # TRANSLATORS: it refers to kernel architecture (32-bit)
+ 	bitstr="$(gettext "(32-bit)")"
diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template
index 97ce99b71ff..c14322f4ed4 100644
--- a/srcpkgs/grub/template
+++ b/srcpkgs/grub/template
@@ -1,7 +1,7 @@
 # Template file for 'grub'
 pkgname=grub
 version=2.02
-revision=5
+revision=6
 hostmakedepends="flex freetype-devel font-unifont-bdf"
 makedepends="libusb-compat-devel ncurses-devel freetype-devel
  liblzma-devel device-mapper-devel fuse-devel"

Re: [PR PATCH] [Closed]: grub: patch out creation of OS X menu entries on non-x86

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

There's a closed pull request on the void-packages repository

grub: patch out creation of OS X menu entries on non-x86
https://github.com/void-linux/void-packages/pull/12046
Description: @pullmoll, can you test this on your Mac machine? It should do the right thing.