aportgen device-*: don't use noarch anymore

Use the device's architecture instead of noarch. Because the device
packages should never be built for other architectures, even if all
depends can be built for other arches as well.

This simplifies package building as part of the new build
infrastructure effort.

All existing pmaports will be changed shortly, along with a test case
in pmaports.
This commit is contained in:
Oliver Smith 2018-11-07 07:36:05 +01:00
parent e458b1fdbc
commit 71aca78746
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
2 changed files with 3 additions and 3 deletions

View File

@ -203,8 +203,8 @@ def generate_apkbuild(args, pkgname, name, arch, flash_method):
pkgrel=0
url="https://postmarketos.org"
license="MIT"
arch="noarch"
options="!check"
arch=\"""" + arch + """\"
options="!check !archcheck"
depends=\"""" + depends + """\"
makedepends="devicepkg-dev"
source="deviceinfo"

View File

@ -135,7 +135,7 @@ def test_aportgen_device_wizard(args, monkeypatch):
# Build the device package
pkgname = "device-testsuite-testdevice"
pmb.build.checksum(args, pkgname)
pmb.build.package(args, pkgname, "x86_64", force=True)
pmb.build.package(args, pkgname, "armhf", force=True)
# Abort on overwrite confirmation
answers["overwrite"] = "n"