From fb6dba45de37d8ab5c1ad6c5996a607c12c9c11e Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 4 Jan 2018 18:49:03 +0000 Subject: [PATCH] Temporarily disable gjs tests gjs is not currently installable on buildds due to the glibc transition and a long dependency chain involving systemd-shim being preferred over systemd-sysv, which ends with libnih1 Depends: libc6 (<< 2.26). --- debian/changelog | 4 ++++ debian/control | 1 - debian/rules | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8e953ea3..a7c6a3ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ ostree (2017.15-2) UNRELEASED; urgency=medium * d/p/2018.1/tests-Assert-that-byte-order-[etc.].patch: Add patch to fix test failures on big-endian machines (Closes: #886218) + * Temporarily disable gjs tests. gjs is not currently installable on + buildds due to the glibc transition and a long dependency chain + involving systemd-shim being preferred over systemd-sysv, which + ends with libnih1 Depends: libc6 (<< 2.26). -- Simon McVittie Thu, 04 Jan 2018 12:58:50 +0000 diff --git a/debian/control b/debian/control index f270a767..3c3f9f33 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,6 @@ Build-Depends: e2fslibs-dev, elfutils, fuse, - gjs [!sparc64], gobject-introspection, gtk-doc-tools , libarchive-dev, diff --git a/debian/rules b/debian/rules index 7aef179b..20965e12 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,7 @@ override_dh_autoreconf: env NOCONFIGURE=1 dh_autoreconf ./autogen.sh configure_options = \ + GJS=some-nonexistent-gjs-binary \ --enable-installed-tests \ --libexecdir='$${prefix}/lib' \ --with-dracut \