Fix systemd macro path

Change-Id: I409a6376a6a156402cb3c566b421a571856d528c
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/recipes-core/dbus/dbus_1.6.18.bbappend b/recipes-core/dbus/dbus_1.6.18.bbappend
index 02ef4c6..c22c8a2 100644 (file)
--- a/recipes-core/dbus/dbus_1.6.18.bbappend
+++ b/recipes-core/dbus/dbus_1.6.18.bbappend
@@ -23,13 +23,13 @@ SRC_URI += " file://0002-Add-_DBUS_GNUC_WARN_UNUSED_RESULT-similar-to-GLib-s.pat
 DEPENDS += "smack"
 
 do_install_append() {
-       mkdir -p ${D}${systemd_unitdir}/user
-       install -m 0644 ${WORKDIR}/dbus-user.service ${D}${systemd_unitdir}/user/dbus.service
-       install -m 0644 ${WORKDIR}/dbus-user.socket ${D}${systemd_unitdir}/user/dbus.socket
+       mkdir -p ${D}${prefix}/lib/systemd/user
+       install -m 0644 ${WORKDIR}/dbus-user.service ${D}${prefix}/lib/systemd/user/dbus.service
+       install -m 0644 ${WORKDIR}/dbus-user.socket ${D}${prefix}/lib/systemd/user/dbus.socket
 }
 
-FILES_${PN} += "${systemd_unitdir}/user/dbus.service \
-               ${systemd_unitdir}/user/dbus.socket \
+FILES_${PN} += "${prefix}/lib/systemd/user/dbus.service \
+               ${prefix}/lib/systemd/user/dbus.socket \
               "
 
 EXTRA_OECONF += " --enable-smack "

