[PR PATCH] yaboot: restrict archs so it's not available for ppc64le, yaboot-bin: remove

[voidlinux-github@inbox.vuxu.org]

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

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

https://github.com/void-ppc/void-packages yaboot-drop
https://github.com/void-linux/void-packages/pull/15845

yaboot: restrict archs so it's not available for ppc64le, yaboot-bin: remove
I've tested this and the compiled version can boot off ext2 and stuff no problem. So we should be able to easily drop the -bin version, which is broken in its own ways anyway.

@pullmoll

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yaboot-drop-15845.patch --]
[-- Type: text/x-diff, Size: 1996 bytes --]

From be9f414d063e2ae395f5e35a957abaaf9f0475dd Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 28 Oct 2019 02:06:02 +0100
Subject: [PATCH 1/2] yaboot: restrict archs (no LE)

---
 srcpkgs/yaboot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yaboot/template b/srcpkgs/yaboot/template
index e7a5fa03fdf..ede26e2d7f7 100644
--- a/srcpkgs/yaboot/template
+++ b/srcpkgs/yaboot/template
@@ -2,7 +2,7 @@
 pkgname=yaboot
 version=1.3.17
 revision=1
-archs="ppc*"
+archs="ppc64 ppc64-musl ppc ppc-musl"
 build_style=gnu-makefile
 hostmakedepends="autoconf automake"
 depends="powerpc-utils hfsutils"

From 2d6eca302da9437449659a8eeb96447ce90079db Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 28 Oct 2019 03:20:26 +0100
Subject: [PATCH 2/2] yaboot-bin: remove

This has been replaced by yaboot.

[ci skip]
---
 srcpkgs/yaboot-bin/template | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 srcpkgs/yaboot-bin/template

diff --git a/srcpkgs/yaboot-bin/template b/srcpkgs/yaboot-bin/template
deleted file mode 100644
index d9d1291c506..00000000000
--- a/srcpkgs/yaboot-bin/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'yaboot-bin'
-pkgname=yaboot-bin
-version=1.3.17
-revision=1
-_deb_rev=4
-archs="ppc*"
-short_desc="Bootloader for PowerMac and IBM CHRP computers"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.debian.org/YaBoot"
-distfiles="https://cdimage.debian.org/cdimage/cd-sources/yaboot_${version}-${_deb_rev}_powerpc.deb"
-checksum=8d043a8aaeee452ae011d475a6da93c79b461c14d3fd232050e93302de63cdcb
-nopie=yes
-
-do_extract() {
-	ar x ${XBPS_SRCDISTDIR}/${pkgname}-${version}/yaboot_${version}-${_deb_rev}_powerpc.deb
-	tar xf data.tar.xz
-}
-
-do_install() {
-	vmkdir usr
-	cp -a usr/* "${DESTDIR}"/usr
-	mv "${DESTDIR}"/usr/{s,}bin
-
-	# Remove unused files
-	rm -rf "${DESTDIR}"/usr/share/lintian
-}