Hello all, this is a little patch which fixes "make distcheck" on split-/usr systems. That together with the previous "Stop depending on current configure options for EXTRA_DIST" now makes check, distcheck, etc. completely work on Debian/Ubuntu.
As discussed, I now set up daily upstream make/make check/make distcheck builds on https://code.launchpad.net/~pitti/+recipe/upstream-distcheck so that I get notified whenever distcheck starts failing again. This still fails due to these two issues. The build recipe also had a bug which showed the wrong test logs on distcheck failures, but that'll be fixed in the next run. Next step ist to build actually useful packages out of that which we can then feed to our rather extensive system integration tests. That'll be some more work, but it's absolutely worth doing it for both CI as well as giving people a way to test the latest changes easily. Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
From 00bed6f7a42f5bb8479f415f61349a63a8d6dba0 Mon Sep 17 00:00:00 2001 From: Martin Pitt <[email protected]> Date: Fri, 29 May 2015 07:39:53 +0200 Subject: [PATCH] build-sys: pass originally configured --enable-split-usr to distcheck Previously we always ran distcheck with --disable-split-usr. This caused test-path-util to fail with Assertion 'fsck_exists("minix") == 0' failed at ../src/test/test-path-util.c:224, function test_fsck_exists(). Aborting. as looking up fsck.minix would only look into DEFAULT_PATH_NORMAL, but on these systems fsck is in /sbin/. --- Makefile.am | 9 ++++++++- configure.ac | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index d3ab8d2..7703cda 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6799,7 +6799,6 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-pamconfdir=$$dc_install_base/$(pamconfdir) \ --with-rootprefix=$$dc_install_base \ - --disable-split-usr \ --enable-kdbus \ --enable-compat-libs @@ -6823,6 +6822,14 @@ DISTCHECK_CONFIGURE_FLAGS += \ --enable-gtk-doc endif +if ENABLE_SPLIT_USR +DISTCHECK_CONFIGURE_FLAGS += \ + --enable-split-usr +else +DISTCHECK_CONFIGURE_FLAGS += \ + --disable-split-usr +endif + # # Require python when making dist # diff --git a/configure.ac b/configure.ac index e46ca45..92654a6 100644 --- a/configure.ac +++ b/configure.ac @@ -1433,6 +1433,7 @@ AC_SUBST(DEFAULT_DKR_INDEX_URL) AS_IF([test "x${enable_split_usr}" = "xyes"], [ AC_DEFINE(HAVE_SPLIT_USR, 1, [Define if /bin, /sbin aren't symlinks into /usr]) ]) +AM_CONDITIONAL(ENABLE_SPLIT_USR, [test "x${enable_split_usr}" = "xyes"]) # Work around intltoolize and gtk-doc problems in VPATH builds AM_CONDITIONAL([ENABLE_GTK_DOC_TESTS], [test "x$0" = "x./configure"], -- 2.1.4
signature.asc
Description: Digital signature
_______________________________________________ systemd-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/systemd-devel
