[PR PATCH] os-prober: fix the way scripts are installed for different archs

[PR PATCH] os-prober: fix the way scripts are installed for different archs

[voidlinux-github]

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

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

https://github.com/void-power/void-packages os-prober
https://github.com/void-linux/void-packages/pull/12045

os-prober: fix the way scripts are installed for different archs
The old way simply installed stuff for all as if they were x86, the new way follows what the Debian scripts do.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-os-prober-12045.patch --]
[-- Type: application/text/x-diff, Size: 1844 bytes --]

From 0cd73f2b50e3b60ec9e13986c21a72e225ef537b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 31 May 2019 02:06:03 +0200
Subject: [PATCH] os-prober: fix the way scripts are installed for different
 archs

The old way simply installed stuff for all as if they were x86,
the new way follows what the Debian scripts do.
---
 srcpkgs/os-prober/template | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template
index 1947724669f..5433bc9ecce 100644
--- a/srcpkgs/os-prober/template
+++ b/srcpkgs/os-prober/template
@@ -1,7 +1,7 @@
 # Template file for 'os-prober'
 pkgname=os-prober
 version=1.77
-revision=1
+revision=2
 build_style=gnu-makefile
 make_dirs="/var/lib/os-prober 0755 root root"
 short_desc="Utility to detect other OSes on a set of drives"
@@ -11,6 +11,12 @@ homepage="https://packages.debian.org/sid/os-prober"
 distfiles="${DEBIAN_SITE}/main/o/${pkgname}/${pkgname}_${version}.tar.xz"
 checksum=8d8ea4afbe1aeef3c8b73f74a0fb37b06185e21a6abc78f80fc2160009cf705f
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*) _ARCH="x86";;
+	ppc*) _ARCH="powerpc";;
+	*) ;;
+esac
+
 do_install() {
 	vbin linux-boot-prober
 	vbin os-prober
@@ -20,7 +26,9 @@ do_install() {
 	for dir in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do
 		vmkdir usr/lib/${dir}
 		install -m755 -t ${DESTDIR}/usr/lib/${dir} ${dir}/common/*
-		[ -d ${dir}/x86 ] && cp -r ${dir}/x86/* ${DESTDIR}/usr/lib/${dir}
+		[ -n "$_ARCH" -a -d ${dir}/${_ARCH} ] && cp -r ${dir}/${_ARCH}/* ${DESTDIR}/usr/lib/${dir}
 	done
-	vinstall os-probes/mounted/powerpc/20macosx 755 usr/lib/os-probes/mounted
+	if [ -n "$_ARCH" -a "$_ARCH" = "x86" ]; then
+		vinstall os-probes/mounted/powerpc/20macosx 755 usr/lib/os-probes/mounted
+	fi
 }

Re: os-prober: fix the way scripts are installed for different archs

[voidlinux-github]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/12045#issuecomment-497668850
Comment:
Now `update-grub` still tells the use e.g. `Found Mac OS X on /dev/sdb4` or similar while there is no longer a grub menu entry for OS X.

Re: os-prober: fix the way scripts are installed for different archs

[voidlinux-github]

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/12045#issuecomment-497669293
Comment:
You have the grub patch applied too, right? `os-prober` is meant to find it, as it's obviously there, but it's the grub patch that prevents the entries from being generated, as grub cannot handle it

Re: os-prober: fix the way scripts are installed for different archs

[voidlinux-github]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/12045#issuecomment-497669927
Comment:
I have only the grub patch applied, stupid me. I'll update os-prober as well but it looks good.
How do we test it still works for x86_64 and OS X? ;-P

Re: os-prober: fix the way scripts are installed for different archs

[voidlinux-github]

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/12045#issuecomment-497670683
Comment:
Write a fake `uname` wrapper? :P

Re: os-prober: fix the way scripts are installed for different archs

[voidlinux-github]

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/12045#issuecomment-497671182
Comment:
That said, the `case` here is taken directly from another grub hook script so I don't see that not working 

Re: os-prober: fix the way scripts are installed for different archs

[voidlinux-github]

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

New comment by pullmoll on void-packages repository

https://github.com/void-linux/void-packages/pull/12045#issuecomment-497672003
Comment:
I think that for the improbable case the grub PR would break it for people running Void + Mac OS X on x86_64 hardware we would see them open an issue. IMO the two PRs are good to merge.

Re: [PR PATCH] [Closed]: os-prober: fix the way scripts are installed for different archs

[voidlinux-github]

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

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

os-prober: fix the way scripts are installed for different archs
https://github.com/void-linux/void-packages/pull/12045
Description: The old way simply installed stuff for all as if they were x86, the new way follows what the Debian scripts do.