Bug#968502: buster-pu: arch-test needs to be updated in stable to include s390x fix
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-CC: Philipp Kern <pkern@debian.org>
On Sun, Aug 16, 2020 at 03:05:14PM +0200, Philipp Kern wrote:
> Hey Adam,
>
> It looks like the commit in [1] to fix up the string length on s390x is
> missing from Debian stable. Without it debootstrap's arch-test call
> fails and thus it refuses to bootstrap. The binary from the current git
> tree works for me:
>
> > pkern@ldebpk02:~/arch-test$ make arch-test-s390x
> > s390x-linux-gnu-as s390x.s -o s390x.o
> > s390x-linux-gnu-ld -s s390x.o -o arch-test-s390x
> > pkern@ldebpk02:~/arch-test$ ./arch-test-s390x
> > ok
>
> Could you try to get a stable update ready for this? It's actually
> severe enough, me thinks. If you (or the Release team) want me to file a
> bug against debootstrap being broken, I can do that, of course. The
> evidence:
>
> > + arch-test -c /srv/chroots/sid s390x
> > /usr/bin/arch-test: line 59: warning: command substitution: ignored null byte in input
> > s390x: not supported on this machine/kernel
>
> Kind regards and thanks
> Philipp Kern
>
> [1]
> https://github.com/kilobyte/arch-test/commit/c0a700015221af5ec7e1f104b0646c0d0f6f2dd3
Sounds good to me -- I've cherry-picked that patch, and here's the stable
update request. Debdiff attached.
Meow!
--
⢀⣴⠾⠻⢶⣦⠀
⣾⠁⢠⠒⠀⣿⡁
⢿⡄⠘⠷⠚⠋⠀ It's time to migrate your Imaginary Protocol from version 4i to 6i.
⠈⠳⣄⠀⠀⠀⠀
diff -Nru arch-test-0.15/debian/changelog arch-test-0.15/debian/changelog
--- arch-test-0.15/debian/changelog 2019-02-27 13:41:50.000000000 +0100
+++ arch-test-0.15/debian/changelog 2020-08-16 15:25:50.000000000 +0200
@@ -1,3 +1,9 @@
+arch-test (0.15-2+deb10u1) buster; urgency=medium
+
+ * Fix s390x detection sometimes failing (Alexander Efremkin).
+
+ -- Adam Borowski <kilobyte@angband.pl> Sun, 16 Aug 2020 15:25:50 +0200
+
arch-test (0.15-2) unstable; urgency=medium
* Don't check for SWP on armel; it's not needed in the vast majority of
diff -Nru arch-test-0.15/debian/patches/s390x_lghi arch-test-0.15/debian/patches/s390x_lghi
--- arch-test-0.15/debian/patches/s390x_lghi 1970-01-01 01:00:00.000000000 +0100
+++ arch-test-0.15/debian/patches/s390x_lghi 2020-08-16 15:25:50.000000000 +0200
@@ -0,0 +1,11 @@
+--- arch-test-0.15.orig/s390x.s
++++ arch-test-0.15/s390x.s
+@@ -9,7 +9,7 @@ base:
+ sr %r1, %r2
+ lhi %r2, 1
+ la %r3, msg(%r1)
+- lhi %r4, 3
++ lghi %r4, 3
+ svc 4
+
+ xr %r2, %r2
diff -Nru arch-test-0.15/debian/patches/series arch-test-0.15/debian/patches/series
--- arch-test-0.15/debian/patches/series 2019-02-27 13:41:00.000000000 +0100
+++ arch-test-0.15/debian/patches/series 2020-08-16 15:25:50.000000000 +0200
@@ -1 +1,2 @@
armel_no_swp
+s390x_lghi
Reply to: