From: Simon McVittie <smcv@debian.org>
Date: Sun, 25 Sep 2022 09:28:02 +0000 (+0100)
Subject: Revert "d/control, d/rules: Disable gjs-based tests on armel"
X-Git-Tag: archive/raspbian/2022.5-4+rpi1^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f59d3ae52ba074861563d40e96a27b9bc727aa7c;p=ostree.git

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

This reverts commit 87c78f16ad8d22dec4f6631f1dd03ba02d83d615.
Adrian Bunk and Mike Hommey were able to fix mozjs102 on armel, so we
can continue to have gjs on that architecture for Debian 12.
---

diff --git a/debian/control b/debian/control
index 00064b45..a6b1ca6b 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
  e2fslibs-dev,
  elfutils,
  fuse3,
- gjs [!alpha !armel !hppa !ia64 !m68k !sh4 !sparc64 !x32],
+ gjs [!alpha !hppa !ia64 !m68k !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 !armel !hppa !ia64 !m68k !sh4 !sparc64 !x32],
+ gjs [!alpha !hppa !ia64 !m68k !sh4 !sparc64 !x32],
  gnupg,
  ostree,
  python3,
diff --git a/debian/ostree-tests.lintian-overrides b/debian/ostree-tests.lintian-overrides
index ba7d834e..ec853b34 100644
--- 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 armel hppa ia64 m68k sh4 sparc64 x32]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
+[alpha hppa ia64 m68k 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 7769e1ef..bb1bc35c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ configure_options = \
 	--without-smack \
 	$(NULL)
 
-ifneq ($(filter alpha armel hppa ia64 m68k sh4 sparc64 x32,$(DEB_HOST_ARCH)),)
+ifneq ($(filter alpha hppa ia64 m68k sh4 sparc64 x32,$(DEB_HOST_ARCH)),)
 configure_options += ac_cv_path_GJS=
 endif