Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-28 09:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use arch-test to determine local arch support

Browse Source 
Will work with qemu-user-static, if installed
This commit is contained in:
Michael R. Crusoe 2020-02-22 09:48:17 +01:00
parent d3a7eac62f
commit 5856b6a41f
No known key found for this signature in database
GPG Key ID: 3C26763F6C67E6E2
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/control vendored
View File

@ -76,6 +76,7 @@ Recommends:
quilt, quilt,
reportbug (>= 3.39ubuntu1), reportbug (>= 3.39ubuntu1),
ubuntu-keyring | ubuntu-archive-keyring, ubuntu-keyring | ubuntu-archive-keyring,
arch-test
Suggests: Suggests:
qemu-user-static, qemu-user-static,
Description: useful tools for Ubuntu developers Description: useful tools for Ubuntu developers

27
pbuilder-dist
View File

@ -29,7 +29,9 @@
# configurations. For example, a symlink called pbuilder-hardy will assume # configurations. For example, a symlink called pbuilder-hardy will assume
# that the target distribution is always meant to be Ubuntu Hardy. # that the target distribution is always meant to be Ubuntu Hardy.
import distutils.spawn
import os import os
import os.path
import subprocess import subprocess
import sys import sys
@ -440,11 +442,26 @@ def main():
if len(parts) > 2: if len(parts) > 2:
requested_arch = parts[2] requested_arch = parts[2]
elif len(args) > 0 and args[0] in ( elif len(args) > 0:
'alpha', 'amd64', 'arm', 'armeb', 'armel', 'armhf', 'arm64', if distutils.spawn.find_executable('arch-test'):
'i386', 'lpia', 'm68k', 'mips', 'mipsel', 'powerpc', 'ppc64', if subprocess.run(
'ppc64el', 'riscv64', 's390x', 'sh4', 'sh4eb', 'sparc', 'sparc64'): ['arch-test', args[0]],
requested_arch = args.pop(0) stdout=subprocess.DEVNULL).returncode == 0:
requested_arch = args.pop(0)
elif (os.path.isdir('/usr/lib/arch-test')
and args[0] in os.listdir('/usr/lib/arch-test/')):
Logger.error('Architecture "%s" is not supported on your '
'currently running kernal. Consider installing '
'the qemu-user-static package to enable the use of '
'foreign architectures.', args[0])
sys.exit(1)
else:
requested_arch = None
else:
Logger.error('Cannot determine if "%s" is a valid architecture. '
'Please install the arch-test package and retry.',
args[0])
sys.exit(1)
else: else:
requested_arch = None requested_arch = None