241a8b0615
As reported on the mailing list [1], TestPolkitSystemd and
TestPolkitInitd are failing since we bumped the Bootlin toolchain
2023.08 [2].
The issue is caused by expat (XML library) package detecting
arc4random_buf() introduced by glibc 2.36 [3].
With arc4random_buf() support enabled, expat hang Polkit while reading
its policy files (XML files) due to a lack of entropy on the system.
Upgrading the kernel allows to avoid such issue thanks to
random_get_entropy_fallback() introduced in 5.10.119 (backpored) [4].
Build the vexpress-v2p-ca9 (armv7) 5.10.202 using the kernel
configuration file found in /proc/config.gz but with additional kernel
options provided by SYSTEMD_LINUX_CONFIG_FIXUPS. Indeed some kernel
options requested by systemd were missing in 5.10.7 kernel.
Build the versatile-pb (armv5) kernel using the same kernel
configuration as qemu_arm_versatile_defconfig but with additional
kernel options like for vexpress-v2p-ca9. While at it, enable
IKCONFIG_PROC option to provide the kernel configuration at runtime
in /proc/config.gz.
Runtime tested:
https://gitlab.com/kubu93/buildroot/-/pipelines/1097887826 (tests.package.test_polkit.TestPolkit*)
https://gitlab.com/kubu93/buildroot/-/pipelines/1097705399 (tests.init.*)
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/5689309948 (TestPolkitSystemd)
https://gitlab.com/buildroot.org/buildroot/-/jobs/5689309947 (TestPolkitInitd)
[1] http://lists.busybox.net/pipermail/buildroot/2023-December/680445.html
[2] 452365a385
[3] https://sourceware.org/git/?p=glibc.git;a=commit;h=6f4e0fcfa2d2b0915816a3a3a1d48b4763a7dee2
[4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fdca775081527364621857957655207d83035376
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
129 lines
5.0 KiB
Python
129 lines
5.0 KiB
Python
import pexpect
|
|
|
|
import infra
|
|
|
|
|
|
class Emulator(object):
|
|
|
|
def __init__(self, builddir, downloaddir, logtofile, timeout_multiplier):
|
|
self.qemu = None
|
|
self.downloaddir = downloaddir
|
|
self.logfile = infra.open_log_file(builddir, "run", logtofile)
|
|
# We use elastic runners on the cloud to runs our tests. Those runners
|
|
# can take a long time to run the emulator. Use a timeout multiplier
|
|
# when running the tests to avoid sporadic failures.
|
|
self.timeout_multiplier = timeout_multiplier
|
|
|
|
# Start Qemu to boot the system
|
|
#
|
|
# arch: Qemu architecture to use
|
|
#
|
|
# kernel: path to the kernel image, or the special string
|
|
# 'builtin'. 'builtin' means a pre-built kernel image will be
|
|
# downloaded from ARTIFACTS_URL and suitable options are
|
|
# automatically passed to qemu and added to the kernel cmdline. So
|
|
# far only armv5, armv7 and i386 builtin kernels are available.
|
|
# If None, then no kernel is used, and we assume a bootable device
|
|
# will be specified.
|
|
#
|
|
# kernel_cmdline: array of kernel arguments to pass to Qemu -append option
|
|
#
|
|
# options: array of command line options to pass to Qemu
|
|
#
|
|
def boot(self, arch, kernel=None, kernel_cmdline=None, options=None):
|
|
if arch in ["armv7", "armv5"]:
|
|
qemu_arch = "arm"
|
|
else:
|
|
qemu_arch = arch
|
|
|
|
qemu_cmd = ["qemu-system-{}".format(qemu_arch),
|
|
"-serial", "stdio",
|
|
"-display", "none",
|
|
"-m", "256"]
|
|
|
|
if options:
|
|
qemu_cmd += options
|
|
|
|
if kernel_cmdline is None:
|
|
kernel_cmdline = []
|
|
|
|
if kernel:
|
|
if kernel == "builtin":
|
|
if arch in ["armv7", "armv5"]:
|
|
kernel_cmdline.append("console=ttyAMA0")
|
|
|
|
if arch == "armv7":
|
|
kernel = infra.download(self.downloaddir,
|
|
"kernel-vexpress-5.10.202")
|
|
dtb = infra.download(self.downloaddir,
|
|
"vexpress-v2p-ca9-5.10.202.dtb")
|
|
qemu_cmd += ["-dtb", dtb]
|
|
qemu_cmd += ["-M", "vexpress-a9"]
|
|
elif arch == "armv5":
|
|
kernel = infra.download(self.downloaddir,
|
|
"kernel-versatile-5.10.202")
|
|
dtb = infra.download(self.downloaddir,
|
|
"versatile-pb-5.10.202.dtb")
|
|
qemu_cmd += ["-dtb", dtb]
|
|
qemu_cmd += ["-M", "versatilepb"]
|
|
qemu_cmd += ["-device", "virtio-rng-pci"]
|
|
|
|
qemu_cmd += ["-kernel", kernel]
|
|
|
|
if kernel_cmdline:
|
|
qemu_cmd += ["-append", " ".join(kernel_cmdline)]
|
|
|
|
self.logfile.write("> starting qemu with '%s'\n" % " ".join(qemu_cmd))
|
|
self.qemu = pexpect.spawn(qemu_cmd[0], qemu_cmd[1:],
|
|
timeout=5 * self.timeout_multiplier,
|
|
encoding='utf-8',
|
|
codec_errors='replace',
|
|
env={"QEMU_AUDIO_DRV": "none"})
|
|
# We want only stdout into the log to avoid double echo
|
|
self.qemu.logfile_read = self.logfile
|
|
|
|
# Wait for the login prompt to appear, and then login as root with
|
|
# the provided password, or no password if not specified.
|
|
def login(self, password=None, timeout=60):
|
|
# The login prompt can take some time to appear when running multiple
|
|
# instances in parallel, so set the timeout to a large value
|
|
index = self.qemu.expect(["buildroot login:", pexpect.TIMEOUT],
|
|
timeout=timeout * self.timeout_multiplier)
|
|
if index != 0:
|
|
self.logfile.write("==> System does not boot")
|
|
raise SystemError("System does not boot")
|
|
|
|
self.qemu.sendline("root")
|
|
if password:
|
|
self.qemu.expect("Password:")
|
|
self.qemu.sendline(password)
|
|
index = self.qemu.expect(["# ", pexpect.TIMEOUT])
|
|
if index != 0:
|
|
raise SystemError("Cannot login")
|
|
self.run("dmesg -n 1")
|
|
# Prevent the shell from wrapping the commands at 80 columns.
|
|
self.run("stty columns 29999")
|
|
|
|
# Run the given 'cmd' with a 'timeout' on the target
|
|
# return a tuple (output, exit_code)
|
|
def run(self, cmd, timeout=-1):
|
|
self.qemu.sendline(cmd)
|
|
if timeout != -1:
|
|
timeout *= self.timeout_multiplier
|
|
self.qemu.expect("# ", timeout=timeout)
|
|
# Remove double carriage return from qemu stdout so str.splitlines()
|
|
# works as expected.
|
|
output = self.qemu.before.replace("\r\r", "\r").splitlines()[1:]
|
|
|
|
self.qemu.sendline("echo $?")
|
|
self.qemu.expect("# ")
|
|
exit_code = self.qemu.before.splitlines()[2]
|
|
exit_code = int(exit_code)
|
|
|
|
return output, exit_code
|
|
|
|
def stop(self):
|
|
if self.qemu is None:
|
|
return
|
|
self.qemu.terminate(force=True)
|