Use systemd from Tizen

We don't use systemd provided by Yocto anymore so we removed the
systemd from Yocto.

Also update the recipe.

Change-Id: I09143b2119457e10f9dd32df7069b693df311b8f
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/recipes-core/systemd/files/0001-Fix-use_smack-corrupt-cached-result.patch b/recipes-core/systemd/files/0001-Fix-use_smack-corrupt-cached-result.patch
deleted file mode 100644 (file)
index ce588a3..0000000
--- a/recipes-core/systemd/files/0001-Fix-use_smack-corrupt-cached-result.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 82cd5f55a9cae6a5cd8ca82b2d386ac27fbc62d7 Mon Sep 17 00:00:00 2001
-From: Ronan Le Martret <ronan@fridu.net>
-Date: Fri, 18 Apr 2014 15:11:47 +0200
-Subject: [PATCH 1/1] Fix use_smack corrupt cached result.
-
-You can not put the cached result of use_smack fct,
-as we are not sure the "/sys" is mounted.
-So for the two first mount from mount_table,
-"/proc" and "/sys" result from use_smack should not be cached.
-
-Change-Id: I730b94a28bf6c5dd60d15dccc0409cd9e1a8a67c
-Signed-off-by: Ronan Le Martret <ronan@fridu.net>
----
- src/shared/smack-util.c | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c
-index df194e0..db35be5 100644
---- a/src/shared/smack-util.c
-+++ b/src/shared/smack-util.c
-@@ -32,11 +32,16 @@
- bool use_smack(void) {
- #ifdef HAVE_SMACK
-         static int use_smack_cached = -1;
--
--        if (use_smack_cached < 0)
--                use_smack_cached = access("/sys/fs/smackfs/", F_OK) >= 0;
--
--        return use_smack_cached;
-+        int res = false;
-+        if (use_smack_cached < 0) {
-+                if (access("/sys/fs", F_OK) >= 0) {
-+                        use_smack_cached = access("/sys/fs/smackfs/", F_OK) >= 0;
-+                        res = use_smack_cached;
-+                }
-+        } else
-+                res = use_smack_cached;
-+
-+        return res;
- #else
-         return false;
- #endif
--- 
-1.8.1.4
-

diff --git a/recipes-core/systemd/systemd_211.bbappend b/recipes-core/systemd/systemd_211.bbappend
deleted file mode 100644 (file)
index b858f4f..0000000
--- a/recipes-core/systemd/systemd_211.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://0001-Fix-use_smack-corrupt-cached-result.patch"
-
-DEPENDS += "smack"
-RDEPENDS_${PN} += "smack"
-
-DEPENDS += "attr"
-
-EXTRA_OECONF +=  ' --enable-smack --with-smack-run-label=System '
\ No newline at end of file

diff --git a/recipes-tizen/systemd/systemd.inc b/recipes-tizen/systemd/systemd.inc
index 299d40d..26b982c 100644 (file)
--- a/recipes-tizen/systemd/systemd.inc
+++ b/recipes-tizen/systemd/systemd.inc
@@ -139,12 +139,14 @@ do_compile() {
          --infodir=${infodir} \
          --enable-bootchart \
          --libexecdir=${prefix}/lib \
-           --docdir=${prefix}/share/doc/packages/systemd \
+         --docdir=${prefix}/share/doc/packages/systemd \
          --disable-static \
          --with-sysvinit-path= \
          --with-sysvrcnd-path= \
          --with-smack-run-label=System
- make -j16
+ make -j16 \
+         systemunitdir=/lib/systemd/system \
+         userunitdir=/lib/systemd/user
  
  
  

diff --git a/recipes-tizen/systemd/systemd_git.bb b/recipes-tizen/systemd/systemd_git.bb
index a51dde6..56b1d9e 100644 (file)
--- a/recipes-tizen/systemd/systemd_git.bb
+++ b/recipes-tizen/systemd/systemd_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/upstream/systemd;tag=93675e1961f47d1bbe4beb9043cdc3f60ecfc795;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/systemd;tag=9289bda02764485a44849d893474e26ad29740f1;nobranch=1"
 
 BBCLASSEXTEND += " native "