Skip to content

Commit

Permalink
support/testing: add builtin armv5 kernel 4.19 with entropy
Browse files Browse the repository at this point in the history
More and more packages being tested by the test infra, e.g. syslog-ng,
need entropy at startup, usually reading from /dev/random.

Some test cases can also depend on a kernel version newer than the
builtin ones already provided by the test infra:
 - 3.11.0 for armv5;
 - 4.0.0 for armv7.

Add a new builtin kernel to be used by such test cases.
Add it for armv5 so most test cases that switch to use this kernel can
keep using BASIC_TOOLCHAIN_CONFIG.
Use the same kernel version and kernel config as qemu_arm_versatile plus
HW_RANDOM_VIRTIO for VirtIORNG to be usable.
Copy the actual binary file from the syslog-ng runtime test at current
master @ 29e1cb8.

Since there is already a 'kernel-versatile' file on autobuild.buildroot.net
and we must keep it with this name for reproducibility purposes, create a
simple naming convention for newer builtin kernel images and dtb files:
kernel-<defconfig>-<kernel_series_version>
<dtb_name>-<kernel_series_version>.dtb
Pass '-device virtio-rng-pci' to qemu when this kernel is used.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Romain Naour <romain.naour@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
[Peter: use this new kernel instead of the old builtin/armv5 kernel]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  • Loading branch information
ricardo-martincoski authored and jacmet committed Aug 3, 2019
1 parent 3360401 commit 7acb32d
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion support/testing/infra/emulator.py
Expand Up @@ -61,8 +61,12 @@ def boot(self, arch, kernel=None, kernel_cmdline=None, options=None):
qemu_cmd += ["-M", "vexpress-a9"]
elif arch == "armv5":
kernel = infra.download(self.downloaddir,
"kernel-versatile")
"kernel-versatile-4.19")
dtb = infra.download(self.downloaddir,
"versatile-pb-4.19.dtb")
qemu_cmd += ["-dtb", dtb]
qemu_cmd += ["-M", "versatilepb"]
qemu_cmd += ["-device", "virtio-rng-pci"]

qemu_cmd += ["-kernel", kernel]

Expand Down

0 comments on commit 7acb32d

Please sign in to comment.