diff --git a/recipes-image/config-image/config-image.bb b/recipes-image/config-image/config-image.bb
index 624e939..508b94c 100644 (file)
--- a/recipes-image/config-image/config-image.bb
+++ b/recipes-image/config-image/config-image.bb
@@ -66,26 +66,17 @@ pkg_postinst_${PN} () {
     cp -fra $D${localstatedir}/log $D${localstatedir}/volatile
     #cp -fra $D/sbin $D/usr
     #cp -fra $D/bin  $D/usr
-    
-    cp -fra $D/lib/systemd/*  $D/usr/lib/systemd/
-    #cp -fra $D/usr/lib/systemd  $D/lib
   
     #rm -fr $D/lib
     #rm -fr $D/sbin
     #rm -fr $D/bin
     rm -fr $D${localstatedir}/log
     
-    rm -fr $D/lib/systemd/*
-    #rm -fr $D/usr/lib/systemd/*
-    
     #ln -s usr/lib  $D/lib
     #ln -s usr/sbin $D/sbin
     #ln -s usr/bin  $D/bin
     ln -s volatile/log  $D${localstatedir}/log
     
-    #ln -s ../usr/lib/systemd  $D/lib/systemd
-    #ln -s ../../lib/systemd  $D/usr/lib/systemd
-    
  fi
 }
 

diff --git a/recipes-tizen/Modello-Homescreen/Modello-Homescreen.inc b/recipes-tizen/Modello-Homescreen/Modello-Homescreen.inc
index 87b89f5..8d22026 100644 (file)
--- a/recipes-tizen/Modello-Homescreen/Modello-Homescreen.inc
+++ b/recipes-tizen/Modello-Homescreen/Modello-Homescreen.inc
@@ -70,11 +70,11 @@ do_install() {
      install -m 0644 Homescreen_icon.png ${D}${prefix}/share/Modello/Common/icons
  
      mkdir -p ${D}${prefix}/bin
-     mkdir -p ${D}${systemd_unitdir}/user/weston.target.wants/
+     mkdir -p ${D}${prefix}/lib/systemd/user/weston.target.wants/
      install -m 755 systemd/modello_launcher.sh ${D}${prefix}/bin
-     install -m 0644 systemd/Modello_Homescreen-launchpad-ready.path ${D}${systemd_unitdir}/user
-     install -m 0644 systemd/Modello_Homescreen.service ${D}${systemd_unitdir}/user
-     ln -sf ../Modello_Homescreen-launchpad-ready.path ${D}${systemd_unitdir}/user/weston.target.wants/
+     install -m 0644 systemd/Modello_Homescreen-launchpad-ready.path ${D}${prefix}/lib/systemd/user
+     install -m 0644 systemd/Modello_Homescreen.service ${D}${prefix}/lib/systemd/user
+     ln -sf ../Modello_Homescreen-launchpad-ready.path ${D}${prefix}/lib/systemd/user/weston.target.wants/
  
  
 }
@@ -85,10 +85,10 @@ PACKAGES += " Modello-Homescreen "
 Modello-Homescreen_files = ""
 Modello-Homescreen_files += "/opt/usr/apps/.preinstallWidgets/Modello-Homescreen.wgt"
 Modello-Homescreen_files += "${prefix}/share/Modello/Common/icons/Homescreen_icon.png"
-Modello-Homescreen_files += "${systemd_unitdir}/user/Modello_Homescreen.service"
-Modello-Homescreen_files += "${systemd_unitdir}/user/Modello_Homescreen-launchpad-ready.path"
+Modello-Homescreen_files += "${prefix}/lib/systemd/user/Modello_Homescreen.service"
+Modello-Homescreen_files += "${prefix}/lib/systemd/user/Modello_Homescreen-launchpad-ready.path"
 Modello-Homescreen_files += "${prefix}/bin/modello_launcher.sh"
-Modello-Homescreen_files += "${systemd_unitdir}/user/weston.target.wants"
+Modello-Homescreen_files += "${prefix}/lib/systemd/user/weston.target.wants"
 
 FILES_${PN} = "${Modello-Homescreen_files}"
 

diff --git a/recipes-tizen/app-core/app-core.inc b/recipes-tizen/app-core/app-core.inc
index 740aec8..1a6dc18 100644 (file)
--- a/recipes-tizen/app-core/app-core.inc
+++ b/recipes-tizen/app-core/app-core.inc
@@ -135,8 +135,8 @@ do_install() {
    rm -f ${D}${infodir}/dir 
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
- install -d ${D}${systemd_unitdir}/user/core-efl.target.wants
- install -m0644 ${S}/packaging/core-efl-wayland.target ${D}${systemd_unitdir}/user/core-efl.target
+ install -d ${D}${prefix}/lib/systemd/user/core-efl.target.wants
+ install -m0644 ${S}/packaging/core-efl-wayland.target ${D}${prefix}/lib/systemd/user/core-efl.target
  
  
  
@@ -184,8 +184,8 @@ MANIFESTFILES_${PN}-efl = "app-core.manifest"
 
 app-core-common_files = ""
 app-core-common_files += "${prefix}/lib/libappcore-common.so.*"
-app-core-common_files += "${systemd_unitdir}/user/core-efl.target"
-app-core-common_files += "${systemd_unitdir}/user/core-efl.target.wants/"
+app-core-common_files += "${prefix}/lib/systemd/user/core-efl.target"
+app-core-common_files += "${prefix}/lib/systemd/user/core-efl.target.wants/"
 MANIFESTFILES_${PN}-common = "app-core.manifest"
 
 app-core-common-dev_files = ""

diff --git a/recipes-tizen/aul/aul.inc b/recipes-tizen/aul/aul.inc
index fdc3914..2e0d3b7 100644 (file)
--- a/recipes-tizen/aul/aul.inc
+++ b/recipes-tizen/aul/aul.inc
@@ -125,14 +125,14 @@ do_install() {
  rm -rf ${D}${prefix}/share/aul/mida_db.sql
  
  mkdir -p ${D}${systemd_unitdir}/system/graphical.target.wants
- mkdir -p ${D}${systemd_unitdir}/user/default.target.wants
+ mkdir -p ${D}${prefix}/lib/systemd/user/default.target.wants
  install -m 0644 ${S}/packaging/launchpad-preload@.service ${D}${systemd_unitdir}/system/launchpad-preload@.service
  install -m 0644 ${S}/packaging/ac.service ${D}${systemd_unitdir}/system/ac.service
  ln -s ../launchpad-preload@.service ${D}${systemd_unitdir}/system/graphical.target.wants/launchpad-preload@5000.service
  ln -s ../ac.service ${D}${systemd_unitdir}/system/graphical.target.wants/ac.service
  
- install -m 0644 ${S}/packaging/amd_session_agent.service ${D}${systemd_unitdir}/user/amd_session_agent.service
- ln -s ../amd_session_agent.service ${D}${systemd_unitdir}/user/default.target.wants/amd_session_agent.service
+ install -m 0644 ${S}/packaging/amd_session_agent.service ${D}${prefix}/lib/systemd/user/amd_session_agent.service
+ ln -s ../amd_session_agent.service ${D}${prefix}/lib/systemd/user/default.target.wants/amd_session_agent.service
  
  
 }
@@ -194,8 +194,8 @@ aul_files += "${systemd_unitdir}/system/graphical.target.wants/launchpad-preload
 aul_files += "${systemd_unitdir}/system/graphical.target.wants/ac.service"
 aul_files += "${systemd_unitdir}/system/launchpad-preload@.service"
 aul_files += "${systemd_unitdir}/system/ac.service"
-aul_files += "${systemd_unitdir}/user/amd_session_agent.service"
-aul_files += "${systemd_unitdir}/user/default.target.wants/amd_session_agent.service"
+aul_files += "${prefix}/lib/systemd/user/amd_session_agent.service"
+aul_files += "${prefix}/lib/systemd/user/default.target.wants/amd_session_agent.service"
 aul_files += "${prefix}/bin/amd"
 aul_files += "${prefix}/bin/daemon-manager-release-agent"
 aul_files += "${prefix}/bin/daemon-manager-launch-agent"

diff --git a/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc b/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc
index dcc3575..0387c73 100644 (file)
--- a/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc
+++ b/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc
@@ -135,10 +135,10 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
- mkdir -p ${D}${systemd_unitdir}/user
- mkdir -p ${D}${systemd_unitdir}/user/tizen-middleware.target.wants
- install -m 0644 bt-service/bluetooth-frwk-service.service ${D}${systemd_unitdir}/user
- ln -s ../bluetooth-frwk-service.service ${D}${systemd_unitdir}/user/tizen-middleware.target.wants/bluetooth-frwk-service.service
+ mkdir -p ${D}${prefix}/lib/systemd/user
+ mkdir -p ${D}${prefix}/lib/systemd/user/tizen-middleware.target.wants
+ install -m 0644 bt-service/bluetooth-frwk-service.service ${D}${prefix}/lib/systemd/user
+ ln -s ../bluetooth-frwk-service.service ${D}${prefix}/lib/systemd/user/tizen-middleware.target.wants/bluetooth-frwk-service.service
  
  mkdir -p ${D}${prefix}/share/icons/default
  install -m 0644 ${S}/packaging/bt-icon.png ${D}${prefix}/share/icons/default/bt-icon.png
@@ -191,8 +191,8 @@ MANIFESTFILES_${PN}-core = "bluetooth-frwk.manifest"
 bluetooth-frwk-service_files = ""
 bluetooth-frwk-service_files += "${prefix}/share/dbus-1/system-services/org.projectx.bt.service"
 bluetooth-frwk-service_files += "${prefix}/bin/bt-service"
-bluetooth-frwk-service_files += "${systemd_unitdir}/user/tizen-middleware.target.wants/bluetooth-frwk-service.service"
-bluetooth-frwk-service_files += "${systemd_unitdir}/user/bluetooth-frwk-service.service"
+bluetooth-frwk-service_files += "${prefix}/lib/systemd/user/tizen-middleware.target.wants/bluetooth-frwk-service.service"
+bluetooth-frwk-service_files += "${prefix}/lib/systemd/user/bluetooth-frwk-service.service"
 bluetooth-frwk-service_files += "/opt/var/lib/bluetooth/auto-pair-blacklist"
 bluetooth-frwk-service_files += "${sysconfdir}/dbus-1/system.d/bluetooth-frwk-service.conf"
 bluetooth-frwk-service_files += "${prefix}/share/icons/default/bt-icon.png"

diff --git a/recipes-tizen/calendar-service/calendar-service.inc b/recipes-tizen/calendar-service/calendar-service.inc
index d089881..c701cf0 100644 (file)
--- a/recipes-tizen/calendar-service/calendar-service.inc
+++ b/recipes-tizen/calendar-service/calendar-service.inc
@@ -117,9 +117,9 @@ do_install() {
  ln -s ../init.d/calendar-serviced.sh ${D}/etc/rc.d/rc3.d/S85calendar-serviced
  ln -s ../init.d/calendar-serviced.sh ${D}/etc/rc.d/rc5.d/S85calendar-serviced
  
- mkdir -p ${D}${systemd_unitdir}/user/tizen-middleware.target.wants
- install ${S}/packaging/calendar.service ${D}${systemd_unitdir}/user/
- ln -s ../calendar.service ${D}${systemd_unitdir}/user/tizen-middleware.target.wants/
+ mkdir -p ${D}${prefix}/lib/systemd/user/tizen-middleware.target.wants
+ install ${S}/packaging/calendar.service ${D}${prefix}/lib/systemd/user/
+ ln -s ../calendar.service ${D}${prefix}/lib/systemd/user/tizen-middleware.target.wants/
  
  
 }
@@ -148,8 +148,8 @@ calendar-service_files += "/etc/rc.d/init.d/calendar-serviced.sh"
 calendar-service_files += "/etc/rc.d/rc3.d/S85calendar-serviced"
 calendar-service_files += "/etc/rc.d/rc5.d/S85calendar-serviced"
 calendar-service_files += "/usr/share/calendar-svc/dft-calendar"
-calendar-service_files += "${systemd_unitdir}/user/calendar.service"
-calendar-service_files += "${systemd_unitdir}/user/tizen-middleware.target.wants/calendar.service"
+calendar-service_files += "${prefix}/lib/systemd/user/calendar.service"
+calendar-service_files += "${prefix}/lib/systemd/user/tizen-middleware.target.wants/calendar.service"
 MANIFESTFILES_${PN} = "calendar-service.manifest"
 
 calendar-service-dev_files = ""

diff --git a/recipes-tizen/contacts-service/contacts-service.inc b/recipes-tizen/contacts-service/contacts-service.inc
index b6332aa..1a62553 100644 (file)
--- a/recipes-tizen/contacts-service/contacts-service.inc
+++ b/recipes-tizen/contacts-service/contacts-service.inc
@@ -122,13 +122,13 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
- mkdir -p ${D}${systemd_unitdir}/user/tizen-middleware.target.wants
- install -m 0644 ${S}/packaging/contacts-service.service ${D}${systemd_unitdir}/user/contacts-service.service
- ln -s ../contacts-service.service ${D}${systemd_unitdir}/user/tizen-middleware.target.wants/contacts-service.service
+ mkdir -p ${D}${prefix}/lib/systemd/user/tizen-middleware.target.wants
+ install -m 0644 ${S}/packaging/contacts-service.service ${D}${prefix}/lib/systemd/user/contacts-service.service
+ ln -s ../contacts-service.service ${D}${prefix}/lib/systemd/user/tizen-middleware.target.wants/contacts-service.service
  
- mkdir -p ${D}${systemd_unitdir}/user/sockets.target.wants
- install -m 0644 ${S}/packaging/contacts-service.socket ${D}${systemd_unitdir}/user/contacts-service.socket
- ln -s ../contacts-service.socket ${D}${systemd_unitdir}/user/sockets.target.wants/contacts-service.socket
+ mkdir -p ${D}${prefix}/lib/systemd/user/sockets.target.wants
+ install -m 0644 ${S}/packaging/contacts-service.socket ${D}${prefix}/lib/systemd/user/contacts-service.socket
+ ln -s ../contacts-service.socket ${D}${prefix}/lib/systemd/user/sockets.target.wants/contacts-service.socket
  
  
  
@@ -164,10 +164,10 @@ PACKAGES += " contacts-service2-dev "
 contacts-service2_files = ""
 contacts-service2_files += "${prefix}/lib/libcontacts-service2.so.*"
 contacts-service2_files += "${prefix}/bin/contacts-service-ipcd*"
-contacts-service2_files += "${systemd_unitdir}/user/contacts-service.service"
-contacts-service2_files += "${systemd_unitdir}/user/tizen-middleware.target.wants/contacts-service.service"
-contacts-service2_files += "${systemd_unitdir}/user/sockets.target.wants/contacts-service.socket"
-contacts-service2_files += "${systemd_unitdir}/user/contacts-service.socket"
+contacts-service2_files += "${prefix}/lib/systemd/user/contacts-service.service"
+contacts-service2_files += "${prefix}/lib/systemd/user/tizen-middleware.target.wants/contacts-service.service"
+contacts-service2_files += "${prefix}/lib/systemd/user/sockets.target.wants/contacts-service.socket"
+contacts-service2_files += "${prefix}/lib/systemd/user/contacts-service.socket"
 MANIFESTFILES_${PN}2 = "contacts-service2.manifest"
 
 contacts-service2-dev_files = ""

diff --git a/recipes-tizen/crosswalk-thirdparty/crosswalk-thirdparty_git.bb b/recipes-tizen/crosswalk-thirdparty/crosswalk-thirdparty_git.bb
index e03a4d8..fdd8dfa 100644 (file)
--- a/recipes-tizen/crosswalk-thirdparty/crosswalk-thirdparty_git.bb
+++ b/recipes-tizen/crosswalk-thirdparty/crosswalk-thirdparty_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/framework/web/crosswalk;tag=460390ae423ed8b84ea014d6389dc529cde2aec5;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=715ce55f9def9e994dbb3dc5b08d3c61afcaa6cd;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/recipes-tizen/crosswalk/crosswalk.inc b/recipes-tizen/crosswalk/crosswalk.inc
index 7006e56..156da18 100644 (file)
--- a/recipes-tizen/crosswalk/crosswalk.inc
+++ b/recipes-tizen/crosswalk/crosswalk.inc
@@ -116,7 +116,6 @@ do_compile() {
  if [ -f ${prefix}/share/crosswalk-thirdparty/out.tgz ]; then
    tar -zxvf ${prefix}/share/crosswalk-thirdparty/out.tgz
  fi
- 
  find . -exec touch -a -m -t "200912120000" {} \;
  
  # Stop unconditionally passing -Wall to the compiler. Chromium has its own

diff --git a/recipes-tizen/crosswalk/crosswalk_git.bb b/recipes-tizen/crosswalk/crosswalk_git.bb
index eee2471..e98d01d 100644 (file)
--- a/recipes-tizen/crosswalk/crosswalk_git.bb
+++ b/recipes-tizen/crosswalk/crosswalk_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/framework/web/crosswalk;tag=460390ae423ed8b84ea014d6389dc529cde2aec5;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=715ce55f9def9e994dbb3dc5b08d3c61afcaa6cd;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/recipes-tizen/genivi-shell/genivi-shell-extraconf.inc b/recipes-tizen/genivi-shell/genivi-shell-extraconf.inc
index 36ec6db..bfd8a83 100644 (file)
--- a/recipes-tizen/genivi-shell/genivi-shell-extraconf.inc
+++ b/recipes-tizen/genivi-shell/genivi-shell-extraconf.inc
@@ -23,11 +23,7 @@ do_install_append() {
     rm -rf ${D}/usr/src
 }
 
-FILES_${PN}-dbg = "${prefix}/bin/.debug/IVISurfaceCreator"
-FILES_${PN}-dbg = "${prefix}/bin/.debug/LayerManagerControl"
-FILES_${PN}-dbg = "${prefix}/bin/.debug/EGLWLMockNavigation"
-FILES_${PN}-dbg = "${prefix}/lib/.debug/libilmCommon.so.1.2.0"
-FILES_${PN}-dbg = "${prefix}/lib/.debug/libilmControl.so.1.2.0"
-FILES_${PN}-dbg = "${prefix}/lib/.debug/libilmClient.so.1.2.0"
-FILES_${PN}-dbg = "${prefix}/lib/weston/.debug/ivi-controller.so"
-
+FILES_${PN}-dbg += "${prefix}/bin/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/weston/.debug"
+FILES_${PN}-dbg += "${prefix}/src/debug/.debug"
+FILES_${PN}-dbg += "${prefix}/lib/.debug"

diff --git a/recipes-tizen/gsignond/gsignond.inc b/recipes-tizen/gsignond/gsignond.inc
index c81a5cf..d0c475f 100644 (file)
--- a/recipes-tizen/gsignond/gsignond.inc
+++ b/recipes-tizen/gsignond/gsignond.inc
@@ -98,10 +98,10 @@ do_install() {
    rm -f ${D}${infodir}/dir 
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
- install -m 755 -d ${D}${systemd_unitdir}/user
- install -m 644 data/gsignond.service ${D}${systemd_unitdir}/user/
- install -m 755 -d ${D}${systemd_unitdir}/user/weston.target.wants
- ln -s ../gsignond.service ${D}${systemd_unitdir}/user/weston.target.wants/gsignond.service
+ install -m 755 -d ${D}${prefix}/lib/systemd/user
+ install -m 644 data/gsignond.service ${D}${prefix}/lib/systemd/user/
+ install -m 755 -d ${D}${prefix}/lib/systemd/user/weston.target.wants
+ ln -s ../gsignond.service ${D}${prefix}/lib/systemd/user/weston.target.wants/gsignond.service
  
  
 }
@@ -135,8 +135,8 @@ gsignond_files += "${prefix}/lib/libgsignond-*.so.*"
 gsignond_files += "${prefix}/lib/gsignond/extensions/*.so*"
 gsignond_files += "${prefix}/lib/gsignond/gplugins/*.so*"
 gsignond_files += "${prefix}/lib/gsignond/pluginloaders/gsignond-plugind"
-gsignond_files += "${systemd_unitdir}/user/gsignond.service"
-gsignond_files += "${systemd_unitdir}/user/weston.target.wants/gsignond.service"
+gsignond_files += "${prefix}/lib/systemd/user/gsignond.service"
+gsignond_files += "${prefix}/lib/systemd/user/weston.target.wants/gsignond.service"
 gsignond_files += "${sysconfdir}/gsignond.conf"
 MANIFESTFILES_${PN} = "gsignond.manifest"
 

diff --git a/recipes-tizen/ico-uxf-device-input-controller/ico-uxf-device-input-controller.inc b/recipes-tizen/ico-uxf-device-input-controller/ico-uxf-device-input-controller.inc
index 45b106c..e852913 100644 (file)
--- a/recipes-tizen/ico-uxf-device-input-controller/ico-uxf-device-input-controller.inc
+++ b/recipes-tizen/ico-uxf-device-input-controller/ico-uxf-device-input-controller.inc
@@ -86,11 +86,11 @@ do_install() {
  
  # configurations
  mkdir -p ${D}/opt/etc/ico/device-input-controller
- mkdir -p ${D}${systemd_unitdir}/user
+ mkdir -p ${D}${prefix}/lib/systemd/user
  install -m 0644 settings/drivingforcegt.conf ${D}/opt/etc/ico/device-input-controller
  install -m 0644 settings/g27racingwheel.conf ${D}/opt/etc/ico/device-input-controller
  install -m 0755 settings/set_daynight.sh ${D}/opt/etc/ico/device-input-controller
- install -m 644 settings/ico-device-input-controller.service ${D}${systemd_unitdir}/user/ico-device-input-controller.service
+ install -m 644 settings/ico-device-input-controller.service ${D}${prefix}/lib/systemd/user/ico-device-input-controller.service
  
  
 }
@@ -103,7 +103,7 @@ ico-uxf-device-input-controller_files += "${prefix}/bin/ico_dic-gtforce"
 ico-uxf-device-input-controller_files += "/opt/etc/ico/device-input-controller/drivingforcegt.conf"
 ico-uxf-device-input-controller_files += "/opt/etc/ico/device-input-controller/g27racingwheel.conf"
 ico-uxf-device-input-controller_files += "/opt/etc/ico/device-input-controller/set_daynight.sh"
-ico-uxf-device-input-controller_files += "${systemd_unitdir}/user/ico-device-input-controller.service"
+ico-uxf-device-input-controller_files += "${prefix}/lib/systemd/user/ico-device-input-controller.service"
 MANIFESTFILES_${PN} = "ico-uxf-device-input-controller.manifest"
 
 FILES_${PN} = "${ico-uxf-device-input-controller_files}"

diff --git a/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc b/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc
index ac53336..e410316 100644 (file)
--- a/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc
+++ b/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc
@@ -24,9 +24,8 @@ do_compile_prepend()  {
 
 do_install_append() {
     if ${@bb.utils.contains('SYS_CTLR_PROVIDER', 'ico-uxf-homescreen', 'false', 'true', d)}; then
-      rm -f ${D}${systemd_unitdir}/user/ico-uxf-wait-launchpad-ready.path
-      rm -f ${D}${systemd_unitdir}/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path
-      rm -f ${D}${systemd_unitdir}/user/ico-system-controller.service
+      rm -f ${D}${prefix}/lib/systemd/user/ico-uxf-wait-launchpad-ready.path
+      rm -fr ${D}${prefix}/lib/systemd/use
     fi
 }
 

diff --git a/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc b/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc
index 03b00bb..a5c939e 100644 (file)
--- a/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc
+++ b/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen.inc
@@ -217,9 +217,9 @@ MANIFESTFILES_${PN}-system-controller-dev = "ico-uxf-homescreen.manifest"
 
 ico-uxf-homescreen-system-controller_files = ""
 ico-uxf-homescreen-system-controller_files += "${prefix}/share/packages/org.tizen.ico.system-controller.xml"
-ico-uxf-homescreen-system-controller_files += "${systemd_unitdir}/user/ico-uxf-wait-launchpad-ready.path"
-ico-uxf-homescreen-system-controller_files += "${systemd_unitdir}/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path"
-ico-uxf-homescreen-system-controller_files += "${systemd_unitdir}/user/ico-system-controller.service"
+ico-uxf-homescreen-system-controller_files += "${prefix}/lib/systemd/user/ico-uxf-wait-launchpad-ready.path"
+ico-uxf-homescreen-system-controller_files += "${prefix}/lib/systemd/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path"
+ico-uxf-homescreen-system-controller_files += "${prefix}/lib/systemd/user/ico-system-controller.service"
 ico-uxf-homescreen-system-controller_files += "${prefix}/apps/org.tizen.ico.system-controller/bin"
 ico-uxf-homescreen-system-controller_files += "/home/app/ico/defaultApps.info"
 ico-uxf-homescreen-system-controller_files += "/home/app/ico"

diff --git a/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc b/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc
index 93faf91..c4542c4 100644 (file)
--- a/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc
+++ b/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc
@@ -85,10 +85,10 @@ do_install() {
  
  # configurations
  mkdir -p ${D}${sysconfdir}/ico-vic-carsim/
- mkdir -p ${D}${systemd_unitdir}/user
+ mkdir -p ${D}${prefix}/lib/systemd/user
  install -m 0644 G25.conf ${D}${sysconfdir}/ico-vic-carsim/
  install -m 0644 G27.conf ${D}${sysconfdir}/ico-vic-carsim/
- install -m 0644 ico-vic-carsim.service ${D}${systemd_unitdir}/user/ico-vic-carsim.service
+ install -m 0644 ico-vic-carsim.service ${D}${prefix}/lib/systemd/user/ico-vic-carsim.service
  
  
 }
@@ -112,7 +112,7 @@ ico-vic-carsimulator_files = ""
 ico-vic-carsimulator_files += "${prefix}/bin/ico-vic-carsim"
 ico-vic-carsimulator_files += "${prefix}/bin/*"
 ico-vic-carsimulator_files += "${sysconfdir}/ico-vic-carsim/*"
-ico-vic-carsimulator_files += "${systemd_unitdir}/user/ico-vic-carsim.service"
+ico-vic-carsimulator_files += "${prefix}/lib/systemd/user/ico-vic-carsim.service"
 CONFFILES_${PN} = ""
 CONFFILES_${PN} += "${sysconfdir}/ico-vic-carsim/*"
 MANIFESTFILES_${PN} = "ico-vic-carsimulator.manifest"

diff --git a/recipes-tizen/media-server/media-server.inc b/recipes-tizen/media-server/media-server.inc
index cf95b6f..e34bf2d 100644 (file)
--- a/recipes-tizen/media-server/media-server.inc
+++ b/recipes-tizen/media-server/media-server.inc
@@ -108,8 +108,8 @@ do_install() {
  
  mkdir -p ${D}${systemd_unitdir}/system/multi-user.target.wants
  install -m 644 ${S}/packaging/media-server.service ${D}${systemd_unitdir}/system/media-server.service
- mkdir -p ${D}${systemd_unitdir}/user
- install -m 644 ${S}/packaging/media-server-user.service ${D}${systemd_unitdir}/user/media-server-user.service
+ mkdir -p ${D}${prefix}/lib/systemd/user
+ install -m 644 ${S}/packaging/media-server-user.service ${D}${prefix}/lib/systemd/user/media-server-user.service
  ln -s ../media-server.service ${D}${systemd_unitdir}/system/multi-user.target.wants/media-server.service
  mkdir -p ${D}${prefix}/data/data-media/Camera
  mkdir -p ${D}${prefix}/data/data-media/Downloads
@@ -147,8 +147,8 @@ pkg_postinst_${PN}() {
     chgrp -R users $D${prefix}/data/data-media
     chgrp -R users $D${prefix}/data/file-manager-service
     # setup dbupdate in user session
-    mkdir -p ${systemd_unitdir}/user/default.target.requires/
-    ln -sf ../media-server-user.service  ${systemd_unitdir}/user/default.target.wants/
+    mkdir -p $D${prefix}/lib/systemd/user/default.target.requires/
+    ln -sf ../media-server-user.service  $D${prefix}/lib/systemd/user/default.target.wants/
 
 }
 
@@ -175,7 +175,7 @@ media-server_files += "${prefix}/bin/media-scanner"
 media-server_files += "${prefix}/bin/mediadb-update"
 media-server_files += "${systemd_unitdir}/system/media-server.service"
 media-server_files += "${systemd_unitdir}/system/multi-user.target.wants/media-server.service"
-media-server_files += "${systemd_unitdir}/user/media-server-user.service"
+media-server_files += "${prefix}/lib/systemd/user/media-server-user.service"
 media-server_files += "${prefix}/bin/media-data-sdk_create_db.sh"
 media-server_files += "${prefix}/data/data-media/*"
 media-server_files += "${prefix}/data/file-manager-service/.thumb/*"

diff --git a/recipes-tizen/meta-generic/meta-generic_git.bb b/recipes-tizen/meta-generic/meta-generic_git.bb
index 905a856..c48dbe9 100644 (file)
--- a/recipes-tizen/meta-generic/meta-generic_git.bb
+++ b/recipes-tizen/meta-generic/meta-generic_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/meta-generic;tag=b7d3ced2f1ab861d84626c24e2c4912730ca4b08;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/meta-generic;tag=72a4d5300da9073826427213bad09ffc53d9934e;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/recipes-tizen/msg-service/msg-service.inc b/recipes-tizen/msg-service/msg-service.inc
index 8f25b25..d1a411f 100644 (file)
--- a/recipes-tizen/msg-service/msg-service.inc
+++ b/recipes-tizen/msg-service/msg-service.inc
@@ -128,7 +128,7 @@ do_compile() {
          -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
          ${EXTRA_OECMAKE} . \
        -DTZ_SYS_SHARE=${prefix}/share \
-       -DUNITDIR_USER=${systemd_unitdir}/user \
+       -DUNITDIR_USER=${prefix}/lib/systemd/user \
        -DTZ_SYS_SMACK=${sysconfdir}/smack
  
  make -j16
@@ -161,10 +161,10 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
- mkdir -p ${D}${systemd_unitdir}/user/tizen-middleware.target.wants
- #install -m 0644 ${S}/packaging/msg-service.service ${D}${systemd_unitdir}/user/
- ln -s ../msg-service.service ${D}${systemd_unitdir}/user/tizen-middleware.target.wants/msg-service.service
- ln -s ../msg-service-log.service ${D}${systemd_unitdir}/user/tizen-middleware.target.wants/msg-service-log.service
+ mkdir -p ${D}${prefix}/lib/systemd/user/tizen-middleware.target.wants
+ #install -m 0644 ${S}/packaging/msg-service.service ${D}${prefix}/lib/systemd/user/
+ ln -s ../msg-service.service ${D}${prefix}/lib/systemd/user/tizen-middleware.target.wants/msg-service.service
+ ln -s ../msg-service-log.service ${D}${prefix}/lib/systemd/user/tizen-middleware.target.wants/msg-service-log.service
  
  mkdir -p  ${D}${sysconfdir}/rc.d/rc3.d
  ln -s ${sysconfdir}/rc.d/init.d/msg-server  ${D}${sysconfdir}/rc.d/rc3.d/S70msg-server
@@ -251,10 +251,10 @@ msg-service-tools_files += "${prefix}/share/msg-service/plugin.cfg"
 msg-service-tools_files += "${sysconfdir}/rc.d/init.d/msg-server"
 msg-service-tools_files += "${sysconfdir}/rc.d/rc3.d/S70msg-server"
 msg-service-tools_files += "${sysconfdir}/rc.d/rc5.d/S70msg-server"
-msg-service-tools_files += "${systemd_unitdir}/user/msg-service.service"
-msg-service-tools_files += "${systemd_unitdir}/user/msg-service-log.service"
-msg-service-tools_files += "${systemd_unitdir}/user/tizen-middleware.target.wants/msg-service.service"
-msg-service-tools_files += "${systemd_unitdir}/user/tizen-middleware.target.wants/msg-service-log.service"
+msg-service-tools_files += "${prefix}/lib/systemd/user/msg-service.service"
+msg-service-tools_files += "${prefix}/lib/systemd/user/msg-service-log.service"
+msg-service-tools_files += "${prefix}/lib/systemd/user/tizen-middleware.target.wants/msg-service.service"
+msg-service-tools_files += "${prefix}/lib/systemd/user/tizen-middleware.target.wants/msg-service-log.service"
 msg-service-tools_files += "${sysconfdir}/config/sysinfo-message.xml"
 msg-service-tools_files += "/var/log/msgfw"
 MANIFESTFILES_${PN}-tools = "msg-service-tools.manifest"

diff --git a/recipes-tizen/murphy/murphy-extraconf.inc b/recipes-tizen/murphy/murphy-extraconf.inc
index d01833d..5c1cee3 100644 (file)
--- a/recipes-tizen/murphy/murphy-extraconf.inc
+++ b/recipes-tizen/murphy/murphy-extraconf.inc
@@ -2,18 +2,18 @@
 PARALLEL_MAKE = ""
 
 do_install_append() {
-    rm -fr ${D}${systemd_unitdir}/user
+    rm -fr ${D}${prefix}/lib/systemd/user
     rm ${D}/usr/lib/libmurphy-plugin-system-monitor*
 
     if ${@bb.utils.contains('SYS_CTLR_PROVIDER', 'murphy', 'false', 'true', d)}; then
       rm ${D}${prefix}/lib/murphy/plugins/plugin-system-controller.so
-      rm ${D}${systemd_unitdir}/user/ico-homescreen.service
-      rm ${D}${systemd_unitdir}/user/murphy-wait-for-launchpad-ready.path
+      rm ${D}${prefix}/lib/systemd/user/ico-homescreen.service
+      rm ${D}${prefix}/lib/systemd/user/murphy-wait-for-launchpad-ready.path
     fi
 }
 
-FILES_${PN}-dev += " /usr/include/murphy" 
-FILES_${PN}-dbg += " /usr/lib/murphy/plugins/.debug"
+FILES_${PN}-dev += " ${prefix}/include/murphy" 
+FILES_${PN}-dbg += " ${prefix}/lib/murphy/plugins/.debug"
 
 murphy-doc_files = ""
 murphy-doc_files += "${prefix}/share/doc/murphy/AUTHORS"

diff --git a/recipes-tizen/oma-ds-agent/oma-ds-agent-extraconf.inc b/recipes-tizen/oma-ds-agent/oma-ds-agent-extraconf.inc
index 22854f2..784087c 100644 (file)
--- a/recipes-tizen/oma-ds-agent/oma-ds-agent-extraconf.inc
+++ b/recipes-tizen/oma-ds-agent/oma-ds-agent-extraconf.inc
@@ -1 +1,3 @@
-INSANE_SKIP_ds-public-plugins = "dev-so"
\ No newline at end of file
+INSANE_SKIP_ds-public-plugins = "dev-so"
+
+FILES_${PN}-dbg += "${prefix}/lib/sync-agent/ds-public/.debug"
\ No newline at end of file

diff --git a/recipes-tizen/phoned/phoned.inc b/recipes-tizen/phoned/phoned.inc
index ce4d052..4389e21 100644 (file)
--- a/recipes-tizen/phoned/phoned.inc
+++ b/recipes-tizen/phoned/phoned.inc
@@ -68,7 +68,7 @@ do_compile() {
          ${EXTRA_OECMAKE} . \
         -DCMAKE_INSTALL_PREFIX=${prefix} \
         -DENABLE_TIME_TRACER="OFF" \
-        -DSYSTEMD_SERVICE_PREFIX="${systemd_unitdir}/user"
+        -DSYSTEMD_SERVICE_PREFIX="${prefix}/lib/systemd/user"
  
  oe_runmake -j16 VERBOSE=1
  
@@ -110,8 +110,8 @@ phoned_files = ""
 phoned_files += "${prefix}/lib/pkgconfig/phoned.pc"
 phoned_files += "${prefix}/bin/phoned"
 phoned_files += "${prefix}/share/dbus-1/services/org.tizen.phone.service"
-phoned_files += "${systemd_unitdir}/user/phoned.service"
-phoned_files += "${systemd_unitdir}/user/weston.target.wants/phoned.service"
+phoned_files += "${prefix}/lib/systemd/user/phoned.service"
+phoned_files += "${prefix}/lib/systemd/user/weston.target.wants/phoned.service"
 MANIFESTFILES_${PN} = "phoned.manifest"
 
 FILES_${PN} = "${phoned_files}"

diff --git a/recipes-tizen/privacy-manager-server/files/fix-include-directories-in-CMakeList.txt.patch b/recipes-tizen/privacy-manager-server/files/fix-include-directories-in-CMakeList.txt.patch
index baa56f4..7af70a8 100644 (file)
--- a/recipes-tizen/privacy-manager-server/files/fix-include-directories-in-CMakeList.txt.patch
+++ b/recipes-tizen/privacy-manager-server/files/fix-include-directories-in-CMakeList.txt.patch
@@ -15,10 +15,5 @@ index b8a0488..00f8428 100644
      "${CMAKE_SOURCE_DIR}/client/inc/"
      "${CMAKE_SOURCE_DIR}/common/inc/"
      )
-@@ -61,5 +57,5 @@ ADD_CUSTOM_COMMAND(TARGET ${this_target}
-     COMMENT "strip ${this_target}"
-         )   
- 
--INSTALL(TARGETS ${this_target} DESTINATION "../etc/package-manager/parserlib")
-+INSTALL(TARGETS ${this_target} DESTINATION lib)
+
  

diff --git a/recipes-tizen/privacy-manager-server/privacy-manager-server.inc b/recipes-tizen/privacy-manager-server/privacy-manager-server.inc
index b54f92d..d72ad6c 100644 (file)
--- a/recipes-tizen/privacy-manager-server/privacy-manager-server.inc
+++ b/recipes-tizen/privacy-manager-server/privacy-manager-server.inc
@@ -122,7 +122,7 @@ do_compile() {
          -DVERSION=0.0.4 \
          -DFILTER_LISTED_PKG=ON \
          -DPRIVACY_POPUP=OFF
- make -j16
+ oe_runmake -j16
  
  
  
@@ -154,9 +154,9 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
- mkdir -p ${D}${prefix}/lib/systemd/system/multi-user.target.wants
- #install -m 0644 ${S}/packaging/privacy-manager-server.service ${D}${prefix}/lib/systemd/system/privacy-manager-server.service
- #ln -sf /usr/lib/systemd/system/privacy-manager-server.service ${D}${prefix}/lib/systemd/system/multi-user.target.wants/privacy-manager-server.service
+ #mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
+ #install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/privacy-manager-server.service
+ #ln -sf /usr/lib/systemd/system/privacy-manager-server.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/privacy-manager-server.service
  
  
  
@@ -171,12 +171,12 @@ pkg_postinst_privacy-manager-client() {
 pkg_postinst_privacy-manager-server() {
     #!/bin/sh -e
 
-    [ "x$D" == "x" ] && ldconfig
+    ldconfig
     echo "Check privacy DB"
     if [ ! -f $D${prefix}/dbspace/.privacy.db ]
     then
        echo "Create privacy DB"
-       $D${prefix}/bin/privacy_manager_create_clean_db.sh
+       privacy_manager_create_clean_db.sh
     fi
     chsmack -a 'User' $D${prefix}/dbspace/.privacy.db*
     chsmack -a 'User' $D${prefix}/dbspace/.privacylist.db*
@@ -224,7 +224,7 @@ MANIFESTFILES_privacy-manager-client = "privacy-manager-client.manifest"
 privacy-manager-server_files = ""
 privacy-manager-server_files += "${prefix}/lib/libprivacy-manager-server.so*"
 privacy-manager-server_files += "${prefix}/dbspace/.privacylist.db"
-privacy-manager-server_files += "/usr/bin/*"
+privacy-manager-server_files += "${prefix}/bin/*"
 MANIFESTFILES_${PN} = "privacy-manager-server.manifest"
 
 privacy-manager-server-dev_files = ""

diff --git a/recipes-tizen/privacy-manager-server/privacy-manager-server_git.bb b/recipes-tizen/privacy-manager-server/privacy-manager-server_git.bb
index ba2c094..c975ba9 100644 (file)
--- a/recipes-tizen/privacy-manager-server/privacy-manager-server_git.bb
+++ b/recipes-tizen/privacy-manager-server/privacy-manager-server_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/core/security/privacy-manager;tag=9771931036d2c3ced1e962f3caf149999b43f23b;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/security/privacy-manager;tag=866b0492038f7515b22f415f40c6edfa02e8cb84;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/recipes-tizen/rpm/rpm_git.bb b/recipes-tizen/rpm/rpm_git.bb
index 2e0204f..4d4592e 100644 (file)
--- a/recipes-tizen/rpm/rpm_git.bb
+++ b/recipes-tizen/rpm/rpm_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/rpm;tag=4911aabb47f039aa3d205aa6c6ebe1a982797c97;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/rpm;tag=b56ed49a97939d11dd4270c9550966c43b9ce5a6;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/recipes-tizen/systemd/systemd-extraconf.inc b/recipes-tizen/systemd/systemd-extraconf.inc
index 883bb7c..073ef50 100644 (file)
--- a/recipes-tizen/systemd/systemd-extraconf.inc
+++ b/recipes-tizen/systemd/systemd-extraconf.inc
@@ -10,7 +10,6 @@ GROUPADD_PARAM_${PN} += "--system -g 19 floppy"
 
 EXTRA_OECONF += "--disable-manpages"
 EXTRA_OECONF += "--without-python"
-#EXTRA_OECONF += "--with-rootprefix=/"
 
 GTKDOC_DOCDIR = "${S}/docs/"
 
@@ -42,27 +41,19 @@ pkg_preinst_${PN}() {
     $D${prefix}/bin/mv -n ${sysconfdir}/systemd/systemd-journald.conf ${sysconfdir}/systemd/journald.conf >/dev/null 2>&1 || :
 }
 
-systemd_files += "${sysconfdir}/*"
-systemd_files += "/usr/lib64/python2.7/site-packages/systemd/__init__.py"
-systemd_files += "/usr/lib64/python2.7/site-packages/systemd/daemon.py"
-systemd_files += "/usr/lib64/python2.7/site-packages/systemd/_daemon.so"
-systemd_files += "/usr/lib64/python2.7/site-packages/systemd/_reader.so"
-systemd_files += "/usr/lib64/python2.7/site-packages/systemd/_journal.so"
-systemd_files += "/usr/lib64/python2.7/site-packages/systemd/__init__.pyo"
-systemd_files += "/usr/lib64/python2.7/site-packages/systemd/daemon.pyo"
-systemd_files += "/usr/lib64/python2.7/site-packages/systemd/journal.pyo"
-systemd_files += "/usr/lib64/python2.7/site-packages/systemd/journal.py"
-systemd_files += "/usr/lib64/python2.7/site-packages/systemd/id128.so"
-systemd_files += "/usr/lib64/python2.7/site-packages/systemd/login.so"
-systemd_files += "${prefix}/lib/rpm/macros.d"
-systemd_files += "/var/log"
-systemd_files += "/var/lib/systemd"
-systemd_files += "/var/volatile/log/README"
-systemd_files += "/var/volatile/log/journal"
-
-systemd-dbg_files += "${prefix}/lib/security/.debug"
-systemd-dbg_files += "${prefix}/lib/systemd/system-generators/.debug"
-systemd-dbg_files += "${prefix}/lib/udev/.debug"
-systemd-dbg_files += "${prefix}/lib64/python2.7/site-packages/systemd/.debug"
+systemd-dbg_files += "${systemd_unitdir}/.debug"
+systemd-dbg_files += "/lib/security/.debug"
+systemd-dbg_files += "${systemd_unitdir}/system-generators/.debug"
+systemd-dbg_files += "/lib/udev/.debug"
 
 FILES_${PN}-dbg += "${systemd-dbg_files}"
+
+
+FILES_${PN}-locale-fr += "${prefix}/lib/systemd/catalog/systemd.fr.catalog"
+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"
+  
+  
+  
+  
\ No newline at end of file

diff --git a/recipes-tizen/systemd/systemd.inc b/recipes-tizen/systemd/systemd.inc
index ec5abfc..8b20877 100644 (file)
--- a/recipes-tizen/systemd/systemd.inc
+++ b/recipes-tizen/systemd/systemd.inc
@@ -136,12 +136,13 @@ do_compile() {
   intltoolize --force --automake
   
   autotools_do_configure
-  oe_runmake -j16           systemunitdir=${systemd_unitdir}/system           userunitdir=${systemd_unitdir}/user
+  
+  oe_runmake -j16
   
   
   
 }
-EXTRA_OECONF += " --enable-compat-libs --enable-bootchart --libexecdir=${prefix}/lib --docdir=${prefix}/share/doc/packages/systemd --disable-static --with-sysvinit-path= --with-sysvrcnd-path= --with-smack-run-label=System cc_cv_CFLAGS__flto=no"
+EXTRA_OECONF += " --enable-compat-libs --enable-bootchart --libexecdir=${prefix}/lib --docdir=${prefix}/share/doc/packages/systemd --disable-static --with-sysvinit-path= --with-sysvrcnd-path= --with-smack-run-label=System --with-rootprefix=/ --with-rootlibdir=//lib cc_cv_CFLAGS__flto=no"
 
 do_install() {
  export RPM_BUILD_ROOT=${D}
@@ -161,11 +162,12 @@ do_install() {
    rm -f ${D}${infodir}/dir 
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
+ 
  #find_lang systemd
  cat <<EOF >> systemd.lang
- %lang(fr) /usr/lib/systemd/catalog/systemd.fr.catalog
- %lang(it) /usr/lib/systemd/catalog/systemd.it.catalog
- %lang(ru) /usr/lib/systemd/catalog/systemd.ru.catalog
+ %lang(fr) ${prefix}/lib/systemd/catalog/systemd.fr.catalog
+ %lang(it) ${prefix}/lib/systemd/catalog/systemd.it.catalog
+ %lang(ru) ${prefix}/lib/systemd/catalog/systemd.ru.catalog
 EOF
  
  # udev links
@@ -175,22 +177,22 @@ EOF
  
  # Create SysV compatibility symlinks. systemctl/systemd are smart
  # enough to detect in which way they are called.
- ln -s ../lib/systemd/systemd ${D}${prefix}/sbin/init
- ln -s ../lib/systemd/systemd ${D}${prefix}/bin/systemd
- ln -s ../bin/systemctl ${D}${prefix}/sbin/reboot
- ln -s ../bin/systemctl ${D}${prefix}/sbin/halt
- ln -s ../bin/systemctl ${D}${prefix}/sbin/poweroff
- ln -s ../bin/systemctl ${D}${prefix}/sbin/shutdown
- ln -s ../bin/systemctl ${D}${prefix}/sbin/telinit
- ln -s ../bin/systemctl ${D}${prefix}/sbin/runlevel
+ ln -sf //lib/systemd/systemd ${D}${prefix}/sbin/init
+ ln -sf //lib/systemd/systemd ${D}${prefix}/bin/systemd
+ ln -sf ../bin/systemctl ${D}${prefix}/sbin/reboot
+ ln -sf ../bin/systemctl ${D}${prefix}/sbin/halt
+ ln -sf ../bin/systemctl ${D}${prefix}/sbin/poweroff
+ ln -sf ../bin/systemctl ${D}${prefix}/sbin/shutdown
+ ln -sf ../bin/systemctl ${D}${prefix}/sbin/telinit
+ ln -sf ../bin/systemctl ${D}${prefix}/sbin/runlevel
  
  # legacy links
- ln -s loginctl ${D}${prefix}/bin/systemd-loginctl
+ ln -sf loginctl ${D}${prefix}/bin/systemd-loginctl
  
  # We create all wants links manually at installation time to make sure
  # they are not owned and hence overriden by rpm after the used deleted
  # them.
- rm -r ${D}${sysconfdir}/systemd/system/*.target.wants
+ rm -rf ${D}${sysconfdir}/systemd/system/*.target.wants
  
  # Make sure the ghost-ing below works
  touch ${D}${sysconfdir}/systemd/system/runlevel2.target
@@ -199,13 +201,13 @@ EOF
  touch ${D}${sysconfdir}/systemd/system/runlevel5.target
  
  # Make sure these directories are properly owned
- mkdir -p ${D}${prefix}/lib/systemd/system/basic.target.wants
- mkdir -p ${D}${prefix}/lib/systemd/system/default.target.wants
- mkdir -p ${D}${prefix}/lib/systemd/system/dbus.target.wants
- mkdir -p ${D}${prefix}/lib/systemd/system/syslog.target.wants
+ mkdir -p ${D}${systemd_unitdir}/system/basic.target.wants
+ mkdir -p ${D}${systemd_unitdir}/system/default.target.wants
+ mkdir -p ${D}${systemd_unitdir}/system/dbus.target.wants
+ mkdir -p ${D}${systemd_unitdir}/system/syslog.target.wants
  
  # Make sure the user generators dir exists too
- mkdir -p ${D}${prefix}/lib/systemd/system-generators
+ mkdir -p ${D}//lib/systemd/system-generators
  mkdir -p ${D}${prefix}/lib/systemd/user-generators
  
  # Create new-style configuration files so that we can ghost-own them
@@ -215,15 +217,15 @@ EOF
  touch ${D}${sysconfdir}/machine-id
  touch ${D}${sysconfdir}/machine-info
  touch ${D}${sysconfdir}/timezone
- #mkdir -p ${D}${sysconfdir}/X11/xorg.conf.d
- #touch ${D}${sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
+ #mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
+ #touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
  
- mkdir -p ${D}${prefix}/lib/systemd/system-preset/
- mkdir -p ${D}${prefix}/lib/systemd/user-preset/
+ mkdir -p ${D}//lib/systemd/system-preset/
+ mkdir -p ${D}//lib/systemd/user-preset/
  
  # Make sure the shutdown/sleep drop-in dirs exist
- mkdir -p ${D}${prefix}/lib/systemd/system-shutdown/
- mkdir -p ${D}${prefix}/lib/systemd/system-sleep/
+ mkdir -p ${D}//lib/systemd/system-shutdown/
+ mkdir -p ${D}//lib/systemd/system-sleep/
  
  # Make sure the NTP units dir exists
  mkdir -p ${D}${prefix}/lib/systemd/ntp-units.d/
@@ -232,8 +234,8 @@ EOF
  mkdir -p ${D}${sysconfdir}/modprobe.d/
  
  # Enable readahead services
- ln -s ../systemd-readahead-collect.service ${D}${prefix}/lib/systemd/system/default.target.wants/
- ln -s ../systemd-readahead-replay.service ${D}${prefix}/lib/systemd/system/default.target.wants/
+ ln -sf ../systemd-readahead-collect.service ${D}${systemd_unitdir}/system/default.target.wants/
+ ln -sf ../systemd-readahead-replay.service ${D}${systemd_unitdir}/system/default.target.wants/
  
  # Fix the dangling /var/lock -> /run/lock symlink
  install -Dm644 tmpfiles.d/legacy.conf ${D}${prefix}/lib/tmpfiles.d/legacy.conf
@@ -247,7 +249,11 @@ EOF
  # Move macros to the proper location for Tizen
  mkdir -p ${D}${sysconfdir}/rpm
  install -m644 src/core/macros.systemd ${D}${sysconfdir}/rpm/macros.systemd
- rm -f ${D}${prefix}/lib/rpm/macros.d/macros.systemd
+ 
+ rm -fr ${D}${prefix}/lib/rpm
+ rm -fr ${D}${sysconfdir}/kernel
+ rm -fr ${D}${sysconfdir}/modprobe.d
+ rm -fr ${D}${localstatedir}
  
  
 }
@@ -297,7 +303,7 @@ pkg_prerm_${PN}() {
                     remote-fs.target \
                     systemd-readahead-replay.service \
                     systemd-readahead-collect.service >/dev/null 2>&1 || :
-            rm -f /etc/systemd/system/default.target >/dev/null 2>&1 || :
+            rm -f ${sysconfdir}/systemd/system/default.target >/dev/null 2>&1 || :
     fi
 
 }
@@ -334,13 +340,13 @@ PACKAGES += " libgudev "
 PACKAGES += " systemd-analyze "
 
 libsystemd_files = ""
-libsystemd_files += "${prefix}/lib/security/pam_systemd.so"
-libsystemd_files += "${prefix}/lib/libsystemd.so.*"
-libsystemd_files += "${prefix}/lib/libudev.so.*"
-libsystemd_files += "${prefix}/lib/libsystemd-daemon.so.*"
-libsystemd_files += "${prefix}/lib/libsystemd-id128.so.*"
-libsystemd_files += "${prefix}/lib/libsystemd-journal.so.*"
-libsystemd_files += "${prefix}/lib/libsystemd-login.so.*"
+libsystemd_files += "/lib/security/pam_systemd.so"
+libsystemd_files += "/lib/libsystemd.so.*"
+libsystemd_files += "/lib/libudev.so.*"
+libsystemd_files += "/lib/libsystemd-daemon.so.*"
+libsystemd_files += "/lib/libsystemd-id128.so.*"
+libsystemd_files += "/lib/libsystemd-journal.so.*"
+libsystemd_files += "/lib/libsystemd-login.so.*"
 libsystemd_files += "${prefix}/lib/libnss_myhostname.so.2"
 MANIFESTFILES_lib${PN} = "systemd.manifest"
 
@@ -350,13 +356,13 @@ systemd_files += "${sysconfdir}/pam.d/systemd-user"
 systemd_files += "${prefix}/bin/bootctl"
 systemd_files += "${prefix}/bin/busctl"
 systemd_files += "${prefix}/bin/kernel-install"
-systemd_files += "${prefix}/bin/machinectl"
+systemd_files += "/bin/machinectl"
 systemd_files += "${prefix}/bin/systemd-run"
 systemd_files += "${prefix}/lib/kernel"
 systemd_files += "${prefix}/lib/kernel/install.d"
 systemd_files += "${prefix}/lib/kernel/install.d/50-depmod.install"
 systemd_files += "${prefix}/lib/kernel/install.d/90-loaderentry.install"
-systemd_files += "${prefix}/lib/systemd/system-generators/systemd-efi-boot-generator"
+systemd_files += "/lib/systemd/system-generators/systemd-efi-boot-generator"
 systemd_files += "${prefix}/bin/hostnamectl"
 systemd_files += "${prefix}/bin/localectl"
 systemd_files += "${prefix}/bin/systemd-coredumpctl"
@@ -373,14 +379,14 @@ systemd_files += "${prefix}/share/zsh/site-functions"
 systemd_files += "${prefix}/share/zsh/site-functions/*"
 systemd_files += "${sysconfdir}/udev"
 systemd_files += "${sysconfdir}/udev/rules.d"
-systemd_files += "${prefix}/lib/systemd"
-systemd_files += "${prefix}/lib/systemd/system"
-systemd_files += "${prefix}/lib/systemd/system-generators"
+systemd_files += "/lib/systemd"
+systemd_files += "${systemd_unitdir}/system"
+systemd_files += "/lib/systemd/system-generators"
 systemd_files += "${prefix}/lib/systemd/user-generators"
-systemd_files += "${prefix}/lib/systemd/system-preset"
-systemd_files += "${prefix}/lib/systemd/user-preset"
-systemd_files += "${prefix}/lib/systemd/system-shutdown"
-systemd_files += "${prefix}/lib/systemd/system-sleep"
+systemd_files += "/lib/systemd/system-preset"
+systemd_files += "/lib/systemd/user-preset"
+systemd_files += "/lib/systemd/system-shutdown"
+systemd_files += "/lib/systemd/system-sleep"
 systemd_files += "${prefix}/lib/tmpfiles.d"
 systemd_files += "${prefix}/lib/sysctl.d"
 systemd_files += "${prefix}/lib/modules-load.d"
@@ -388,6 +394,7 @@ systemd_files += "${prefix}/lib/binfmt.d"
 systemd_files += "${prefix}/lib/firmware"
 systemd_files += "${prefix}/lib/firmware/updates"
 systemd_files += "${prefix}/share/systemd"
+systemd_files += "${prefix}/lib/systemd/ntp-units.d"
 systemd_files += "${sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf"
 systemd_files += "${sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf"
 systemd_files += "${sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf"
@@ -402,15 +409,15 @@ systemd_files += "${sysconfdir}/udev/udev.conf"
 systemd_files += "${sysconfdir}/rpm/macros.systemd"
 systemd_files += "${sysconfdir}/xdg/systemd"
 systemd_files += "${prefix}/bin/systemd"
-systemd_files += "${prefix}/bin/systemctl"
-systemd_files += "${prefix}/bin/systemd-notify"
-systemd_files += "${prefix}/bin/systemd-ask-password"
-systemd_files += "${prefix}/bin/systemd-tty-ask-password-agent"
-systemd_files += "${prefix}/bin/systemd-machine-id-setup"
-systemd_files += "${prefix}/bin/loginctl"
+systemd_files += "/bin/systemctl"
+systemd_files += "/bin/systemd-notify"
+systemd_files += "/bin/systemd-ask-password"
+systemd_files += "/bin/systemd-tty-ask-password-agent"
+systemd_files += "/bin/systemd-machine-id-setup"
+systemd_files += "/bin/loginctl"
 systemd_files += "${prefix}/bin/systemd-loginctl"
-systemd_files += "${prefix}/bin/journalctl"
-systemd_files += "${prefix}/bin/systemd-tmpfiles"
+systemd_files += "/bin/journalctl"
+systemd_files += "/bin/systemd-tmpfiles"
 systemd_files += "${prefix}/bin/systemd-nspawn"
 systemd_files += "${prefix}/bin/systemd-stdio-bridge"
 systemd_files += "${prefix}/bin/systemd-cat"
@@ -418,12 +425,12 @@ systemd_files += "${prefix}/bin/systemd-cgls"
 systemd_files += "${prefix}/bin/systemd-cgtop"
 systemd_files += "${prefix}/bin/systemd-delta"
 systemd_files += "${prefix}/bin/systemd-detect-virt"
-systemd_files += "${prefix}/bin/systemd-inhibit"
-systemd_files += "${prefix}/bin/udevadm"
+systemd_files += "/bin/systemd-inhibit"
+systemd_files += "/bin/udevadm"
 systemd_files += "${prefix}/lib/sysctl.d/*.conf"
-systemd_files += "${prefix}/lib/systemd/systemd"
-systemd_files += "${prefix}/lib/systemd/system"
-systemd_files += "${prefix}/lib/systemd/system/basic.target.wants"
+systemd_files += "/lib/systemd/systemd"
+systemd_files += "${systemd_unitdir}/system"
+systemd_files += "${systemd_unitdir}/system/basic.target.wants"
 systemd_files += "${prefix}/lib/systemd/user"
 systemd_files += "${prefix}/lib/systemd/network"
 systemd_files += "${prefix}/lib/systemd/user/basic.target"
@@ -440,14 +447,14 @@ systemd_files += "${prefix}/lib/systemd/user/timers.target"
 systemd_files += "${prefix}/lib/systemd/user/busnames.target"
 systemd_files += "${prefix}/lib/systemd/network/80-container-host0.network"
 systemd_files += "${prefix}/lib/systemd/network/99-default.link"
-systemd_files += "${prefix}/lib/systemd/systemd-*"
+systemd_files += "/lib/systemd/systemd-*"
 systemd_files += "${prefix}/lib/systemd/catalog"
 systemd_files += "${prefix}/lib/systemd/catalog/systemd.catalog"
-systemd_files += "${prefix}/lib/udev"
-systemd_files += "${prefix}/lib/systemd/system-generators/systemd-getty-generator"
-systemd_files += "${prefix}/lib/systemd/system-generators/systemd-fstab-generator"
-systemd_files += "${prefix}/lib/systemd/system-generators/systemd-system-update-generator"
-systemd_files += "${prefix}/lib/systemd/system-generators/systemd-gpt-auto-generator"
+systemd_files += "/lib/udev"
+systemd_files += "/lib/systemd/system-generators/systemd-getty-generator"
+systemd_files += "/lib/systemd/system-generators/systemd-fstab-generator"
+systemd_files += "/lib/systemd/system-generators/systemd-system-update-generator"
+systemd_files += "/lib/systemd/system-generators/systemd-gpt-auto-generator"
 systemd_files += "${prefix}/lib/tmpfiles.d/systemd.conf"
 systemd_files += "${prefix}/lib/tmpfiles.d/x11.conf"
 systemd_files += "${prefix}/lib/tmpfiles.d/tmp.conf"
@@ -480,6 +487,7 @@ systemd_files += "${prefix}/share/polkit-1/actions/org.freedesktop.timedate1.pol
 systemd_files += "${prefix}/share/pkgconfig/systemd.pc"
 systemd_files += "${prefix}/share/pkgconfig/udev.pc"
 CONFFILES_${PN} = ""
+CONFFILES_${PN} += "${sysconfdir}/systemd/bootchart.conf"
 CONFFILES_${PN} += "${sysconfdir}/pam.d/systemd-user"
 MANIFESTFILES_${PN} = "systemd.manifest"
 DIRFILES_${PN} = ""
@@ -495,14 +503,14 @@ DIRFILES_${PN} += "${sysconfdir}/binfmt.d"
 DIRFILES_${PN} += "${prefix}/share/zsh/site-functions"
 DIRFILES_${PN} += "${sysconfdir}/udev"
 DIRFILES_${PN} += "${sysconfdir}/udev/rules.d"
-DIRFILES_${PN} += "${prefix}/lib/systemd"
-DIRFILES_${PN} += "${prefix}/lib/systemd/system"
-DIRFILES_${PN} += "${prefix}/lib/systemd/system-generators"
+DIRFILES_${PN} += "/lib/systemd"
+DIRFILES_${PN} += "${systemd_unitdir}/system"
+DIRFILES_${PN} += "/lib/systemd/system-generators"
 DIRFILES_${PN} += "${prefix}/lib/systemd/user-generators"
-DIRFILES_${PN} += "${prefix}/lib/systemd/system-preset"
-DIRFILES_${PN} += "${prefix}/lib/systemd/user-preset"
-DIRFILES_${PN} += "${prefix}/lib/systemd/system-shutdown"
-DIRFILES_${PN} += "${prefix}/lib/systemd/system-sleep"
+DIRFILES_${PN} += "/lib/systemd/system-preset"
+DIRFILES_${PN} += "/lib/systemd/user-preset"
+DIRFILES_${PN} += "/lib/systemd/system-shutdown"
+DIRFILES_${PN} += "/lib/systemd/system-sleep"
 DIRFILES_${PN} += "${prefix}/lib/tmpfiles.d"
 DIRFILES_${PN} += "${prefix}/lib/sysctl.d"
 DIRFILES_${PN} += "${prefix}/lib/modules-load.d"
@@ -510,7 +518,8 @@ DIRFILES_${PN} += "${prefix}/lib/binfmt.d"
 DIRFILES_${PN} += "${prefix}/lib/firmware"
 DIRFILES_${PN} += "${prefix}/lib/firmware/updates"
 DIRFILES_${PN} += "${prefix}/share/systemd"
-DIRFILES_${PN} += "${prefix}/lib/systemd/system/basic.target.wants"
+DIRFILES_${PN} += "${prefix}/lib/systemd/ntp-units.d"
+DIRFILES_${PN} += "${systemd_unitdir}/system/basic.target.wants"
 DIRFILES_${PN} += "${prefix}/lib/systemd/user"
 DIRFILES_${PN} += "${prefix}/lib/systemd/network"
 DIRFILES_${PN} += "${prefix}/lib/systemd/catalog"
@@ -556,7 +565,7 @@ DIRFILES_${PN}-dev += "${prefix}/include/systemd"
 systemd-docs_files = ""
 
 libgudev_files = ""
-libgudev_files += "${prefix}/lib/libgudev-1.0.so.*"
+libgudev_files += "/lib/libgudev-1.0.so.*"
 MANIFESTFILES_libgudev = "systemd.manifest"
 
 systemd-analyze_files = ""

diff --git a/recipes-tizen/systemd/systemd_git.bb b/recipes-tizen/systemd/systemd_git.bb
index 5268109..9eb76b9 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=946095230fe92a254df7795c14fac4910df094a2;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/systemd;tag=f1a985d567a9094ef916d59d8e528810bdbffc0a;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/recipes-tizen/user-session-units/user-session-units-extraconf.inc b/recipes-tizen/user-session-units/user-session-units-extraconf.inc
index abcd33d..fffefcb 100644 (file)
--- a/recipes-tizen/user-session-units/user-session-units-extraconf.inc
+++ b/recipes-tizen/user-session-units/user-session-units-extraconf.inc
@@ -1,17 +1,17 @@
 FILESEXTRAPATHS_append := "${THISDIR}/user-session-units"
 
 do_install_append() {
-    rm -f ${D}${systemd_unitdir}/user/dbus.socket
+    rm -f ${D}${prefix}/lib/systemd/user/dbus.socket
 
-    echo "[Unit]" > ${D}${systemd_unitdir}/user/default.target
-    echo "Description=User session default target" >> ${D}${systemd_unitdir}/user/default.target
+    echo "[Unit]" > ${D}${prefix}/lib/systemd/user/default.target
+    echo "Description=User session default target" >> ${D}${prefix}/lib/systemd/user/default.target
 
-    mkdir -p ${D}${systemd_unitdir}/user/default.target.wants
-    ln -sf ../dbus.service ${D}${systemd_unitdir}/user/default.target.wants/dbus.service
-    rm ${D}${systemd_unitdir}/user/dbus.service
+    mkdir -p ${D}${prefix}/lib/systemd/user/default.target.wants
+    ln -sf ../dbus.service ${D}${prefix}/lib/systemd/user/default.target.wants/dbus.service
+    rm ${D}${prefix}/lib/systemd/user/dbus.service
     
-    rm -f ${D}${systemd_unitdir}/user/default.target
-    ln -sf weston.target ${D}${systemd_unitdir}/user/default.target
+    rm -f ${D}${prefix}/lib/systemd/user/default.target
+    ln -sf weston.target ${D}${prefix}/lib/systemd/user/default.target
 }
 
-user-session-units_files += "${systemd_unitdir}/user/*"
+user-session-units_files += "${prefix}/lib/systemd/user/*"

diff --git a/recipes-tizen/user-session-units/user-session-units.inc b/recipes-tizen/user-session-units/user-session-units.inc
index e9bb156..a57c73e 100644 (file)
--- a/recipes-tizen/user-session-units/user-session-units.inc
+++ b/recipes-tizen/user-session-units/user-session-units.inc
@@ -100,9 +100,9 @@ PACKAGES += " user-session-units "
 PACKAGES += " user-session-units-gnome "
 
 user-session-units-enlightenment_files = ""
-user-session-units-enlightenment_files += "${systemd_unitdir}/user/e17.target"
-user-session-units-enlightenment_files += "${systemd_unitdir}/user/enlightenment.service"
-user-session-units-enlightenment_files += "${systemd_unitdir}/user/e17.target.wants/enlightenment.service"
+user-session-units-enlightenment_files += "${prefix}/lib/systemd/user/e17.target"
+user-session-units-enlightenment_files += "${prefix}/lib/systemd/user/enlightenment.service"
+user-session-units-enlightenment_files += "${prefix}/lib/systemd/user/e17.target.wants/enlightenment.service"
 MANIFESTFILES_${PN}-enlightenment = "user-session-units.manifest"
 
 user-session-units_files = ""
@@ -114,9 +114,9 @@ CONFFILES_${PN} += "${sysconfdir}/pam.d/user-session"
 MANIFESTFILES_${PN} = "user-session-units.manifest"
 
 user-session-units-gnome_files = ""
-user-session-units-gnome_files += "${systemd_unitdir}/user/gnome.target"
-user-session-units-gnome_files += "${systemd_unitdir}/user/gnome-session.service"
-user-session-units-gnome_files += "${systemd_unitdir}/user/gnome.target.wants/gnome-session.service"
+user-session-units-gnome_files += "${prefix}/lib/systemd/user/gnome.target"
+user-session-units-gnome_files += "${prefix}/lib/systemd/user/gnome-session.service"
+user-session-units-gnome_files += "${prefix}/lib/systemd/user/gnome.target.wants/gnome-session.service"
 MANIFESTFILES_${PN}-gnome = "user-session-units.manifest"
 
 FILES_${PN}-enlightenment = "${user-session-units-enlightenment_files}"

diff --git a/recipes-tizen/weston-common/weston-common.inc b/recipes-tizen/weston-common/weston-common.inc
index 95f6d23..d8c9919 100644 (file)
--- a/recipes-tizen/weston-common/weston-common.inc
+++ b/recipes-tizen/weston-common/weston-common.inc
@@ -124,8 +124,8 @@ do_install() {
  install -m 0644 weston_tmpfiles.conf ${D}${prefix}/lib/tmpfiles.d/weston.conf
  
  # install weston-user service in user session
- mkdir -p ${D}${systemd_unitdir}/user
- install -m 644 weston-user.service ${D}${systemd_unitdir}/user/
+ mkdir -p ${D}${prefix}/lib/systemd/user
+ install -m 644 weston-user.service ${D}${prefix}/lib/systemd/user/
  
  # install weston.sh
  mkdir -p ${D}${sysconfdir}/profile.d/
@@ -176,8 +176,8 @@ pkg_preinst_${PN}() {
     mkdir -p ${systemd_unitdir}/system/graphical.target.wants/
     ln -sf ../display-manager.path  ${systemd_unitdir}/system/graphical.target.wants/
     # setup display manager access (inside user session)
-    mkdir -p ${systemd_unitdir}/user/default.target.requires/
-    ln -sf ../weston-user.service  ${systemd_unitdir}/user/default.target.requires/
+    mkdir -p $D${prefix}/lib/systemd/user/default.target.requires/
+    ln -sf ../weston-user.service  $D${prefix}/lib/systemd/user/default.target.requires/
 
 }
 
@@ -185,7 +185,7 @@ pkg_postrm_${PN}() {
     #!/bin/sh -e
 
     rm -f ${systemd_unitdir}/system/graphical.target.wants/display-manager.path
-    rm -f ${systemd_unitdir}/user/default.target.requires/weston-user.service
+    rm -f $D${prefix}/lib/systemd/user/default.target.requires/weston-user.service
 
 }
 
@@ -205,7 +205,7 @@ weston-common_files += "${systemd_unitdir}/system/display-manager.service"
 weston-common_files += "${systemd_unitdir}/system/display-manager.path"
 weston-common_files += "${sysconfdir}/sysconfig/*"
 weston-common_files += "${prefix}/lib/tmpfiles.d/weston.conf"
-weston-common_files += "${systemd_unitdir}/user/weston-user.service"
+weston-common_files += "${prefix}/lib/systemd/user/weston-user.service"
 weston-common_files += "${sysconfdir}/profile.d/*"
 weston-common_files += "${sysconfdir}/udev/rules.d/*"
 weston-common_files += "${prefix}/share/applications/*.desktop"

diff --git a/recipes-tizen/weston-ivi/weston-ivi.inc b/recipes-tizen/weston-ivi/weston-ivi.inc
index 0e10564..5a30317 100644 (file)
--- a/recipes-tizen/weston-ivi/weston-ivi.inc
+++ b/recipes-tizen/weston-ivi/weston-ivi.inc
@@ -75,9 +75,9 @@ do_install() {
  mkdir -p ${D}
  
  
- install -d ${D}${systemd_unitdir}/user/weston.target.wants
- install -m 644 weston.service ${D}${systemd_unitdir}/user/weston.service
- ln -sf ../weston.service ${D}/${systemd_unitdir}/user/weston.target.wants/
+ install -d ${D}${prefix}/lib/systemd/user/weston.target.wants
+ install -m 644 weston.service ${D}${prefix}/lib/systemd/user/weston.service
+ ln -sf ../weston.service ${D}/${prefix}/lib/systemd/user/weston.target.wants/
  
  mkdir -p ${D}${sysconfdir}/profile.d/
  install -m 0644 weston.sh ${D}${sysconfdir}/profile.d/
@@ -93,7 +93,7 @@ pkg_postinst_${PN}() {
     #!/bin/sh -e
 
     ln -s ${sysconfdir}/xdg/weston/weston-modello.ini ${sysconfdir}/xdg/weston/weston.ini
-    sed -i 's/ --current-mode//' ${systemd_unitdir}/user/weston.service
+    sed -i 's/ --current-mode//' $D${prefix}/lib/systemd/user/weston.service
 
 }
 
@@ -101,7 +101,7 @@ pkg_postrm_${PN}() {
     #!/bin/sh -e
 
     rm ${sysconfdir}/xdg/weston/weston.ini
-    sed -i 's/\(^ExecStart.*\)/\1 --current-mode/' ${systemd_unitdir}/user/weston.service
+    sed -i 's/\(^ExecStart.*\)/\1 --current-mode/' $D${prefix}/lib/systemd/user/weston.service
 
 }
 
@@ -123,8 +123,8 @@ CONFFILES_${PN}-config += "${sysconfdir}/xdg/weston/weston.ini"
 MANIFESTFILES_${PN}-config = "weston-ivi.manifest"
 
 weston-ivi_files = ""
-weston-ivi_files += "${systemd_unitdir}/user/weston.service"
-weston-ivi_files += "${systemd_unitdir}/user/weston.target.wants/weston.service"
+weston-ivi_files += "${prefix}/lib/systemd/user/weston.service"
+weston-ivi_files += "${prefix}/lib/systemd/user/weston.target.wants/weston.service"
 weston-ivi_files += "${sysconfdir}/profile.d/*"
 CONFFILES_${PN} = ""
 CONFFILES_${PN} += "${sysconfdir}/profile.d/*"

diff --git a/recipes-tizen/weston/weston.inc b/recipes-tizen/weston/weston.inc
index d172078..92687bf 100644 (file)
--- a/recipes-tizen/weston/weston.inc
+++ b/recipes-tizen/weston/weston.inc
@@ -135,8 +135,8 @@ do_install() {
  install -m 755 weston-fullscreen ${D}${prefix}/bin
  
  
- install -d ${D}${systemd_unitdir}/user
- install -m 644 ${S}/packaging/weston.target ${D}${systemd_unitdir}/user/weston.target
+ install -d ${D}${prefix}/lib/systemd/user
+ install -m 644 ${S}/packaging/weston.target ${D}${prefix}/lib/systemd/user/weston.target
  # The weston.service unit file must be provided by the weston-startup
  # virtual package, i.e. "Provide: weston-startup".  The weston-startup
  # virtual package requirement is intended to force Tizen profile
@@ -177,7 +177,7 @@ weston_files += "${prefix}/lib/weston/headless-backend.so"
 weston_files += "${prefix}/lib/weston/wayland-backend.so"
 weston_files += "${prefix}/lib/weston/gl-renderer.so"
 weston_files += "${prefix}/share/weston"
-weston_files += "${systemd_unitdir}/user/weston.target"
+weston_files += "${prefix}/lib/systemd/user/weston.target"
 MANIFESTFILES_${PN} = "weston.manifest"
 
 weston-clients_files = ""

diff --git a/recipes-tizen/wrt-widgets/wrt-widgets-extraconf.inc b/recipes-tizen/wrt-widgets/wrt-widgets-extraconf.inc
index 8c7e8e0..46683a2 100644 (file)
--- a/recipes-tizen/wrt-widgets/wrt-widgets-extraconf.inc
+++ b/recipes-tizen/wrt-widgets/wrt-widgets-extraconf.inc
@@ -2,7 +2,7 @@ pkg_postinst_${PN}() {
     #!/bin/sh -e
 
     # setup xwalk preinstall service (inside user session)
-    mkdir -p $D${systemd_unitdir}/user/default.target.wants/
-    ln -sf ../xwalk_widgets_preinstall.service $D${systemd_unitdir}/user/default.target.wants/
+    mkdir -p $D${prefix}/lib/systemd/user/default.target.wants/
+    ln -sf ../xwalk_widgets_preinstall.service $D${prefix}/lib/systemd/user/default.target.wants/
 
 }
\ No newline at end of file

diff --git a/recipes-tizen/wrt-widgets/wrt-widgets.inc b/recipes-tizen/wrt-widgets/wrt-widgets.inc
index 4436d69..b6d15f3 100644 (file)
--- a/recipes-tizen/wrt-widgets/wrt-widgets.inc
+++ b/recipes-tizen/wrt-widgets/wrt-widgets.inc
@@ -75,8 +75,8 @@ do_install() {
  cp install.conf ${D}/${prefix}/share/widget_demo/
  
  # install xwalk preinstall service in user session
- mkdir -p ${D}${systemd_unitdir}/user
- install -m 644 xwalk_widgets_preinstall.service ${D}${systemd_unitdir}/user/
+ mkdir -p ${D}${prefix}/lib/systemd/user
+ install -m 644 xwalk_widgets_preinstall.service ${D}${prefix}/lib/systemd/user/
  
  
 }
@@ -85,15 +85,15 @@ pkg_postinst_${PN}() {
     #!/bin/sh -e
 
     # setup xwalk preinstall service (inside user session)
-    mkdir -p ${systemd_unitdir}/user/default.target.wants/
-    ln -sf ../xwalk_widgets_preinstall.service ${systemd_unitdir}/user/default.target.wants/
+    mkdir -p $D${prefix}/lib/systemd/user/default.target.wants/
+    ln -sf ../xwalk_widgets_preinstall.service $D${prefix}/lib/systemd/user/default.target.wants/
 
 }
 
 pkg_postrm_${PN}() {
     #!/bin/sh -e
 
-    rm -f ${systemd_unitdir}/user/default.target.wants/xwalk_widgets_preinstall.service
+    rm -f $D${prefix}/lib/systemd/user/default.target.wants/xwalk_widgets_preinstall.service
 
 }
 
@@ -104,7 +104,7 @@ wrt-widgets_files = ""
 wrt-widgets_files += "${prefix}/share/widget_demo/*"
 wrt-widgets_files += "${prefix}/bin/install_widgets.sh"
 wrt-widgets_files += "${prefix}/bin/prepare_widgets.sh"
-wrt-widgets_files += "${systemd_unitdir}/user/xwalk_widgets_preinstall.service"
+wrt-widgets_files += "${prefix}/lib/systemd/user/xwalk_widgets_preinstall.service"
 MANIFESTFILES_${PN} = "wrt-widgets.manifest"
 
 FILES_${PN} = "${wrt-widgets_files}"

diff --git a/recipes-tizen/wrt-widgets/wrt-widgets_git.bb b/recipes-tizen/wrt-widgets/wrt-widgets_git.bb
index d8fdec2..2764cac 100644 (file)
--- a/recipes-tizen/wrt-widgets/wrt-widgets_git.bb
+++ b/recipes-tizen/wrt-widgets/wrt-widgets_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/profile/common/wrt-widgets;tag=e84337cd05c5879886ab5a87ef68c500d64cbab7;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/common/wrt-widgets;tag=b7c5bf1ce8f51ad5ca50ba93e612579b2d451ecd;nobranch=1"
 
 BBCLASSEXTEND += " native "