* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
81 lines
2.3 KiB
Python
Executable File
81 lines
2.3 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
# This script expect to run from the Buildroot top directory.
|
|
|
|
import os
|
|
import pexpect
|
|
import sys
|
|
import time
|
|
|
|
|
|
def main():
|
|
if not (len(sys.argv) == 2):
|
|
print("Error: incorrect number of arguments")
|
|
print("""Usage: boot-qemu-image.py <qemu_arch_defconfig>""")
|
|
sys.exit(1)
|
|
|
|
# Ignore non Qemu defconfig
|
|
if not sys.argv[1].startswith('qemu_'):
|
|
sys.exit(0)
|
|
|
|
qemu_start = os.path.join(os.getcwd(), 'output/images/start-qemu.sh')
|
|
|
|
child = pexpect.spawn(qemu_start, ['serial-only'],
|
|
timeout=5, encoding='utf-8',
|
|
env={"QEMU_AUDIO_DRV": "none"})
|
|
|
|
# We want only stdout into the log to avoid double echo
|
|
child.logfile = sys.stdout
|
|
|
|
# Let the spawn actually try to fork+exec to the wrapper, and then
|
|
# let the wrapper exec the qemu process.
|
|
time.sleep(1)
|
|
|
|
try:
|
|
child.expect(["buildroot login:", pexpect.TIMEOUT], timeout=60)
|
|
except pexpect.EOF as e:
|
|
# Some emulations require a fork of qemu-system, which may be
|
|
# missing on the system, and is not provided by Buildroot.
|
|
# In this case, spawn above will succeed at starting the wrapper
|
|
# start-qemu.sh, but that one will fail (exit with 127) in such
|
|
# a situation.
|
|
exit = [int(l.split(' ')[1])
|
|
for l in e.value.splitlines()
|
|
if l.startswith('exitstatus: ')]
|
|
if len(exit) and exit[0] == 127:
|
|
print('qemu-start.sh could not find the qemu binary')
|
|
sys.exit(0)
|
|
print("Connection problem, exiting.")
|
|
sys.exit(1)
|
|
except pexpect.TIMEOUT:
|
|
print("System did not boot in time, exiting.")
|
|
sys.exit(1)
|
|
|
|
child.sendline("root\r")
|
|
|
|
try:
|
|
child.expect(["# ", pexpect.TIMEOUT], timeout=60)
|
|
except pexpect.EOF:
|
|
print("Cannot connect to shell")
|
|
sys.exit(1)
|
|
except pexpect.TIMEOUT:
|
|
print("Timeout while waiting for shell")
|
|
sys.exit(1)
|
|
|
|
child.sendline("poweroff\r")
|
|
|
|
try:
|
|
child.expect(["System halted", pexpect.TIMEOUT], timeout=60)
|
|
child.expect(pexpect.EOF)
|
|
except pexpect.EOF:
|
|
pass
|
|
except pexpect.TIMEOUT:
|
|
# Qemu may not exit properly after "System halted", ignore.
|
|
print("Cannot halt machine")
|
|
|
|
sys.exit(0)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|