diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch b/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch index 5f3f2e8a5..5d13e4af9 100644 --- a/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch +++ b/import-layers/yocto-poky/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch @@ -1,6 +1,3 @@ -From 569cd3cf9806a02226d26c4104dbe44262f93d33 Mon Sep 17 00:00:00 2001 -From: Roy Li <rongqing.li@windriver.com> -Date: Fri, 22 Jan 2016 16:44:11 +0800 Subject: [PATCH 18/36] make test dir configurable Upstream-Status: Pending @@ -9,16 +6,17 @@ test maybe be run on target in cross-compile environment, and test dir is not the compilation dir, so make it configurable Signed-off-by: Roy Li <rongqing.li@windriver.com> + --- Makefile.am | 2 +- configure.ac | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index b5c6ba7..d3cd961 100644 +index a94636a..dbd3386 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -203,7 +203,7 @@ AM_CPPFLAGS = \ +@@ -207,7 +207,7 @@ AM_CPPFLAGS = \ -DROOTLIBDIR=\"$(rootlibdir)\" \ -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \ -DROOTHOMEDIR=\"$(roothomedir)\" \ @@ -28,10 +26,10 @@ index b5c6ba7..d3cd961 100644 -I $(top_builddir)/src/basic \ -I $(top_srcdir)/src/basic \ diff --git a/configure.ac b/configure.ac -index 36d20b5..d96dc5a 100644 +index 45aae8a..c53fae2 100644 --- a/configure.ac +++ b/configure.ac -@@ -1494,6 +1494,11 @@ AC_ARG_WITH([roothomedir], +@@ -1518,6 +1518,11 @@ AC_ARG_WITH([roothomedir], [], [with_roothomedir=/root]) @@ -43,7 +41,7 @@ index 36d20b5..d96dc5a 100644 AC_ARG_WITH([pamlibdir], AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]), [], -@@ -1578,6 +1583,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir]) +@@ -1603,6 +1608,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir]) AC_SUBST([rootprefix], [$with_rootprefix]) AC_SUBST([rootlibdir], [$with_rootlibdir]) AC_SUBST([roothomedir], [$with_roothomedir]) @@ -51,14 +49,14 @@ index 36d20b5..d96dc5a 100644 AC_CONFIG_FILES([ Makefile -@@ -1669,6 +1675,7 @@ AC_MSG_RESULT([ - lib dir: ${libdir} - rootlib dir: ${with_rootlibdir} - root home dir: ${with_roothomedir} -+ test dir: ${with_testdir} - SysV init scripts: ${SYSTEM_SYSVINIT_PATH} - SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} - Build Python: ${PYTHON} +@@ -1695,6 +1701,7 @@ AC_MSG_RESULT([ + lib dir: ${libdir} + rootlib dir: ${with_rootlibdir} + root home dir: ${with_roothomedir} ++ test dir: ${with_testdir} + SysV init scripts: ${SYSTEM_SYSVINIT_PATH} + SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} + Build Python: ${PYTHON} -- -1.8.3.1 +2.8.3 |