diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-08-02 18:27:31 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-09 23:38:28 +0100 |
| commit | 34afb46f75d6c356f23f70c5ece96e45594e1546 (patch) | |
| tree | 2c103bfd14f3cb0d342c6fd97a4476370921cb84 /meta/recipes-core/systemd/systemd/0016-make-test-dir-configurable.patch | |
| parent | 15ef4a6de2a61b958484b9291fe67dbeeebf3cfa (diff) | |
| download | openembedded-core-34afb46f75d6c356f23f70c5ece96e45594e1546.tar.gz | |
systemd: update to 234
The new version fixes gperf 3.1 issues, so the update is included
in this patchset.
Modified patches are all rebases to the new version.
Deleted patches are backports, except 0016-make-test-dir-configurable.patch
which is obsolete in the new version (TEST_DIR define is no longer used anywhere).
--with-testdir is removed from configure for the same reason.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0016-make-test-dir-configurable.patch')
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0016-make-test-dir-configurable.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/meta/recipes-core/systemd/systemd/0016-make-test-dir-configurable.patch b/meta/recipes-core/systemd/systemd/0016-make-test-dir-configurable.patch deleted file mode 100644 index 10d1df5d52..0000000000 --- a/meta/recipes-core/systemd/systemd/0016-make-test-dir-configurable.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 218bbc555a37f9373fbb7f03c744eb65109d3470 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 9 Nov 2016 20:47:37 -0800 -Subject: [PATCH 16/19] make test dir configurable - -Upstream-Status: Pending - -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> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Makefile.am | 2 +- - configure.ac | 7 +++++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 229492a..e997d82 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -214,7 +214,7 @@ AM_CPPFLAGS = \ - -DROOTLIBDIR=\"$(rootlibdir)\" \ - -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \ - -DROOTHOMEDIR=\"$(roothomedir)\" \ -- -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ -+ -DTEST_DIR=\"$(testdir)/test\" \ - -I $(top_srcdir)/src \ - -I $(top_builddir)/src/basic \ - -I $(top_srcdir)/src/basic \ -diff --git a/configure.ac b/configure.ac -index 1de0066..b12e320 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1535,6 +1535,11 @@ AC_ARG_WITH([roothomedir], - [], - [with_roothomedir=/root]) - -+AC_ARG_WITH([testdir], -+ AS_HELP_STRING([--with-testdir=DIR], [test file directory]), -+ [], -+ [with_testdir=${abs_top_srcdir}]) -+ - AC_ARG_WITH([pamlibdir], - AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]), - [], -@@ -1621,6 +1626,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir]) - AC_SUBST([rootprefix], [$with_rootprefix]) - AC_SUBST([rootlibdir], [$with_rootlibdir]) - AC_SUBST([roothomedir], [$with_roothomedir]) -+AC_SUBST([testdir], [$with_testdir]) - - AC_CONFIG_FILES([ - Makefile -@@ -1712,6 +1718,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} --- -2.10.2 - |