Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

Enable armv7 (!1730)

Browse source 
I need to do some more work on pmaports in order for this to actually
be useful.
This commit is contained in:
Grant Miller 2018-12-12 14:22:27 -06:00 • committed by Oliver Smith
parent e2c38a2e31
commit dfaca1e06f
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pmb/config/__init__.py
View file

@ -156,7 +156,7 @@ apkindex_retention_time = 4
# specify architectures supported by Alpine here. Fro cross-compiling, # specify architectures supported by Alpine here. Fro cross-compiling,
# we need to generate the "musl-$ARCH", "binutils-$ARCH" and "gcc-$ARCH" # we need to generate the "musl-$ARCH", "binutils-$ARCH" and "gcc-$ARCH"
# packages (use "pmbootstrap aportgen musl-armhf" etc.). # 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 # Packages, that will be installed in a chroot before it builds packages
# for the first time # for the first time
@ -178,7 +178,7 @@ necessary_kconfig_options = {
"VT": True, "VT": True,
"USE_VFB": False, "USE_VFB": False,
}, },
"armhf x86": { "armhf armv7 x86": {
"LBDAF": True "LBDAF": True
} }
} }

4
pmb/parse/arch.py
View file

@ -28,7 +28,7 @@ def alpine_native():
"i686": "x86", "i686": "x86",
"x86_64": "x86_64", "x86_64": "x86_64",
"aarch64": "aarch64", "aarch64": "aarch64",
"armv7l": "armhf" "armv7l": "armv7"
} }
if machine in mapping: if machine in mapping:
return mapping[machine] return mapping[machine]
@ -58,6 +58,7 @@ def alpine_to_qemu(arch):
"x86": "i386", "x86": "i386",
"x86_64": "x86_64", "x86_64": "x86_64",
"armhf": "arm", "armhf": "arm",
"armv7": "arm",
"aarch64": "aarch64", "aarch64": "aarch64",
} }
for pattern, arch_qemu in mapping.items(): for pattern, arch_qemu in mapping.items():
@ -135,6 +136,7 @@ def uname_to_qemu(arch):
"armeb": "arm", "armeb": "arm",
"armel": "arm", "armel": "arm",
"armhf": "arm", "armhf": "arm",
"armv7l": "arm",
"x86_64": "x86_64", "x86_64": "x86_64",
"amd64": "x86_64", "amd64": "x86_64",
} }

2
test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD vendored
View file

@ -12,7 +12,7 @@ depends=""
makedepends_build="" makedepends_build=""
makedepends_host="" makedepends_host=""
makedepends="gettext libtool autoconf automake bison" 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" license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD"
subpackages="" subpackages=""
source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2 source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2