fix systemd

Change-Id: Ia07a03bb87aa9a5247548bed053641ea18b6c9ab

diff --git a/meta-tizen-common-base/recipes-core/systemd/systemd-extraconf.inc b/meta-tizen-common-base/recipes-core/systemd/systemd-extraconf.inc
index 9b5c868..a038e48 100644 (file)
--- a/meta-tizen-common-base/recipes-core/systemd/systemd-extraconf.inc
+++ b/meta-tizen-common-base/recipes-core/systemd/systemd-extraconf.inc
@@ -10,6 +10,7 @@ GROUPADD_PARAM_${PN} += "--system -g 19 floppy"
 
 EXTRA_OECONF += "--disable-manpages"
 EXTRA_OECONF += "--without-python"
+EXTRA_OECONF += "--disable-libcurl"
 
 GTKDOC_DOCDIR = "${S}/docs/"
 
@@ -23,18 +24,14 @@ do_configure_prepend() {
 }
 
 do_install_append() {
-    rm ${D}${sysconfdir}/hostname
-    rm ${D}${sysconfdir}/vconsole.conf
-    rm ${D}${sysconfdir}/locale.conf
-    rm ${D}${sysconfdir}/machine-id
-    rm ${D}${sysconfdir}/machine-info
-    rm ${D}${sysconfdir}/timezone
-
     rm -fr ${D}${prefix}/share/factory
     rm -fr ${D}/lib/systemd/network/80-container-ve.network
     rm -fr ${D}/lib/systemd/network/80-container-host0.network
     rm -fr ${D}/lib/systemd/system-preset/90-systemd.preset
     
+    rm -fr ${D}${sysconfdir}/hostname
+    rm -fr ${D}${sysconfdir}/timezone
+    
     install -m 0644 ${WORKDIR}/systemd-user ${D}${sysconfdir}/pam.d
 }
 
@@ -46,6 +43,8 @@ pkg_preinst_${PN}() {
     mv -n $D${sysconfdir}/systemd/systemd-journald.conf $D${sysconfdir}/systemd/journald.conf >/dev/null 2>&1 || :
 }
 
+
+
 systemd-dbg_files += "${systemd_unitdir}/.debug"
 systemd-dbg_files += "/lib/security/.debug"
 systemd-dbg_files += "${systemd_unitdir}/system-generators/.debug"
@@ -59,5 +58,9 @@ FILES_${PN}-locale-it += "${prefix}/lib/systemd/catalog/systemd.it.catalog"
 FILES_${PN}-locale-ru += "${prefix}/lib/systemd/catalog/systemd.ru.catalog"
 FILES_${PN}-locale    += "${prefix}/lib/systemd/catalog/systemd.catalog"
   
+
 systemd_files += "${prefix}/lib/systemd/network"
-  
\ No newline at end of file
+systemd_files += "${sysconfdir}/machine-id"
+systemd_files += "${sysconfdir}/vconsole.conf"
+systemd_files += "${sysconfdir}/locale.conf"
+systemd_files += "${sysconfdir}/machine-info"

diff --git a/meta-tizen-common-base/recipes-core/systemd/systemd.inc b/meta-tizen-common-base/recipes-core/systemd/systemd.inc
index 585feaa..7cec163 100644 (file)
--- a/meta-tizen-common-base/recipes-core/systemd/systemd.inc
+++ b/meta-tizen-common-base/recipes-core/systemd/systemd.inc
@@ -468,7 +468,6 @@ systemd_files += "${prefix}/lib/tmpfiles.d/legacy.conf"
 systemd_files += "${prefix}/lib/tmpfiles.d/pamconsole-tmp.conf"
 systemd_files += "${prefix}/lib/tmpfiles.d/systemd-nologin.conf"
 systemd_files += "${prefix}/lib/tmpfiles.d/etc.conf"
-systemd_files += "${prefix}/lib/tmpfiles.d/systemd-remote.conf"
 systemd_files += "${prefix}/lib/tmpfiles.d/var.conf"
 systemd_files += "${prefix}/sbin/init"
 systemd_files += "${prefix}/sbin/reboot"

diff --git a/meta-tizen-common-base/recipes-core/systemd/systemd_git.bb b/meta-tizen-common-base/recipes-core/systemd/systemd_git.bb
index 5cff973..7ab2e15 100644 (file)
--- a/meta-tizen-common-base/recipes-core/systemd/systemd_git.bb
+++ b/meta-tizen-common-base/recipes-core/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=c9f3992581011a5dde3b1b03819bedb3d2579076;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/systemd;tag=9d87d0efcdd9a083d774ff125a8ef5714785b752;nobranch=1"
 
 BBCLASSEXTEND += " native "