From 759b98c5682171e6d5bf4d71f6ff038ae0115956 Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Wed, 3 Jun 2015 07:33:06 -0700 Subject: [PATCH 1/2] build-sys: Recommend --with-rootprefix=/ for split-usr Since we started using AX_NORMALIZE_PATH, that is a valid supported setup and is more explicit than --with-rootprefix= (empty) which is actually currently broken. Let's advocate for it in the ./configure suggestion from autogen.sh. --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 3027f83153..2d4acdfef1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -47,7 +47,7 @@ fi if [ ! -L /bin ]; then args="$args \ ---with-rootprefix= \ +--with-rootprefix=/ \ --with-rootlibdir=$(libdir /lib) \ " fi From e013d21b6218011c99dbbcd4c61fc73a24490a94 Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Wed, 3 Jun 2015 07:31:12 -0700 Subject: [PATCH 2/2] build-sys: Work around --with-rootprefix= (empty) not producing / Since we introduced AX_NORMALIZE_PATH, using --with-rootprefix=/ does produce an empty string, but using --with-rootprefix= (empty) now produces "." instead which is wrong. Work around it until we can find a better solution for AX_NORMALIZE_PATH upstream at autoconf-archive. Bug: https://github.com/systemd/systemd/issues/54 --- configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure.ac b/configure.ac index deafcc195b..18e0ac9ca9 100644 --- a/configure.ac +++ b/configure.ac @@ -1378,6 +1378,13 @@ AX_NORMALIZE_PATH([with_zshcompletiondir]) AC_ARG_WITH([rootprefix], AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]), [], [with_rootprefix=${ac_default_prefix}]) +# --with-rootprefix= (empty) should default to "/" but AX_NORMALIZE_PATH +# defaults those to ".", solve that here for now until we can find a suitable +# fix for AX_NORMALIZE_PATH upstream at autoconf-archive. +# See: https://github.com/systemd/systemd/issues/54 +if test "x${with_rootprefix}" = "x"; then + with_rootprefix="/" +fi AX_NORMALIZE_PATH([with_rootprefix]) AC_ARG_WITH([rootlibdir],