Merge branch 'master' into deploy

Author: mpe

README.md

@@ -51,6 +51,7 @@ Different toolchains
 
 There are images for various toolchains, they are encoded in the distro name/version.
 
+ - `korg@12.2.0`: kernel.org gcc 12.2.0, binutils 2.39
  - `korg@12.1.0`: kernel.org gcc 12.1.0, binutils 2.38
  - `korg@11.3.0`: kernel.org gcc 11.3.0, binutils 2.38
  - `korg@11.1.0`: kernel.org gcc 11.1.0, binutils 2.36.1

build/Makefile

@@ -14,7 +14,7 @@ endif
 
 FEDORA_DISTROS := fedora@${FEDORA_LATEST} fedora@36 fedora@35 fedora@34 fedora@33 fedora@31 fedora
 UBUNTU_DISTROS := ubuntu@${UBUNTU_LATEST} ubuntu@20.04 ubuntu@18.04 ubuntu@16.04 ubuntu
-KORG_DISTROS := korg@12.1.0 korg@11.3.0 korg@11.1.0 korg@10.3.0 korg@9.4.0 korg@9.3.0 korg@8.5.0 korg@8.1.0 korg@5.5.0
+KORG_DISTROS := korg@12.2.0 korg@12.1.0 korg@11.3.0 korg@11.1.0 korg@10.3.0 korg@9.4.0 korg@9.3.0 korg@8.5.0 korg@8.1.0 korg@5.5.0
 ALL_DISTROS := ${UBUNTU_DISTROS} ${KORG_DISTROS} ${FEDORA_DISTROS}
 DOCS_DISTRO := docs@${UBUNTU_LATEST}
 X86_DISTRO := ubuntu@${UBUNTU_LATEST}

lib/pexpect_utils.py

@@ -6,8 +6,6 @@
 
 
 class PexpectHelper:
-    DEFAULT_PROMPT = "/ #"
-
     default_bug_patterns = [
         'Unable to handle kernel paging request',
         'Oops: Kernel access of bad area',
@@ -103,26 +101,28 @@ def cmd(self, cmd):
         self.expect_prompt()
 
 
-def standard_boot(p, login=False, user='root', password=None, timeout=-1, prompt=None):
-    if prompt is None:
-        prompt = p.DEFAULT_PROMPT
-
-    p.push_prompt(prompt)
-
+def standard_boot(p, login=False, user='root', password=None, timeout=-1):
     logging.info("Waiting for kernel to boot")
-    p.expect("Freeing unused kernel ", timeout=timeout)
+    i = p.expect([p.prompt, "login:", "Freeing unused kernel "], timeout=timeout)
+
+    if i == 0:
+        # We booted straight to a prompt, we're done
+        pass
+    elif login:
+        if i != 1:
+            logging.info("Kernel came up, waiting for login ...")
+            p.expect("login:", timeout=timeout)
 
-    if login:
-        logging.info("Kernel came up, waiting for login ...")
-        p.expect("login:", timeout=timeout)
         p.send(user)
         if password is not None:
             p.expect("Password:", timeout=timeout)
             p.send(password)
+
+        p.expect_prompt(timeout=timeout)
     else:
         logging.info("Kernel came up, waiting for prompt ...")
+        p.expect_prompt(timeout=timeout)
 
-    p.expect_prompt(timeout=timeout)
     logging.info("Booted to shell prompt")
 
 

lib/qemu.py

@@ -149,6 +149,10 @@ def apply_defaults(self):
                 self.cmdline += 'root=/dev/vda2 '
                 self.prompt = 'root@debian:~#'
 
+        if self.prompt is None:
+            # Default prompt for our root disks
+            self.prompt = "/ #"
+
         if self.initrd is None and self.drive is None and self.cloud_image is None:
             if self.compat_rootfs or self.qemu_path.endswith('qemu-system-ppc'):
                 subarch = 'ppc'
@@ -368,7 +372,8 @@ def qemu_main(qconf):
     p = PexpectHelper()
     p.spawn(cmd, logfile=open(qconf.logpath, 'w'), timeout=pexpect_timeout, quiet=qconf.quiet)
 
-    standard_boot(p, qconf.login, qconf.user, qconf.password, boot_timeout, qconf.prompt)
+    p.push_prompt(qconf.prompt)
+    standard_boot(p, qconf.login, qconf.user, qconf.password, boot_timeout)
 
     p.send('echo "booted-revision: `uname -r`"')
     p.expect(f'booted-revision: {qconf.expected_release}')