Merge "use the local WPILib copy"
diff --git a/aos/build/build.py b/aos/build/build.py
index f963f0f..ff85627 100755
--- a/aos/build/build.py
+++ b/aos/build/build.py
@@ -358,20 +358,27 @@
all_packages += ('wget', 'git', 'subversion', 'patch', 'unzip', 'bzip2')
# Necessary to build externals stuff.
all_packages += ('python', 'gcc', 'g++')
+ not_found = []
try:
# TODO(brians): Check versions too.
result = subprocess.check_output(
- ('dpkg-query', '--show') + all_packages,
+ ('dpkg-query',
+ r"--showformat='${binary:Package}\t${db:Status-Abbrev}\n'",
+ '--show') + all_packages,
stdin=open(os.devnull, 'r'),
stderr=subprocess.STDOUT)
+ for line in result.decode('utf-8').rstrip().splitlines(True):
+ match = re.match('^([^\t]+)\t[^i][^i]$', line)
+ if match:
+ not_found.append(match.group(1))
except subprocess.CalledProcessError as e:
output = e.output.decode('utf-8').rstrip()
- not_found = []
for line in output.splitlines(True):
match = re.match(r'dpkg-query: no packages found matching (.*)',
line)
if match:
not_found.append(match.group(1))
+ if not_found:
user_output('Some packages not installed: %s.' % ', '.join(not_found))
user_output('Try something like `sudo apt-get install %s`.' %
' '.join(not_found))
@@ -644,7 +651,6 @@
packages.add('ruby')
packages.add('clang-3.5')
packages.add('clang-format-3.5')
- packages.add('arm-eabi-gcc')
for platform in platforms:
if platform.architecture() == 'arm':
packages.add('gcc-4.7-arm-linux-gnueabihf')