d/control, d/rules: Disable gjs-based tests on armel

It's looking as though mozjs102, and therefore the next gjs release,
will not support armel due to its lack of atomic instructions.

diff --git a/debian/control b/debian/control
index f005bb62ae5e5816485159265d464e23b3b6aa69..a694637052e6667492ffb17005fb9de9c402b903 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
  e2fslibs-dev,
  elfutils,
  fuse3,
- gjs [!alpha !hppa !ia64 !m68k !s390x !sh4 !sparc64 !x32],
+ gjs [!alpha !armel !hppa !ia64 !m68k !s390x !sh4 !sparc64 !x32],
  gnupg <!nocheck>,
  gobject-introspection,
  gtk-doc-tools <!nodoc>,
@@ -191,7 +191,7 @@ Depends:
  cpio,
  fuse3,
  gir1.2-ostree-1.0,
- gjs [!alpha !hppa !ia64 !m68k !sh4 !sparc64 !x32],
+ gjs [!alpha !armel !hppa !ia64 !m68k !sh4 !sparc64 !x32],
  gnupg,
  ostree,
  python3,

diff --git a/debian/ostree-tests.lintian-overrides b/debian/ostree-tests.lintian-overrides
index 5ef34c478eacd167d4819b56f1017284244e0187..4a963d6e7f3047685275ea496e98afa7e99c7087 100644 (file)
--- a/debian/ostree-tests.lintian-overrides
+++ b/debian/ostree-tests.lintian-overrides
@@ -10,7 +10,7 @@ ostree-tests: symlink-is-self-recursive . [usr/libexec/installed-tests/libostree
 # other architectures mentioned here.
 # The test that runs this script is automatically skipped if gjs isn't
 # present.
-[alpha hppa ia64 m68k s390x sh4 sparc64 x32]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
+[alpha armel hppa ia64 m68k s390x sh4 sparc64 x32]: 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

diff --git a/debian/rules b/debian/rules
index 27f0996f5f8fa895774f800a41a9c59512bb0bd2..1b98b837a4239ce6af88130e8e5e1f2ba550a7aa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ configure_options = \
        --without-smack \
        $(NULL)
 
-ifneq ($(filter alpha hppa ia64 m68k s390x sh4 sparc64 x32,$(DEB_HOST_ARCH)),)
+ifneq ($(filter alpha armel hppa ia64 m68k s390x sh4 sparc64 x32,$(DEB_HOST_ARCH)),)
 configure_options += ac_cv_path_GJS=
 endif