From 0179d21aedc277012dcb6911561f3ff187961204 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 21 Aug 2020 00:24:06 +0100 Subject: [PATCH] ostree-tests: Depend on gjs on s390x again mozjs and gjs are believed to work fine on s390x now. --- debian/changelog | 2 ++ debian/control | 2 +- debian/ostree-tests.lintian-overrides | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 49698fc2..d4ee2413 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ ostree (2020.5-1) UNRELEASED; urgency=medium * New upstream release + * ostree-tests: Depend on gjs on s390x again. + mozjs and gjs are believed to work fine on s390x now. -- Simon McVittie Fri, 21 Aug 2020 00:20:29 +0100 diff --git a/debian/control b/debian/control index 6eb40a68..07e8f352 100644 --- a/debian/control +++ b/debian/control @@ -189,7 +189,7 @@ Depends: cpio, fuse, gir1.2-ostree-1.0, - gjs [!s390x !sparc64], + gjs [!sparc64], gnupg, ostree, python3, diff --git a/debian/ostree-tests.lintian-overrides b/debian/ostree-tests.lintian-overrides index 2d3a94a9..a2e022eb 100644 --- a/debian/ostree-tests.lintian-overrides +++ b/debian/ostree-tests.lintian-overrides @@ -6,11 +6,10 @@ ostree-tests: extra-license-file usr/libexec/installed-tests/libostree/gpg-verif # This is deliberate, working around the assumption of recursive make ostree-tests: symlink-is-self-recursive usr/libexec/installed-tests/libostree/tests . -# gjs has been broken on sparc64 for a while, and is likely to be removed -# from s390x because mozjs60 doesn't work there. +# gjs has been broken on sparc64 for a while. # The test that runs this script is automatically skipped if gjs isn't # present. -[s390x sparc64]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js) +[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js) # This shared object genuinely doesn't use any libc ABIs directly, # only via GLib