From dfaca1e06fb257076b46a04e890c688c94467f68 Mon Sep 17 00:00:00 2001
From: Grant Miller <GrantM11235@gmail.com>
Date: Wed, 12 Dec 2018 14:22:27 -0600
Subject: [PATCH] Enable armv7 (!1730)

I need to do some more work on pmaports in order for this to actually
be useful.
---
 pmb/config/__init__.py                                        | 4 ++--
 pmb/parse/arch.py                                             | 4 +++-
 test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py
index 4129783b..fd23180c 100644
--- a/pmb/config/__init__.py
+++ b/pmb/config/__init__.py
@@ -156,7 +156,7 @@ apkindex_retention_time = 4
 # specify architectures supported by Alpine here. Fro cross-compiling,
 # we need to generate the "musl-$ARCH", "binutils-$ARCH" and "gcc-$ARCH"
 # packages (use "pmbootstrap aportgen musl-armhf" etc.).
-build_device_architectures = ["armhf", "aarch64", "x86_64", "x86"]
+build_device_architectures = ["armhf", "armv7", "aarch64", "x86_64", "x86"]
 
 # Packages, that will be installed in a chroot before it builds packages
 # for the first time
@@ -178,7 +178,7 @@ necessary_kconfig_options = {
         "VT": True,
         "USE_VFB": False,
     },
-    "armhf x86": {
+    "armhf armv7 x86": {
         "LBDAF": True
     }
 }
diff --git a/pmb/parse/arch.py b/pmb/parse/arch.py
index 3bb80e53..b651ae6b 100644
--- a/pmb/parse/arch.py
+++ b/pmb/parse/arch.py
@@ -28,7 +28,7 @@ def alpine_native():
         "i686": "x86",
         "x86_64": "x86_64",
         "aarch64": "aarch64",
-        "armv7l": "armhf"
+        "armv7l": "armv7"
     }
     if machine in mapping:
         return mapping[machine]
@@ -58,6 +58,7 @@ def alpine_to_qemu(arch):
         "x86": "i386",
         "x86_64": "x86_64",
         "armhf": "arm",
+        "armv7": "arm",
         "aarch64": "aarch64",
     }
     for pattern, arch_qemu in mapping.items():
@@ -135,6 +136,7 @@ def uname_to_qemu(arch):
         "armeb": "arm",
         "armel": "arm",
         "armhf": "arm",
+        "armv7l": "arm",
         "x86_64": "x86_64",
         "amd64": "x86_64",
     }
diff --git a/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD b/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD
index 6df92b78..f567a309 100644
--- a/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD
+++ b/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD
@@ -12,7 +12,7 @@ depends=""
 makedepends_build=""
 makedepends_host=""
 makedepends="gettext libtool autoconf automake bison"
-arch="aarch64 x86_64 x86"
+arch="armv7 aarch64 x86_64 x86"
 license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
 subpackages=""
 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2