From 1915c4ecb3c7aa9cb750e2ab3360e7d9f2da67f6 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Wed, 29 Jul 2020 12:46:19 +0200
Subject: [PATCH] cross/*: limit arches to x86_64 where makes sense

Run "pmbootstrap aportgen" on these packages with pmbootstrap!1965 and
pmbootstrap!1963 applied. [ci:skip-build], [ci:skip-vercheck]
---
 cross/binutils-aarch64/APKBUILD       |  6 ++----
 cross/binutils-armhf/APKBUILD         |  6 ++----
 cross/binutils-armv7/APKBUILD         |  6 ++----
 cross/busybox-static-aarch64/APKBUILD |  2 +-
 cross/busybox-static-armhf/APKBUILD   |  2 +-
 cross/busybox-static-armv7/APKBUILD   |  2 +-
 cross/grub-efi-x86/APKBUILD           | 14 +++++++-------
 cross/musl-aarch64/APKBUILD           |  4 ++--
 cross/musl-armhf/APKBUILD             |  4 ++--
 cross/musl-armv7/APKBUILD             |  4 ++--
 10 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/cross/binutils-aarch64/APKBUILD b/cross/binutils-aarch64/APKBUILD
index 76d7e0b70..e06b809c2 100644
--- a/cross/binutils-aarch64/APKBUILD
+++ b/cross/binutils-aarch64/APKBUILD
@@ -2,22 +2,20 @@
 # Generator: pmbootstrap aportgen binutils-aarch64
 # Based on: main/binutils
 
-
-builddir="$srcdir/binutils-2.34"
-
 pkgname=binutils-aarch64
 pkgver=2.34
 pkgrel=1
 pkgdesc="Tools necessary to build programs for aarch64 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
-arch="armhf armv7 x86_64 x86"
+arch="x86_64"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
 	gold-mips.patch
 	ld-bfd-mips.patch
 	"
+builddir="$srcdir/binutils-$pkgver"
 
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
diff --git a/cross/binutils-armhf/APKBUILD b/cross/binutils-armhf/APKBUILD
index c787e12e9..b29da7bb9 100644
--- a/cross/binutils-armhf/APKBUILD
+++ b/cross/binutils-armhf/APKBUILD
@@ -2,22 +2,20 @@
 # Generator: pmbootstrap aportgen binutils-armhf
 # Based on: main/binutils
 
-
-builddir="$srcdir/binutils-2.34"
-
 pkgname=binutils-armhf
 pkgver=2.34
 pkgrel=1
 pkgdesc="Tools necessary to build programs for armhf targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
-arch="armv7 aarch64 x86_64 x86"
+arch="x86_64"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
 	gold-mips.patch
 	ld-bfd-mips.patch
 	"
+builddir="$srcdir/binutils-$pkgver"
 
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
diff --git a/cross/binutils-armv7/APKBUILD b/cross/binutils-armv7/APKBUILD
index 6f4983cf3..52be64d0f 100644
--- a/cross/binutils-armv7/APKBUILD
+++ b/cross/binutils-armv7/APKBUILD
@@ -2,22 +2,20 @@
 # Generator: pmbootstrap aportgen binutils-armv7
 # Based on: main/binutils
 
-
-builddir="$srcdir/binutils-2.34"
-
 pkgname=binutils-armv7
 pkgver=2.34
 pkgrel=1
 pkgdesc="Tools necessary to build programs for armv7 targets"
 url="https://www.gnu.org/software/binutils/"
 makedepends="gettext libtool autoconf automake bison texinfo"
-arch="armhf aarch64 x86_64 x86"
+arch="x86_64"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz
 	binutils-ld-fix-static-linking.patch
 	gold-mips.patch
 	ld-bfd-mips.patch
 	"
+builddir="$srcdir/binutils-$pkgver"
 
 if [ "$CHOST" != "$CTARGET" ]; then
 	pkgname="binutils-$CTARGET_ARCH"
diff --git a/cross/busybox-static-aarch64/APKBUILD b/cross/busybox-static-aarch64/APKBUILD
index f4a4e85da..079c5f557 100644
--- a/cross/busybox-static-aarch64/APKBUILD
+++ b/cross/busybox-static-aarch64/APKBUILD
@@ -15,7 +15,7 @@ _mirror="http://dl-2.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
-arch="all"
+arch="x86_64"
 options="!check !strip"
 pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"
diff --git a/cross/busybox-static-armhf/APKBUILD b/cross/busybox-static-armhf/APKBUILD
index 2020e5c37..00d4c7abd 100644
--- a/cross/busybox-static-armhf/APKBUILD
+++ b/cross/busybox-static-armhf/APKBUILD
@@ -15,7 +15,7 @@ _mirror="http://dl-2.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
-arch="all"
+arch="x86_64"
 options="!check !strip"
 pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"
diff --git a/cross/busybox-static-armv7/APKBUILD b/cross/busybox-static-armv7/APKBUILD
index e399f19ac..d8c7e6c9d 100644
--- a/cross/busybox-static-armv7/APKBUILD
+++ b/cross/busybox-static-armv7/APKBUILD
@@ -15,7 +15,7 @@ _mirror="http://dl-2.alpinelinux.org/alpine/"
 
 url="http://busybox.net"
 license="GPL2"
-arch="all"
+arch="x86_64"
 options="!check !strip"
 pkgdesc="Statically linked Busybox for $_arch"
 _target="$(arch_to_hostspec $_arch)"
diff --git a/cross/grub-efi-x86/APKBUILD b/cross/grub-efi-x86/APKBUILD
index 199ea8b3a..48cf85f17 100644
--- a/cross/grub-efi-x86/APKBUILD
+++ b/cross/grub-efi-x86/APKBUILD
@@ -11,14 +11,14 @@ _mirror="http://dl-cdn.alpinelinux.org/alpine/"
 pkgdesc="GRUB $_arch EFI files for every architecture"
 url="https://www.gnu.org/software/grub/"
 license="GPL-3.0-or-later"
-arch="all"
-source="grub-efi-$pkgver-r$pkgrel-$_arch.apk::$_mirror/edge/main/$_arch/grub-efi-$pkgver-r$pkgrel.apk"
+arch="x86_64"
+source="grub-efi-$pkgver-r$pkgrel-$_arch-edge.apk::$_mirror/edge/main/$_arch/grub-efi-$pkgver-r$pkgrel.apk"
 
 package() {
-    mkdir -p "$pkgdir"
-    cd "$pkgdir"
-    tar -xf "$srcdir/grub-efi-$pkgver-r$pkgrel-$_arch.apk"
-    rm .PKGINFO .SIGN.*
+	mkdir -p "$pkgdir"
+	cd "$pkgdir"
+	tar -xf "$srcdir/grub-efi-$pkgver-r$pkgrel-$_arch-edge.apk"
+	rm .PKGINFO .SIGN.*
 }
 
-sha512sums="8e23fc49b18b1eb77e4350b03530b7d7427351a8148b37abb4fe4ce35f16edad14d24d04c165eaad7600c2f8e7c803906e13d2545be903593705b26010db05f6  grub-efi-2.04-r2-x86.apk"
+sha512sums="e14ab6a15a82d66fd38f4e9f99c280124d84fd3e714b261ecf9e7ae0f1b4d08401ecf49de16306fc40459fdd022a724335ab70ef652ff0b8c2f1a9c62531ba94  grub-efi-2.04-r2-x86-edge.apk"
diff --git a/cross/musl-aarch64/APKBUILD b/cross/musl-aarch64/APKBUILD
index ad839f2a5..9a14a969f 100644
--- a/cross/musl-aarch64/APKBUILD
+++ b/cross/musl-aarch64/APKBUILD
@@ -9,11 +9,11 @@ fi
 pkgname=musl-aarch64
 pkgver=1.2.0
 pkgrel=0
-arch="armhf armv7 x86_64 x86"
+arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"
 
 _arch="aarch64"
-_mirror="http://dl-cdn.alpinelinux.org/alpine/"
+_mirror="http://dl-2.alpinelinux.org/alpine/"
 
 url="https://musl-libc.org"
 license="MIT"
diff --git a/cross/musl-armhf/APKBUILD b/cross/musl-armhf/APKBUILD
index ebe6c56a2..c223e781c 100644
--- a/cross/musl-armhf/APKBUILD
+++ b/cross/musl-armhf/APKBUILD
@@ -9,11 +9,11 @@ fi
 pkgname=musl-armhf
 pkgver=1.2.0
 pkgrel=0
-arch="armv7 aarch64 x86_64 x86"
+arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"
 
 _arch="armhf"
-_mirror="http://dl-cdn.alpinelinux.org/alpine/"
+_mirror="http://dl-2.alpinelinux.org/alpine/"
 
 url="https://musl-libc.org"
 license="MIT"
diff --git a/cross/musl-armv7/APKBUILD b/cross/musl-armv7/APKBUILD
index 18e6df23a..31ff4d5ee 100644
--- a/cross/musl-armv7/APKBUILD
+++ b/cross/musl-armv7/APKBUILD
@@ -9,11 +9,11 @@ fi
 pkgname=musl-armv7
 pkgver=1.2.0
 pkgrel=0
-arch="armhf aarch64 x86_64 x86"
+arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"
 
 _arch="armv7"
-_mirror="http://dl-cdn.alpinelinux.org/alpine/"
+_mirror="http://dl-2.alpinelinux.org/alpine/"
 
 url="https://musl-libc.org"
 license="MIT"