Merge ~apw/casper:main into casper:main

[Andy Whitcroft]

Fix version handling for forward backport kernel versions; these terminate in +21.04.1 which confuses the tests.

[Łukasz Zemczak (sil2100)]

The new regex seems fine, and it works for both the +21.04 scenario and regular versioning.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index fd390fd..dfb8051 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+casper (1.456) hirsute; urgency=medium
+
+  * Support kernels with "+" in the version string (LP: #1905357).
+
+ -- Andrea Righi <[e-mail]>  Wed, 02 Dec 2020 12:04:34 +0000
+
 casper (1.455) groovy; urgency=medium
 
   * Use a tmpfs in tests; overlay is not compatible with zfs.
diff --git a/debian/tests/boot b/debian/tests/boot
index 1054dd9..c0c3a27 100755
--- a/debian/tests/boot
+++ b/debian/tests/boot
@@ -29,7 +29,7 @@ set -e
 
 basecmdline="boot=casper console=ttyS0"
 
-kvers="$(dpkg -l linux-image-generic | awk '/^ii/ { print $3 }' | sed -e 's/\.[0-9]\+$//; s/\.\([0-9]\+\)$/-\1/')"-generic
+kvers="$(dpkg -l linux-image-generic | awk '/^ii/ { print $3 }' | sed -e 's/+.*//; s/\.[0-9]\+$//; s/\.\([0-9]\+\)$/-\1/')"-generic
 kernel=$(echo /boot/vmlinu*-"$kvers")
 
 mkinitramfs -o casper-initrd "$kvers"