meta-tizen: update recipes

Change-Id: I7f5fa8003e205fcfb92b7c03996d184c5d708e7b
(From meta-tizen rev: 421c40abe839bc26a6a4db3149905c4ed11a5aba)

Signed-off-by: Ronan Le Martret <ronan@fridu.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-tizen/recipes-core/dbus/dbus.inc b/meta-tizen/recipes-core/dbus/dbus.inc
index c7e1e63..173871f 100644 (file)
--- a/meta-tizen/recipes-core/dbus/dbus.inc
+++ b/meta-tizen/recipes-core/dbus/dbus.inc
@@ -21,6 +21,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://fixed-memory-freeing-if-error-during-listing-service.patch \
 "
 
+systemd_unitdir = "/usr/lib/systemd"
+
 inherit useradd autotools pkgconfig gettext update-rc.d
 
 INITSCRIPT_NAME = "dbus-1"

diff --git a/meta-tizen/recipes-image/config-image/config-image.bb b/meta-tizen/recipes-image/config-image/config-image.bb
index 1d98105..624e939 100644 (file)
--- a/meta-tizen/recipes-image/config-image/config-image.bb
+++ b/meta-tizen/recipes-image/config-image/config-image.bb
@@ -6,6 +6,11 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 RDEPENDS_${PN} += "weston"
+RDEPENDS_${PN} += "media-server"
+RDEPENDS_${PN} += "wrt-widgets"
+RDEPENDS_${PN} += "avsystem"
+RDEPENDS_${PN} += "download-provider"
+RDEPENDS_${PN} += "automotive-message-broker"
 
 do_install() {
   mkdir -p ${D}${sysconfdir}
@@ -70,8 +75,8 @@ pkg_postinst_${PN} () {
     #rm -fr $D/bin
     rm -fr $D${localstatedir}/log
     
-    #rm -fr $D/lib/systemd
-    rm -fr $D/usr/lib/systemd/*
+    rm -fr $D/lib/systemd/*
+    #rm -fr $D/usr/lib/systemd/*
     
     #ln -s usr/lib  $D/lib
     #ln -s usr/sbin $D/sbin

diff --git a/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator.inc b/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator.inc
index 611ecc2..1417d0c 100644 (file)
--- a/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator.inc
+++ b/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator.inc
@@ -1,7 +1,7 @@
-DESCRIPTION = "A proof of concept pure html5 UI"
+DESCRIPTION = "Pure html5 UI"
 HOMEPAGE = "http://nohomepage.org"
-SECTION = "Applications/System"
-LICENSE = "Apache 2.0"
+SECTION = "Automotive/Modello"
+LICENSE = "Apache-2.0"
 
 SRC_URI = ""
 
@@ -23,12 +23,14 @@ RDEPENDS_Modello_AMBSimulator += "Modello_Common"
 
 DEPENDS = ""
 #DEPENDS of Modello_AMBSimulator
+DEPENDS += "tizen-platform-config"
 DEPENDS += "zip"
 
 do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q -n Modello_AMBSimulator-0.0.2
+ cp ${S}/packaging/Modello_AMBSimulator.manifest .
  
  
 }
@@ -46,8 +48,7 @@ do_compile() {
  unset DISPLAY
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
  
- 
- make wgtPkg
+ #empty
  
  
  
@@ -63,15 +64,10 @@ do_install() {
  mkdir -p ${D}
  
  rm -rf ${D}
- 
-   oe_runmake \
-         DESTDIR=${D} \
-         INSTALL_ROOT=${D} \
-         BINDIR=${prefix}/bin \
-   install  
-   rm -f ${D}${infodir}/dir 
-   find ${D} -regex ".*\.la$" | xargs rm -f -- 
-   find ${D} -regex ".*\.a$" | xargs rm -f --
+ mkdir -p ${D}%{TZ_SYS_APP_PREINSTALL}
+ mkdir -p ${D}${prefix}/share/Modello/Common/icons
+ zip -r ${D}%{TZ_SYS_APP_PREINSTALL}/Modello_AMBSimulator.wgt config.xml manifest.json css AMBSimulator_icon.png  index.html  js templates
+ install -m 0644 AMBSimulator_icon.png ${D}${prefix}/share/Modello/Common/icons
  
  
 }
@@ -80,8 +76,8 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
 PACKAGES += " Modello_AMBSimulator "
 
 Modello_AMBSimulator_files = ""
-Modello_AMBSimulator_files += "/opt/usr/apps/.preinstallWidgets/Modello_AMBSimulator.wgt"
-Modello_AMBSimulator_files += "/opt/usr/apps/_common/icons/AMB_Simulator_icon.png"
+Modello_AMBSimulator_files += "${prefix}/share/Modello/Common/icons/AMBSimulator_icon.png"
+MANIFESTFILES_Modello_AMBSimulator = "Modello_AMBSimulator.manifest"
 
 FILES_Modello_AMBSimulator = "${Modello_AMBSimulator_files}"
 

diff --git a/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator_git.bb b/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator_git.bb
index b228316..8070298 100644 (file)
--- a/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator_git.bb
+++ b/meta-tizen/recipes-tizen/Modello-AMBSimulator/Modello-AMBSimulator_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/ivi/Modello_AMBSimulator;tag=43f878b5e2e103c4fa8fd169600cc7cd81c761d0;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/Modello_AMBSimulator;tag=497607ee297d9e2098edc8ac2483355c35ca473e;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen/recipes-tizen/Modello-Common/Modello-Common.inc b/meta-tizen/recipes-tizen/Modello-Common/Modello-Common.inc
index 5fd7e27..5c9059f 100644 (file)
--- a/meta-tizen/recipes-tizen/Modello-Common/Modello-Common.inc
+++ b/meta-tizen/recipes-tizen/Modello-Common/Modello-Common.inc
@@ -1,7 +1,7 @@
-DESCRIPTION = "A proof of concept pure html5 UI"
+DESCRIPTION = "Pure html5 UI"
 HOMEPAGE = "http://nohomepage.org"
-SECTION = "Applications/System"
-LICENSE = "Apache 2.0"
+SECTION = "Automotive/Modello"
+LICENSE = "Apache-2.0"
 
 SRC_URI = ""
 
@@ -19,11 +19,15 @@ PROVIDES += "Modello_Common"
 RDEPENDS = ""
 
 DEPENDS = ""
+#DEPENDS of Modello_Common
+DEPENDS_append_class-native = " fdupes-native"
+DEPENDS_append_class-target = " fdupes-native"
 
 do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q -n Modello_Common-0.0.2
+ cp ${S}/packaging/Modello_Common.manifest .
  
  
 }
@@ -41,6 +45,7 @@ do_compile() {
  unset DISPLAY
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
  
+ #empty
  
  
  
@@ -55,16 +60,30 @@ do_install() {
  rm -rf ${D}
  mkdir -p ${D}
  
- rm -rf ${D}
+ mkdir -p ${D}${prefix}/share/Modello/Common/
+ cp -r css ${D}${prefix}/share/Modello/Common/
+ cp -r js ${D}${prefix}/share/Modello/Common/
+ 
  
-   oe_runmake \
-         DESTDIR=${D} \
-         INSTALL_ROOT=${D} \
-         BINDIR=${prefix}/bin \
-   install  
-   rm -f ${D}${infodir}/dir 
-   find ${D} -regex ".*\.la$" | xargs rm -f -- 
-   find ${D} -regex ".*\.a$" | xargs rm -f --
+  _target=""; 
+  _symlinks=0; 
+   
+  fdupes -q -n -r ${D}${prefix}/share | 
+   while read _file; do 
+     if test -z "$_target" ; then 
+       _target="$_file"; 
+     else 
+       if test -z "$_file" ; then 
+       _target=""; 
+       continue ; 
+       fi ; 
+       if test "$_symlinks" = 1; then 
+         ln -sf "${_target#${D}}" "$_file"; 
+       else 
+         ln -f "$_target" "$_file"; 
+       fi ;
+     fi ; 
+  done 
  
  
 }
@@ -73,7 +92,9 @@ PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
 PACKAGES += " Modello_Common "
 
 Modello_Common_files = ""
-Modello_Common_files += "/opt/usr/apps/_common/*"
+Modello_Common_files += "${prefix}/share/Modello/Common/js"
+Modello_Common_files += "${prefix}/share/Modello/Common/css"
+MANIFESTFILES_Modello_Common = "Modello_Common.manifest"
 
 FILES_Modello_Common = "${Modello_Common_files}"
 

diff --git a/meta-tizen/recipes-tizen/Modello-Common/Modello-Common_git.bb b/meta-tizen/recipes-tizen/Modello-Common/Modello-Common_git.bb
index 23e6794..3432932 100644 (file)
--- a/meta-tizen/recipes-tizen/Modello-Common/Modello-Common_git.bb
+++ b/meta-tizen/recipes-tizen/Modello-Common/Modello-Common_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/ivi/Modello_Common;tag=add385cd26977c25e671352a2f0834dabcc4c342;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Common;tag=63056401704e347ae0ddc4c6c122e1861788ed16;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen/recipes-tizen/Modello-Homescreen/Modello-Homescreen.inc b/meta-tizen/recipes-tizen/Modello-Homescreen/Modello-Homescreen.inc
index cfd7df8..b4b03da 100644 (file)
--- a/meta-tizen/recipes-tizen/Modello-Homescreen/Modello-Homescreen.inc
+++ b/meta-tizen/recipes-tizen/Modello-Homescreen/Modello-Homescreen.inc
@@ -72,11 +72,11 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
      mkdir -p ${D}${prefix}/bin
-     mkdir -p ${D}/lib/systemd/user/weston.target.wants/
+     mkdir -p ${D}${systemd_unitdir}/user/weston.target.wants/
      install -m 755 systemd/modello_launcher.sh ${D}${prefix}/bin
-     install -m 0644 systemd/Modello_Homescreen-launchpad-ready.path ${D}/lib/systemd/user
-     install -m 0644 systemd/Modello_Homescreen.service ${D}/lib/systemd/user
-     ln -sf ../Modello_Homescreen-launchpad-ready.path ${D}/lib/systemd/user/weston.target.wants/
+     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/
  
  
 }
@@ -87,10 +87,10 @@ PACKAGES += " Modello_Homescreen "
 Modello_Homescreen_files = ""
 Modello_Homescreen_files += "/opt/usr/apps/.preinstallWidgets/Modello_Homescreen.wgt"
 Modello_Homescreen_files += "/opt/usr/apps/_common/icons/Homescreen_icon.png"
-Modello_Homescreen_files += "/lib/systemd/user/Modello_Homescreen.service"
-Modello_Homescreen_files += "/lib/systemd/user/Modello_Homescreen-launchpad-ready.path"
+Modello_Homescreen_files += "${systemd_unitdir}/user/Modello_Homescreen.service"
+Modello_Homescreen_files += "${systemd_unitdir}/user/Modello_Homescreen-launchpad-ready.path"
 Modello_Homescreen_files += "${prefix}/bin/modello_launcher.sh"
-Modello_Homescreen_files += "/lib/systemd/user/weston.target.wants"
+Modello_Homescreen_files += "${systemd_unitdir}/user/weston.target.wants"
 
 FILES_Modello_Homescreen = "${Modello_Homescreen_files}"
 

diff --git a/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer-extraconf.inc b/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer-extraconf.inc
index 45cfdc3..b3aa145 100644 (file)
--- a/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer-extraconf.inc
+++ b/meta-tizen/recipes-tizen/Modello-Installer/Modello-Installer-extraconf.inc
@@ -2,14 +2,15 @@ SRC_URI += "file://modello-installer-postinst.sh"
 SRC_URI += "file://modello-installer-postinst.service"
 
 RDEPENDS_Modello_Installer-xwalk_remove = "Modello_Phone"
+systemd_unitdir = "/usr/lib/systemd"
 
 do_install_append() {
     install -m 0755 -p -D ${WORKDIR}/modello-installer-postinst.sh ${D}${prefix}/share/modello-installer/modello-installer-postinst.sh
-    install -p -D ${WORKDIR}/modello-installer-postinst.service ${D}/lib/systemd/system/modello-installer-postinst.service
-    mkdir -p ${D}/lib/systemd/system/multi-user.target.wants
-    ln -sf ../modello-installer-postinst.service ${D}/lib/systemd/system/multi-user.target.wants/modello-installer-postinst.service
+    install -p -D ${WORKDIR}/modello-installer-postinst.service ${D}${systemd_unitdir}/system/modello-installer-postinst.service
+    mkdir -p ${D}${systemd_unitdir}/system/multi-user.target.wants
+    ln -sf ../modello-installer-postinst.service ${D}${systemd_unitdir}/system/multi-user.target.wants/modello-installer-postinst.service
 }
 
 FILES_Modello_Installer-xwalk += "${prefix}/share/modello-installer/modello-installer-postinst.sh"
-FILES_Modello_Installer-xwalk += "/lib/systemd/system/modello-installer-postinst.service"
-FILES_Modello_Installer-xwalk += "/lib/systemd/system/multi-user.target.wants/modello-installer-postinst.service"
+FILES_Modello_Installer-xwalk += "${systemd_unitdir}/system/modello-installer-postinst.service"
+FILES_Modello_Installer-xwalk += "${systemd_unitdir}/system/multi-user.target.wants/modello-installer-postinst.service"

diff --git a/meta-tizen/recipes-tizen/alarm-manager/alarm-manager.inc b/meta-tizen/recipes-tizen/alarm-manager/alarm-manager.inc
index d19708e..f08185f 100644 (file)
--- a/meta-tizen/recipes-tizen/alarm-manager/alarm-manager.inc
+++ b/meta-tizen/recipes-tizen/alarm-manager/alarm-manager.inc
@@ -109,9 +109,9 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
- install -d ${D}/lib/systemd/system/multi-user.target.wants
- install -m0644 ${S}/packaging/alarm-server.service ${D}/lib/systemd/system
- ln -sf ../alarm-server.service ${D}/lib/systemd/system/multi-user.target.wants/alarm-server.service
+ install -d ${D}${systemd_unitdir}/system/multi-user.target.wants
+ install -m0644 ${S}/packaging/alarm-server.service ${D}${systemd_unitdir}/system
+ ln -sf ../alarm-server.service ${D}${systemd_unitdir}/system/multi-user.target.wants/alarm-server.service
  
  mkdir -p ${D}/${sysconfdir}/udev/rules.d
  install -m0644  ${S}/packaging/60-alarm-manager-rtc.rules ${D}${sysconfdir}/udev/rules.d/
@@ -178,8 +178,8 @@ MANIFESTFILES_libalarm = "alarm-manager.manifest"
 
 alarm-server_files = ""
 alarm-server_files += "${prefix}/bin/alarm-server"
-alarm-server_files += "/lib/systemd/system/multi-user.target.wants/alarm-server.service"
-alarm-server_files += "/lib/systemd/system/alarm-server.service"
+alarm-server_files += "${systemd_unitdir}/system/multi-user.target.wants/alarm-server.service"
+alarm-server_files += "${systemd_unitdir}/system/alarm-server.service"
 alarm-server_files += "${sysconfdir}/dbus-1/system.d/alarm-service.conf"
 alarm-server_files += "%config ${sysconfdir}/udev/rules.d/60-alarm-manager-rtc.rules"
 CONFFILES_alarm-server = ""

diff --git a/meta-tizen/recipes-tizen/app-core/app-core.inc b/meta-tizen/recipes-tizen/app-core/app-core.inc
index 10412c7..c5fcd32 100644 (file)
--- a/meta-tizen/recipes-tizen/app-core/app-core.inc
+++ b/meta-tizen/recipes-tizen/app-core/app-core.inc
@@ -133,8 +133,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}/lib/systemd/user/core-efl.target.wants
- install -m0644 ${S}/packaging/core-efl-wayland.target ${D}/lib/systemd/user/core-efl.target
+ 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
  
  
  
@@ -182,8 +182,8 @@ MANIFESTFILES_${PN}-efl = "app-core.manifest"
 
 app-core-common_files = ""
 app-core-common_files += "${prefix}/lib/libappcore-common.so.*"
-app-core-common_files += "/lib/systemd/user/core-efl.target"
-app-core-common_files += "/lib/systemd/user/core-efl.target.wants/"
+app-core-common_files += "${systemd_unitdir}/user/core-efl.target"
+app-core-common_files += "${systemd_unitdir}/user/core-efl.target.wants/"
 MANIFESTFILES_${PN}-common = "app-core.manifest"
 
 app-core-common-dev_files = ""

diff --git a/meta-tizen/recipes-tizen/aul-1/aul-1.inc b/meta-tizen/recipes-tizen/aul-1/aul-1.inc
index 955298f..4407e8e 100644 (file)
--- a/meta-tizen/recipes-tizen/aul-1/aul-1.inc
+++ b/meta-tizen/recipes-tizen/aul-1/aul-1.inc
@@ -123,15 +123,15 @@ do_install() {
  sqlite3 ${D}${prefix}/dbspace/.mida.db < ${D}${prefix}/share/aul/mida_db.sql
  rm -rf ${D}${prefix}/share/aul/mida_db.sql
  
- mkdir -p ${D}/lib/systemd/system/graphical.target.wants
- mkdir -p ${D}/lib/systemd/user/default.target.wants
- install -m 0644 ${S}/packaging/launchpad-preload@.service ${D}/lib/systemd/system/launchpad-preload@.service
- install -m 0644 ${S}/packaging/ac.service ${D}/lib/systemd/system/ac.service
- ln -s ../launchpad-preload@.service ${D}/lib/systemd/system/graphical.target.wants/launchpad-preload@5000.service
- ln -s ../ac.service ${D}/lib/systemd/system/graphical.target.wants/ac.service
+ mkdir -p ${D}${systemd_unitdir}/system/graphical.target.wants
+ mkdir -p ${D}${systemd_unitdir}/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}/lib/systemd/user/amd_session_agent.service
- ln -s ../amd_session_agent.service ${D}/lib/systemd/user/default.target.wants/amd_session_agent.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
  
  
 }
@@ -189,12 +189,12 @@ aul_files += "${prefix}/share/aul/miregex/*"
 aul_files += "${prefix}/share/aul/service/*"
 aul_files += "${prefix}/share/aul/preload_list.txt"
 aul_files += "${prefix}/share/aul/preexec_list.txt"
-aul_files += "/lib/systemd/system/graphical.target.wants/launchpad-preload@5000.service"
-aul_files += "/lib/systemd/system/graphical.target.wants/ac.service"
-aul_files += "/lib/systemd/system/launchpad-preload@.service"
-aul_files += "/lib/systemd/system/ac.service"
-aul_files += "/lib/systemd/user/amd_session_agent.service"
-aul_files += "/lib/systemd/user/default.target.wants/amd_session_agent.service"
+aul_files += "${systemd_unitdir}/system/graphical.target.wants/launchpad-preload@5000.service"
+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}/bin/amd"
 aul_files += "${prefix}/bin/daemon-manager-release-agent"
 aul_files += "${prefix}/bin/daemon-manager-launch-agent"

diff --git a/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker-extraconf.inc b/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker-extraconf.inc
index cb7c2fd..af6b764 100644 (file)
--- a/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker-extraconf.inc
+++ b/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker-extraconf.inc
@@ -35,12 +35,12 @@ cmake_do_install_append() {
     find ${D} -regex ".*\.la$" | xargs rm -f -- 
     find ${D} -regex ".*\.a$" | xargs rm -f --
  
-    mkdir -p ${D}/lib/systemd/system/network.target.wants
-    cp packaging.in/ambd.service.systemd.tizen ${D}/lib/systemd/system/ambd.service
-    ln -sf ../ambd.service ${D}/lib/systemd/system/network.target.wants/ambd.service
+    mkdir -p ${D}${systemd_unitdir}/system/network.target.wants
+    cp packaging.in/ambd.service.systemd.tizen ${D}${systemd_unitdir}/system/ambd.service
+    ln -sf ../ambd.service ${D}${systemd_unitdir}/system/network.target.wants/ambd.service
  
-    mkdir -p ${D}/lib/systemd/system/multi-user.target.wants 
-    ln -sf ../ambd.service  ${D}/lib/systemd/system/multi-user.target.wants/ambd.service  
+    mkdir -p ${D}${systemd_unitdir}/system/multi-user.target.wants 
+    ln -sf ../ambd.service  ${D}${systemd_unitdir}/system/multi-user.target.wants/ambd.service  
  
     cp packaging.in/config.tizen ${D}${sysconfdir}/ambd/
 }

diff --git a/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker.inc b/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker.inc
index fb477a6..a80ad75 100644 (file)
--- a/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker.inc
+++ b/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker.inc
@@ -198,12 +198,12 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
- mkdir -p ${D}/lib/systemd/system/network.target.wants
- cp packaging.in/ambd.service.systemd.tizen ${D}/lib/systemd/system/ambd.service
- ln -s ../ambd.service ${D}/lib/systemd/system/network.target.wants/ambd.service
+ mkdir -p ${D}${systemd_unitdir}/system/network.target.wants
+ cp packaging.in/ambd.service.systemd.tizen ${D}${systemd_unitdir}/system/ambd.service
+ ln -s ../ambd.service ${D}${systemd_unitdir}/system/network.target.wants/ambd.service
  
- mkdir -p ${D}//lib/systemd/system/multi-user.target.wants 
- ln -s ../ambd.service  ${D}//lib/systemd/system/multi-user.target.wants/ambd.service  
+ mkdir -p ${D}/${systemd_unitdir}/system/multi-user.target.wants 
+ ln -s ../ambd.service  ${D}/${systemd_unitdir}/system/multi-user.target.wants/ambd.service  
  
  cp packaging.in/config.tizen ${D}${sysconfdir}/ambd/
  
@@ -295,9 +295,9 @@ automotive-message-broker_files += "${sysconfdir}/ambd/config.tizen"
 automotive-message-broker_files += "${sysconfdir}/ambd/examples/*"
 automotive-message-broker_files += "${prefix}/bin/ambd"
 automotive-message-broker_files += "${prefix}/lib/libamb.so*"
-automotive-message-broker_files += "/lib/systemd/system/ambd.service"
-automotive-message-broker_files += "/lib/systemd/system/network.target.wants/ambd.service"
-automotive-message-broker_files += "/lib/systemd/system/multi-user.target.wants/ambd.service"
+automotive-message-broker_files += "${systemd_unitdir}/system/ambd.service"
+automotive-message-broker_files += "${systemd_unitdir}/system/network.target.wants/ambd.service"
+automotive-message-broker_files += "${systemd_unitdir}/system/multi-user.target.wants/ambd.service"
 automotive-message-broker_files += "${prefix}/bin/amb-get"
 automotive-message-broker_files += "${prefix}/bin/amb-get-history"
 automotive-message-broker_files += "${prefix}/bin/amb-set"

diff --git a/meta-tizen/recipes-tizen/avsystem/avsystem.inc b/meta-tizen/recipes-tizen/avsystem/avsystem.inc
index ed738a2..594ffb8 100644 (file)
--- a/meta-tizen/recipes-tizen/avsystem/avsystem.inc
+++ b/meta-tizen/recipes-tizen/avsystem/avsystem.inc
@@ -97,9 +97,9 @@ do_install() {
  mkdir -m 755 -p ${D}/${sysconfdir}/rc.d/rc4.d/
  ln -s ../init.d/snd_init ${D}/${sysconfdir}/rc.d/rc4.d/S15snd_init
  
- mkdir -m 755 -p ${D}/lib/systemd/system/multi-user.target.wants
- install -m 0644 ${S}/packaging/avsystem.service ${D}/lib/systemd/system/avsystem.service
- ln -s ../avsystem.service ${D}/lib/systemd/system/multi-user.target.wants/avsystem.service
+ mkdir -m 755 -p ${D}${systemd_unitdir}/system/multi-user.target.wants
+ install -m 0644 ${S}/packaging/avsystem.service ${D}${systemd_unitdir}/system/avsystem.service
+ ln -s ../avsystem.service ${D}${systemd_unitdir}/system/multi-user.target.wants/avsystem.service
  
  
 }
@@ -154,8 +154,8 @@ avsystem_files += "${sysconfdir}/rc.d/init.d/snd_init"
 avsystem_files += "${sysconfdir}/rc.d/rc3.d/S15snd_init"
 avsystem_files += "${sysconfdir}/rc.d/rc4.d/S15snd_init"
 avsystem_files += "${prefix}/bin/*"
-avsystem_files += "/lib/systemd/system/avsystem.service"
-avsystem_files += "/lib/systemd/system/multi-user.target.wants/avsystem.service"
+avsystem_files += "${systemd_unitdir}/system/avsystem.service"
+avsystem_files += "${systemd_unitdir}/system/multi-user.target.wants/avsystem.service"
 MANIFESTFILES_${PN} = "avsystem.manifest"
 
 avsystem-dev_files = ""

diff --git a/meta-tizen/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc b/meta-tizen/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc
index 7bdca56..309fd3f 100644 (file)
--- a/meta-tizen/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc
+++ b/meta-tizen/recipes-tizen/bluetooth-frwk/bluetooth-frwk.inc
@@ -137,10 +137,10 @@ do_install() {
  ln -s ${sysconfdir}/rc.d/init.d/bluetooth-frwk-service ${D}${sysconfdir}/rc.d/rc3.d/S80bluetooth-frwk-service
  ln -s ${sysconfdir}/rc.d/init.d/bluetooth-frwk-service ${D}${sysconfdir}/rc.d/rc5.d/S80bluetooth-frwk-service
  
- mkdir -p ${D}/lib/systemd/user
- mkdir -p ${D}/lib/systemd/user/tizen-middleware.target.wants
- install -m 0644 bt-service/bluetooth-frwk-service.service ${D}/lib/systemd/user
- ln -s ../bluetooth-frwk-service.service ${D}/lib/systemd/user/tizen-middleware.target.wants/bluetooth-frwk-service.service
+ 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
  
  
  
@@ -192,8 +192,8 @@ bluetooth-frwk-service_files += "${sysconfdir}/rc.d/init.d/bluetooth-frwk-servic
 bluetooth-frwk-service_files += "${sysconfdir}/rc.d/rc3.d/S80bluetooth-frwk-service"
 bluetooth-frwk-service_files += "${sysconfdir}/rc.d/rc5.d/S80bluetooth-frwk-service"
 bluetooth-frwk-service_files += "${prefix}/bin/bt-service"
-bluetooth-frwk-service_files += "/lib/systemd/user/tizen-middleware.target.wants/bluetooth-frwk-service.service"
-bluetooth-frwk-service_files += "/lib/systemd/user/bluetooth-frwk-service.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 += "/opt/var/lib/bluetooth/auto-pair-blacklist"
 bluetooth-frwk-service_files += "${sysconfdir}/dbus-1/system.d/bluetooth-frwk-service.conf"
 MANIFESTFILES_${PN}-service = "bluetooth-frwk.manifest"

diff --git a/meta-tizen/recipes-tizen/bluetooth-tools/bluetooth-tools.inc b/meta-tizen/recipes-tizen/bluetooth-tools/bluetooth-tools.inc
index c862bae..0a10dcb 100644 (file)
--- a/meta-tizen/recipes-tizen/bluetooth-tools/bluetooth-tools.inc
+++ b/meta-tizen/recipes-tizen/bluetooth-tools/bluetooth-tools.inc
@@ -100,9 +100,9 @@ do_install() {
  ln -s ${sysconfdir}/rc.d/init.d/bluetooth-address ${D}${sysconfdir}/rc.d/rc3.d/S60bluetooth-address
  ln -s ${sysconfdir}/rc.d/init.d/bluetooth-address ${D}${sysconfdir}/rc.d/rc5.d/S60bluetooth-address
  
- mkdir -p ${D}/lib/systemd/system/multi-user.target.wants
- install -m 0644 ${S}/packaging/bluetooth-address.service ${D}/lib/systemd/system
- ln -s ../bluetooth-address.service ${D}/lib/systemd/system/multi-user.target.wants/bluetooth-address.service
+ mkdir -p ${D}${systemd_unitdir}/system/multi-user.target.wants
+ install -m 0644 ${S}/packaging/bluetooth-address.service ${D}${systemd_unitdir}/system
+ ln -s ../bluetooth-address.service ${D}${systemd_unitdir}/system/multi-user.target.wants/bluetooth-address.service
  
  mkdir -p ${D}${prefix}/etc/bluetooth/
  install -m 0755 scripts/bt-dev-start.sh ${D}${prefix}/etc/bluetooth/bt-dev-start.sh
@@ -131,8 +131,8 @@ bluetooth-tools_files += "${prefix}/etc/bluetooth/bt-edutm-on.sh"
 bluetooth-tools_files += "${prefix}/etc/bluetooth/bt-edutm-dev-up.sh"
 bluetooth-tools_files += "${prefix}/etc/bluetooth/bt-edutm-mode-on.sh"
 bluetooth-tools_files += "${prefix}/etc/bluetooth/bt-edutm-off.sh"
-bluetooth-tools_files += "/lib/systemd/system/multi-user.target.wants/bluetooth-address.service"
-bluetooth-tools_files += "/lib/systemd/system/bluetooth-address.service"
+bluetooth-tools_files += "${systemd_unitdir}/system/multi-user.target.wants/bluetooth-address.service"
+bluetooth-tools_files += "${systemd_unitdir}/system/bluetooth-address.service"
 MANIFESTFILES_${PN} = "bluetooth-tools.manifest"
 
 FILES_${PN}-no-firmware = "${bluetooth-tools-no-firmware_files}"

diff --git a/meta-tizen/recipes-tizen/contacts-service/contacts-service.inc b/meta-tizen/recipes-tizen/contacts-service/contacts-service.inc
index fe53dbb..75f4c8b 100644 (file)
--- a/meta-tizen/recipes-tizen/contacts-service/contacts-service.inc
+++ b/meta-tizen/recipes-tizen/contacts-service/contacts-service.inc
@@ -120,13 +120,13 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
- mkdir -p ${D}/lib/systemd/user/tizen-middleware.target.wants
- install -m 0644 ${S}/packaging/contacts-service.service ${D}/lib/systemd/user/contacts-service.service
- ln -s ../contacts-service.service ${D}/lib/systemd/user/tizen-middleware.target.wants/contacts-service.service
+ 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}/lib/systemd/user/sockets.target.wants
- install -m 0644 ${S}/packaging/contacts-service.socket ${D}/lib/systemd/user/contacts-service.socket
- ln -s ../contacts-service.socket ${D}/lib/systemd/user/sockets.target.wants/contacts-service.socket
+ 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
  
  
  
@@ -162,10 +162,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 += "/lib/systemd/user/contacts-service.service"
-contacts-service2_files += "/lib/systemd/user/tizen-middleware.target.wants/contacts-service.service"
-contacts-service2_files += "/lib/systemd/user/sockets.target.wants/contacts-service.socket"
-contacts-service2_files += "/lib/systemd/user/contacts-service.socket"
+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"
 MANIFESTFILES_${PN}2 = "contacts-service2.manifest"
 
 contacts-service2-dev_files = ""

diff --git a/meta-tizen/recipes-tizen/download-provider/download-provider.inc b/meta-tizen/recipes-tizen/download-provider/download-provider.inc
index 07e10ee..7785652 100644 (file)
--- a/meta-tizen/recipes-tizen/download-provider/download-provider.inc
+++ b/meta-tizen/recipes-tizen/download-provider/download-provider.inc
@@ -101,7 +101,7 @@ do_compile() {
           -DPKG_RELEASE=0 \
           -DIMAGE_DIR:PATH=${prefix}/share/download-provider/images \
           -DLOCALE_DIR:PATH=${prefix}/share/locale \
-          -DSYSTEMD_DIR:PATH=/lib/systemd/system \
+          -DSYSTEMD_DIR:PATH=${systemd_unitdir}/system \
           -DDATABASE_SCHEMA_DIR=${prefix}/share/download-provider/sql \
           -DDATABASE_SCHEMA_FILE=${prefix}/share/download-provider/sql/download-provider-schema.sql \
           -DSUPPORT_WIFI_DIRECT:BOOL=OFF \
@@ -133,10 +133,10 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  mkdir -p ${D}/${prefix}/share/download-provider
- mkdir -p ${D}/lib/systemd/system/graphical.target.wants
- mkdir -p ${D}/lib/systemd/system/sockets.target.wants
- ln -s ../download-provider.service ${D}/lib/systemd/system/graphical.target.wants/
- ln -s ../download-provider.socket ${D}/lib/systemd/system/sockets.target.wants/
+ mkdir -p ${D}${systemd_unitdir}/system/graphical.target.wants
+ mkdir -p ${D}${systemd_unitdir}/system/sockets.target.wants
+ ln -s ../download-provider.service ${D}${systemd_unitdir}/system/graphical.target.wants/
+ ln -s ../download-provider.socket ${D}${systemd_unitdir}/system/sockets.target.wants/
  
  #find_lang download-provider
  
@@ -205,10 +205,10 @@ download-provider_files += "${prefix}/share/download-provider/images/*.png"
 download-provider_files += "${prefix}/share/download-provider/images/*.gif"
 download-provider_files += "${prefix}/lib/libdownloadagent2.so*"
 download-provider_files += "${prefix}/lib/libdownload-provider-interface.so*"
-download-provider_files += "/lib/systemd/system/download-provider.service"
-download-provider_files += "/lib/systemd/system/graphical.target.wants/download-provider.service"
-download-provider_files += "/lib/systemd/system/download-provider.socket"
-download-provider_files += "/lib/systemd/system/sockets.target.wants/download-provider.socket"
+download-provider_files += "${systemd_unitdir}/system/download-provider.service"
+download-provider_files += "${systemd_unitdir}/system/graphical.target.wants/download-provider.service"
+download-provider_files += "${systemd_unitdir}/system/download-provider.socket"
+download-provider_files += "${systemd_unitdir}/system/sockets.target.wants/download-provider.socket"
 download-provider_files += "${prefix}/share/download-provider/sql/download-provider-schema.sql"
 MANIFESTFILES_${PN} = "download-provider.manifest"
 

diff --git a/meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc b/meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc
index 75286d0..dba7a46 100644 (file)
--- a/meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc
+++ b/meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc
@@ -48,6 +48,7 @@ do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q -n genivi-audio-manager-6.0
+ cp ${S}/packaging/genivi-audio-manager.manifest .
  
  
 }
@@ -79,7 +80,14 @@ do_compile() {
          -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
          -DCMAKE_SKIP_RPATH:BOOL=ON \
          -DBUILD_SHARED_LIBS:BOOL=ON \
-         ${EXTRA_OECMAKE} -DUSE_BUILD_LIBS=OFF -DWITH_TESTS=OFF -DWITH_ENABLED_IPC=DBUS -DWITH_DBUS_WRAPPER=ON -DWITH_NSM=OFF -DWITH_DLT=OFF -DCMAKE_INSTALL_PREFIX=/usr ..
+         ${EXTRA_OECMAKE} -DUSE_BUILD_LIBS=OFF \
+        -DWITH_TESTS=OFF \
+        -DWITH_ENABLED_IPC=DBUS \
+        -DWITH_DBUS_WRAPPER=ON \
+        -DWITH_NSM=OFF \
+        -DWITH_DLT=OFF \
+        -DCMAKE_INSTALL_PREFIX=${prefix} \
+        ..
  #make VERBOSE=1
  oe_runmake -j16
  
@@ -96,7 +104,7 @@ do_install() {
  rm -rf ${D}
  mkdir -p ${D}
  
- rm -rf "$RPM_BUILD_ROOT"
+ rm -rf "${D}"
  cd build
  
    oe_runmake \
@@ -106,10 +114,12 @@ do_install() {
    install  
    rm -f ${D}${infodir}/dir 
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
-   find ${D} -regex ".*\.a$" | xargs rm -f -- DESTDIR=$RPM_BUILD_ROOT
- mkdir $RPM_BUILD_ROOT${prefix}/include/genivi-audio-manager
- mv $RPM_BUILD_ROOT${prefix}/include/*.h $RPM_BUILD_ROOT${prefix}/include/command $RPM_BUILD_ROOT${prefix}/include/control $RPM_BUILD_ROOT${prefix}/include/routing $RPM_BUILD_ROOT${prefix}/include/shared $RPM_BUILD_ROOT${prefix}/include/genivi-audio-manager
- rm $RPM_BUILD_ROOT${prefix}/lib/audioManager/routing/libPluginRoutingInterfaceAsync.so*
+   find ${D} -regex ".*\.a$" | xargs rm -f --
+ mkdir -p ${D}${prefix}/include/genivi-audio-manager
+ for cpath in *.h command control routing shared; do
+     mv ${D}${prefix}/include/${cpath} ${D}${prefix}/include/genivi-audio-manager
+ done
+ rm ${D}${prefix}/lib/audioManager/routing/libPluginRoutingInterfaceAsync.so*
  
  
 }
@@ -120,6 +130,7 @@ PACKAGES += " genivi-audio-manager "
 
 genivi-audio-manager-dev_files = ""
 genivi-audio-manager-dev_files += "${prefix}/include/genivi-audio-manager/*"
+MANIFESTFILES_${PN}-dev = "genivi-audio-manager.manifest"
 
 genivi-audio-manager_files = ""
 genivi-audio-manager_files += "LICENCE README.html"
@@ -131,6 +142,7 @@ genivi-audio-manager_files += "${prefix}/lib/audioManager/control/libPluginContr
 genivi-audio-manager_files += "${prefix}/lib/audioManager/control/libPluginControlInterfaceDbus.so*"
 genivi-audio-manager_files += "${prefix}/lib/audioManager/control/libPluginControlInterfaceMurphy.so*"
 genivi-audio-manager_files += "${prefix}/share/audiomanager/*xml"
+MANIFESTFILES_${PN} = "genivi-audio-manager.manifest"
 
 FILES_${PN}-dev = "${genivi-audio-manager-dev_files}"
 FILES_${PN} = "${genivi-audio-manager_files}"

diff --git a/meta-tizen/recipes-tizen/gsignond/gsignond.inc b/meta-tizen/recipes-tizen/gsignond/gsignond.inc
index 2d07d42..a05108d 100644 (file)
--- a/meta-tizen/recipes-tizen/gsignond/gsignond.inc
+++ b/meta-tizen/recipes-tizen/gsignond/gsignond.inc
@@ -96,10 +96,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}/lib/systemd/user
- install -m 644 data/gsignond.service ${D}/lib/systemd/user/
- install -m 755 -d ${D}/lib/systemd/user/weston.target.wants
- ln -s ../gsignond.service ${D}/lib/systemd/user/weston.target.wants/gsignond.service
+ 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
  
  
 }
@@ -133,8 +133,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 += "/lib/systemd/user/gsignond.service"
-gsignond_files += "/lib/systemd/user/weston.target.wants/gsignond.service"
+gsignond_files += "${systemd_unitdir}/user/gsignond.service"
+gsignond_files += "${systemd_unitdir}/user/weston.target.wants/gsignond.service"
 gsignond_files += "${sysconfdir}/gsignond.conf"
 MANIFESTFILES_${PN} = "gsignond.manifest"
 

diff --git a/meta-tizen/recipes-tizen/ico-uxf-device-input-controller/ico-uxf-device-input-controller.inc b/meta-tizen/recipes-tizen/ico-uxf-device-input-controller/ico-uxf-device-input-controller.inc
index dcd4e30..3d37e16 100644 (file)
--- a/meta-tizen/recipes-tizen/ico-uxf-device-input-controller/ico-uxf-device-input-controller.inc
+++ b/meta-tizen/recipes-tizen/ico-uxf-device-input-controller/ico-uxf-device-input-controller.inc
@@ -82,11 +82,11 @@ do_install() {
  
  # configurations
  mkdir -p ${D}/opt/etc/ico/device-input-controller
- mkdir -p ${D}/lib/systemd/user
+ mkdir -p ${D}${systemd_unitdir}/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}/lib/systemd/user/ico-device-input-controller.service
+ install -m 644 settings/ico-device-input-controller.service ${D}${systemd_unitdir}/user/ico-device-input-controller.service
  
  
 }
@@ -99,7 +99,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 += "/lib/systemd/user/ico-device-input-controller.service"
+ico-uxf-device-input-controller_files += "${systemd_unitdir}/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/meta-tizen/recipes-tizen/ico-uxf-weston-plugin/ico-uxf-weston-plugin.inc b/meta-tizen/recipes-tizen/ico-uxf-weston-plugin/ico-uxf-weston-plugin.inc
index 2cde650..ab41c43 100644 (file)
--- a/meta-tizen/recipes-tizen/ico-uxf-weston-plugin/ico-uxf-weston-plugin.inc
+++ b/meta-tizen/recipes-tizen/ico-uxf-weston-plugin/ico-uxf-weston-plugin.inc
@@ -92,10 +92,10 @@ do_install() {
  
  # configurations
  mkdir -p ${D}${sysconfdir}/xdg/weston > /dev/null 2>&1
- mkdir -p ${D}/lib/systemd/system/multi-user.target.wants > /dev/null 2>&1
+ mkdir -p ${D}${systemd_unitdir}/system/multi-user.target.wants > /dev/null 2>&1
  install -m 0644 settings/weston.ini ${D}${sysconfdir}/xdg/weston
- install -m 0644 settings/ico-pseudo-input-device.service ${D}/lib/systemd/system/ico-pseudo-input-device.service
- ln -s /lib/systemd/system/ico-pseudo-input-device.service ${D}/lib/systemd/system/multi-user.target.wants/ico-pseudo-input-device.service
+ install -m 0644 settings/ico-pseudo-input-device.service ${D}${systemd_unitdir}/system/ico-pseudo-input-device.service
+ ln -s ${systemd_unitdir}/system/ico-pseudo-input-device.service ${D}${systemd_unitdir}/system/multi-user.target.wants/ico-pseudo-input-device.service
  
  
 }
@@ -129,8 +129,8 @@ ico-uxf-weston-plugin_files += "${prefix}/lib/weston/*.so"
 ico-uxf-weston-plugin_files += "${prefix}/lib/libico-uxf-weston-plugin.so.*"
 ico-uxf-weston-plugin_files += "${prefix}/bin/ico_send_inputevent"
 ico-uxf-weston-plugin_files += "${prefix}/bin/ico_pseudo_input_device"
-ico-uxf-weston-plugin_files += "/lib/systemd/system/ico-pseudo-input-device.service"
-ico-uxf-weston-plugin_files += "/lib/systemd/system/multi-user.target.wants/ico-pseudo-input-device.service"
+ico-uxf-weston-plugin_files += "${systemd_unitdir}/system/ico-pseudo-input-device.service"
+ico-uxf-weston-plugin_files += "${systemd_unitdir}/system/multi-user.target.wants/ico-pseudo-input-device.service"
 ico-uxf-weston-plugin_files += "${sysconfdir}/xdg/weston/weston.ini"
 CONFFILES_${PN} = ""
 CONFFILES_${PN} += "${sysconfdir}/xdg/weston/weston.ini"

diff --git a/meta-tizen/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc b/meta-tizen/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc
index 466ac7f..bfa4a80 100644 (file)
--- a/meta-tizen/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc
+++ b/meta-tizen/recipes-tizen/ico-vic-carsimulator/ico-vic-carsimulator.inc
@@ -83,10 +83,10 @@ do_install() {
  
  # configurations
  mkdir -p ${D}${sysconfdir}/ico-vic-carsim/
- mkdir -p ${D}/lib/systemd/user
+ mkdir -p ${D}${systemd_unitdir}/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}/lib/systemd/user/ico-vic-carsim.service
+ install -m 0644 ico-vic-carsim.service ${D}${systemd_unitdir}/user/ico-vic-carsim.service
  
  
 }
@@ -110,7 +110,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 += "/lib/systemd/user/ico-vic-carsim.service"
+ico-vic-carsimulator_files += "${systemd_unitdir}/user/ico-vic-carsim.service"
 CONFFILES_${PN} = ""
 CONFFILES_${PN} += "${sysconfdir}/ico-vic-carsim/*"
 MANIFESTFILES_${PN} = "ico-vic-carsimulator.manifest"

diff --git a/meta-tizen/recipes-tizen/libprivilege-control/libprivilege-control.inc b/meta-tizen/recipes-tizen/libprivilege-control/libprivilege-control.inc
index 71369d1..ba6da7e 100644 (file)
--- a/meta-tizen/recipes-tizen/libprivilege-control/libprivilege-control.inc
+++ b/meta-tizen/recipes-tizen/libprivilege-control/libprivilege-control.inc
@@ -82,7 +82,7 @@ do_compile() {
           -DTZ_SYS_DB=${prefix}/dbspace \
           -DTZ_SYS_HOME=/home \
           -DTZ_SYS_ETC=${sysconfdir} \
-          -DSYSTEMD_UNIT_DIR=/lib/systemd/system
+          -DSYSTEMD_UNIT_DIR=${systemd_unitdir}/system
  
  VERBOSE=1 oe_runmake -j16
  
@@ -109,8 +109,8 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  mkdir -p ${D}${prefix}/share/privilege-control/
- mkdir -p ${D}/lib/systemd/system/multi-user.target.wants
- ln -sf /lib/systemd/system/smack-rules.service ${D}/lib/systemd/system/multi-user.target.wants/smack-rules.service
+ mkdir -p ${D}${systemd_unitdir}/system/multi-user.target.wants
+ ln -sf ${systemd_unitdir}/system/smack-rules.service ${D}${systemd_unitdir}/system/multi-user.target.wants/smack-rules.service
  mkdir -p ${D}${prefix}/dbspace
  sed -i 's|TZ_SYS_DB|${prefix}/dbspace|g' ${S}/packaging/libprivilege-control.manifest
  
@@ -140,9 +140,9 @@ PACKAGES += " libprivilege-control-dev "
 libprivilege-control_files = ""
 libprivilege-control_files += "${prefix}/lib/*.so.*"
 libprivilege-control_files += "${prefix}/lib/librules-db-sql-udf.so"
-libprivilege-control_files += "/lib/systemd/system/smack-rules.service"
+libprivilege-control_files += "${systemd_unitdir}/system/smack-rules.service"
 libprivilege-control_files += "${prefix}/bin/api_feature_loader"
-libprivilege-control_files += "/lib/systemd/system/multi-user.target.wants/smack-rules.service"
+libprivilege-control_files += "${systemd_unitdir}/system/multi-user.target.wants/smack-rules.service"
 libprivilege-control_files += "${prefix}/share/privilege-control/db/rules-db.sql"
 libprivilege-control_files += "${prefix}/share/privilege-control/db/rules-db-data.sql"
 libprivilege-control_files += "${prefix}/share/privilege-control/db/updater.sh"

diff --git a/meta-tizen/recipes-tizen/media-server/media-server.inc b/meta-tizen/recipes-tizen/media-server/media-server.inc
index 07a672a..9f234b6 100644 (file)
--- a/meta-tizen/recipes-tizen/media-server/media-server.inc
+++ b/meta-tizen/recipes-tizen/media-server/media-server.inc
@@ -103,9 +103,9 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
- mkdir -p ${D}/lib/systemd/system/multi-user.target.wants
- install -m 644 ${S}/packaging/media-server.service ${D}/lib/systemd/system/media-server.service
- ln -s ../media-server.service ${D}/lib/systemd/system/multi-user.target.wants/media-server.service
+ 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
+ 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
  mkdir -p ${D}${prefix}/data/data-media/Images
@@ -164,8 +164,8 @@ media-server_files = ""
 media-server_files += "${prefix}/bin/media-server"
 media-server_files += "${prefix}/bin/media-scanner"
 media-server_files += "${prefix}/bin/mediadb-update"
-media-server_files += "/lib/systemd/system/media-server.service"
-media-server_files += "/lib/systemd/system/multi-user.target.wants/media-server.service"
+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 += "${prefix}/bin/media-data-sdk_create_db.sh"
 media-server_files += "${prefix}/data/data-media/*"
 media-server_files += "${prefix}/data/data-media/file-manager-service/.thumb/*"

diff --git a/meta-tizen/recipes-tizen/murphy/murphy-extraconf.inc b/meta-tizen/recipes-tizen/murphy/murphy-extraconf.inc
index 5fd3c75..6ec12d8 100644 (file)
--- a/meta-tizen/recipes-tizen/murphy/murphy-extraconf.inc
+++ b/meta-tizen/recipes-tizen/murphy/murphy-extraconf.inc
@@ -12,6 +12,8 @@ EXTRA_OECONF = " \
                 --enable-system-monitor \
                 "
 
+systemd_unitdir = "/usr/lib/systemd"
+                
 do_configure_append() {
     ./bootstrap
     autotools_do_configure
@@ -30,7 +32,7 @@ do_compile() {
 
 do_install_append() {
     # Remove unused directories and files
-    rm -rf ${D}/lib/systemd/user
+    rm -rf ${D}${systemd_unitdir}/user
 }
 
 FILES_${PN}-dev += "${prefix}/lib/libmurphy-plugin-system-monitor.so"

diff --git a/meta-tizen/recipes-tizen/net-config/net-config.inc b/meta-tizen/recipes-tizen/net-config/net-config.inc
index 93b9cb2..16f1498 100644 (file)
--- a/meta-tizen/recipes-tizen/net-config/net-config.inc
+++ b/meta-tizen/recipes-tizen/net-config/net-config.inc
@@ -102,10 +102,10 @@ do_install() {
  cp resources/etc/dbus-1/system.d/net-config.conf ${D}${sysconfdir}/dbus-1/system.d/net-config.conf
  
  # Systemd service file
- mkdir -p ${D}/lib/systemd/system
- cp resources/usr/lib/systemd/system/net-config.service ${D}/lib/systemd/system/net-config.service
- mkdir -p ${D}/lib/systemd/system/multi-user.target.wants/
- ln -s ../net-config.service ${D}/lib/systemd/system/multi-user.target.wants/net-config.service
+ mkdir -p ${D}${systemd_unitdir}/system
+ cp resources/usr/lib/systemd/system/net-config.service ${D}${systemd_unitdir}/system/net-config.service
+ mkdir -p ${D}${systemd_unitdir}/system/multi-user.target.wants/
+ ln -s ../net-config.service ${D}${systemd_unitdir}/system/multi-user.target.wants/net-config.service
  
  #License
  mkdir -p ${D}${prefix}/share/license
@@ -172,8 +172,8 @@ net-config_files = ""
 net-config_files += "${prefix}/sbin/*"
 net-config_files += "${prefix}/share/dbus-1/system-services/*"
 net-config_files += "${sysconfdir}/dbus-1/system.d/*"
-net-config_files += "/lib/systemd/system/net-config.service"
-net-config_files += "/lib/systemd/system/multi-user.target.wants/net-config.service"
+net-config_files += "${systemd_unitdir}/system/net-config.service"
+net-config_files += "${systemd_unitdir}/system/multi-user.target.wants/net-config.service"
 net-config_files += "${prefix}/share/license/net-config"
 MANIFESTFILES_${PN} = "net-config.manifest"
 

diff --git a/meta-tizen/recipes-tizen/phoned/phoned.inc b/meta-tizen/recipes-tizen/phoned/phoned.inc
index c4fdec0..a660332 100644 (file)
--- a/meta-tizen/recipes-tizen/phoned/phoned.inc
+++ b/meta-tizen/recipes-tizen/phoned/phoned.inc
@@ -93,8 +93,8 @@ do_install() {
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
  
- mkdir -p ${D}//lib/systemd/system/../user/weston.target.wants 
- ln -s ../phoned.service  ${D}//lib/systemd/system/../user/weston.target.wants/phoned.service  
+ mkdir -p ${D}/${systemd_unitdir}/system/../user/weston.target.wants 
+ ln -s ../phoned.service  ${D}/${systemd_unitdir}/system/../user/weston.target.wants/phoned.service  
  
  
 }
@@ -106,8 +106,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 += "/lib/systemd/user/phoned.service"
-phoned_files += "/lib/systemd/user/weston.target.wants/phoned.service"
+phoned_files += "${systemd_unitdir}/user/phoned.service"
+phoned_files += "${systemd_unitdir}/user/weston.target.wants/phoned.service"
 
 FILES_${PN} = "${phoned_files}"
 

diff --git a/meta-tizen/recipes-tizen/rygel/rygel.inc b/meta-tizen/recipes-tizen/rygel/rygel.inc
index fb07154..4462ad8 100644 (file)
--- a/meta-tizen/recipes-tizen/rygel/rygel.inc
+++ b/meta-tizen/recipes-tizen/rygel/rygel.inc
@@ -111,10 +111,10 @@ do_install() {
  #find_lang rygel
  
  # Systemd service file
- install -D -m 644 examples/service/systemd/rygel.service.tizen ${D}/lib/systemd/system/rygel.service
+ install -D -m 644 examples/service/systemd/rygel.service.tizen ${D}${systemd_unitdir}/system/rygel.service
  # 
- mkdir -p ${D}//lib/systemd/system/network.target.wants 
- ln -s ../rygel.service  ${D}//lib/systemd/system/network.target.wants/rygel.service  
+ mkdir -p ${D}/${systemd_unitdir}/system/network.target.wants 
+ ln -s ../rygel.service  ${D}/${systemd_unitdir}/system/network.target.wants/rygel.service  
  rm -rf  $RPM_BUILD_ROOT${prefix}/share/applications/*.desktop
  
  
@@ -156,8 +156,8 @@ PACKAGES += " rygel-dev "
 
 rygel_files = ""
 rygel_files += "/etc/rygel.conf"
-rygel_files += "/lib/systemd/system/rygel.service"
-rygel_files += "/lib/systemd/system/network.target.wants/rygel.service"
+rygel_files += "${systemd_unitdir}/system/rygel.service"
+rygel_files += "${systemd_unitdir}/system/network.target.wants/rygel.service"
 rygel_files += "${prefix}/bin/rygel"
 rygel_files += "${prefix}/share/dbus-1/services/org.gnome.Rygel1.service"
 rygel_files += "${prefix}/share/icons/hicolor/128x128/apps/rygel.png"

diff --git a/meta-tizen/recipes-tizen/security-server/security-server.inc b/meta-tizen/recipes-tizen/security-server/security-server.inc
index 57ab96a..d256cf6 100644 (file)
--- a/meta-tizen/recipes-tizen/security-server/security-server.inc
+++ b/meta-tizen/recipes-tizen/security-server/security-server.inc
@@ -103,7 +103,7 @@ do_compile() {
          ${EXTRA_OECMAKE} . -DVERSION=0.1.1 \
           -DCMAKE_BUILD_TYPE=RELEASE \
           -DCMAKE_VERBOSE_MAKEFILE=ON \
-          -DSYSTEMD_DIR=/lib/systemd/system
+          -DSYSTEMD_DIR=${systemd_unitdir}/system
  
  oe_runmake -j16
  
@@ -136,18 +136,18 @@ do_install() {
    find ${D} -regex ".*\.la$" | xargs rm -f -- 
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
- mkdir -p ${D}/lib/systemd/system/multi-user.target.wants
- mkdir -p ${D}/lib/systemd/system/sockets.target.wants
- ln -s ../security-server.service ${D}/lib/systemd/system/multi-user.target.wants/security-server.service
- ln -s ../security-server-data-share.socket ${D}/lib/systemd/system/sockets.target.wants/security-server-data-share.socket
- ln -s ../security-server-get-gid.socket    ${D}/lib/systemd/system/sockets.target.wants/security-server-get-gid.socket
- ln -s ../security-server-privilege-by-pid.socket ${D}/lib/systemd/system/sockets.target.wants/security-server-privilege-by-pid.socket
- ln -s ../security-server-cookie-get.socket ${D}/lib/systemd/system/sockets.target.wants/security-server-cookie-get.socket
- ln -s ../security-server-cookie-check.socket ${D}/lib/systemd/system/sockets.target.wants/security-server-cookie-check.socket
- ln -s ../security-server-app-privilege-by-name.socket ${D}/lib/systemd/system/sockets.target.wants/security-server-app-privilege-by-name.socket
- ln -s ../security-server-password-check.socket ${D}/lib/systemd/system/sockets.target.wants/security-server-password-check.socket
- ln -s ../security-server-password-set.socket ${D}/lib/systemd/system/sockets.target.wants/security-server-password-set.socket
- ln -s ../security-server-password-reset.socket ${D}/lib/systemd/system/sockets.target.wants/security-server-password-reset.socket
+ mkdir -p ${D}${systemd_unitdir}/system/multi-user.target.wants
+ mkdir -p ${D}${systemd_unitdir}/system/sockets.target.wants
+ ln -s ../security-server.service ${D}${systemd_unitdir}/system/multi-user.target.wants/security-server.service
+ ln -s ../security-server-data-share.socket ${D}${systemd_unitdir}/system/sockets.target.wants/security-server-data-share.socket
+ ln -s ../security-server-get-gid.socket    ${D}${systemd_unitdir}/system/sockets.target.wants/security-server-get-gid.socket
+ ln -s ../security-server-privilege-by-pid.socket ${D}${systemd_unitdir}/system/sockets.target.wants/security-server-privilege-by-pid.socket
+ ln -s ../security-server-cookie-get.socket ${D}${systemd_unitdir}/system/sockets.target.wants/security-server-cookie-get.socket
+ ln -s ../security-server-cookie-check.socket ${D}${systemd_unitdir}/system/sockets.target.wants/security-server-cookie-check.socket
+ ln -s ../security-server-app-privilege-by-name.socket ${D}${systemd_unitdir}/system/sockets.target.wants/security-server-app-privilege-by-name.socket
+ ln -s ../security-server-password-check.socket ${D}${systemd_unitdir}/system/sockets.target.wants/security-server-password-check.socket
+ ln -s ../security-server-password-set.socket ${D}${systemd_unitdir}/system/sockets.target.wants/security-server-password-set.socket
+ ln -s ../security-server-password-reset.socket ${D}${systemd_unitdir}/system/sockets.target.wants/security-server-password-reset.socket
  
  
 }
@@ -209,28 +209,28 @@ PACKAGES += " libsecurity-server-client-dev "
 security-server_files = ""
 security-server_files += "${prefix}/bin/security-server"
 security-server_files += "${prefix}/lib/libsecurity-server-commons.so.*"
-security-server_files += "/lib/systemd/system/multi-user.target.wants/security-server.service"
-security-server_files += "/lib/systemd/system/security-server.service"
-security-server_files += "/lib/systemd/system/security-server.target"
-security-server_files += "/lib/systemd/system/sockets.target.wants/security-server-data-share.socket"
-security-server_files += "/lib/systemd/system/security-server-data-share.socket"
-security-server_files += "/lib/systemd/system/sockets.target.wants/security-server-get-gid.socket"
-security-server_files += "/lib/systemd/system/security-server-get-gid.socket"
-security-server_files += "/lib/systemd/system/sockets.target.wants/security-server-privilege-by-pid.socket"
-security-server_files += "/lib/systemd/system/security-server-privilege-by-pid.socket"
-security-server_files += "/lib/systemd/system/sockets.target.wants/security-server-cookie-get.socket"
-security-server_files += "/lib/systemd/system/security-server-cookie-get.socket"
-security-server_files += "/lib/systemd/system/sockets.target.wants/security-server-cookie-check.socket"
-security-server_files += "/lib/systemd/system/security-server-cookie-check.socket"
-security-server_files += "/lib/systemd/system/sockets.target.wants/security-server-app-privilege-by-name.socket"
-security-server_files += "/lib/systemd/system/security-server-app-privilege-by-name.socket"
+security-server_files += "${systemd_unitdir}/system/multi-user.target.wants/security-server.service"
+security-server_files += "${systemd_unitdir}/system/security-server.service"
+security-server_files += "${systemd_unitdir}/system/security-server.target"
+security-server_files += "${systemd_unitdir}/system/sockets.target.wants/security-server-data-share.socket"
+security-server_files += "${systemd_unitdir}/system/security-server-data-share.socket"
+security-server_files += "${systemd_unitdir}/system/sockets.target.wants/security-server-get-gid.socket"
+security-server_files += "${systemd_unitdir}/system/security-server-get-gid.socket"
+security-server_files += "${systemd_unitdir}/system/sockets.target.wants/security-server-privilege-by-pid.socket"
+security-server_files += "${systemd_unitdir}/system/security-server-privilege-by-pid.socket"
+security-server_files += "${systemd_unitdir}/system/sockets.target.wants/security-server-cookie-get.socket"
+security-server_files += "${systemd_unitdir}/system/security-server-cookie-get.socket"
+security-server_files += "${systemd_unitdir}/system/sockets.target.wants/security-server-cookie-check.socket"
+security-server_files += "${systemd_unitdir}/system/security-server-cookie-check.socket"
+security-server_files += "${systemd_unitdir}/system/sockets.target.wants/security-server-app-privilege-by-name.socket"
+security-server_files += "${systemd_unitdir}/system/security-server-app-privilege-by-name.socket"
 security-server_files += "%attr(-,root,root) ${sysconfdir}/security/security-server-audit.conf"
-security-server_files += "/lib/systemd/system/sockets.target.wants/security-server-password-check.socket"
-security-server_files += "/lib/systemd/system/security-server-password-check.socket"
-security-server_files += "/lib/systemd/system/sockets.target.wants/security-server-password-set.socket"
-security-server_files += "/lib/systemd/system/security-server-password-set.socket"
-security-server_files += "/lib/systemd/system/sockets.target.wants/security-server-password-reset.socket"
-security-server_files += "/lib/systemd/system/security-server-password-reset.socket"
+security-server_files += "${systemd_unitdir}/system/sockets.target.wants/security-server-password-check.socket"
+security-server_files += "${systemd_unitdir}/system/security-server-password-check.socket"
+security-server_files += "${systemd_unitdir}/system/sockets.target.wants/security-server-password-set.socket"
+security-server_files += "${systemd_unitdir}/system/security-server-password-set.socket"
+security-server_files += "${systemd_unitdir}/system/sockets.target.wants/security-server-password-reset.socket"
+security-server_files += "${systemd_unitdir}/system/security-server-password-reset.socket"
 security-server_files += "${prefix}/share/license/security-server"
 CONFFILES_${PN} = ""
 CONFFILES_${PN} += "%attr(-,root,root) ${sysconfdir}/security/security-server-audit.conf"

diff --git a/meta-tizen/recipes-tizen/smack/smack.inc b/meta-tizen/recipes-tizen/smack/smack.inc
index 9c1e6ae..57798c3 100644 (file)
--- a/meta-tizen/recipes-tizen/smack/smack.inc
+++ b/meta-tizen/recipes-tizen/smack/smack.inc
@@ -73,7 +73,7 @@ do_compile() {
   
   
 }
-EXTRA_OECONF += " --with-systemdsystemunitdir=/lib/systemd/system"
+EXTRA_OECONF += " --with-systemdsystemunitdir=${systemd_unitdir}/system"
 
 do_install() {
  export RPM_BUILD_ROOT=${D}

diff --git a/meta-tizen/recipes-tizen/system-server/system-server.inc b/meta-tizen/recipes-tizen/system-server/system-server.inc
index 3999dc1..2e57688 100644 (file)
--- a/meta-tizen/recipes-tizen/system-server/system-server.inc
+++ b/meta-tizen/recipes-tizen/system-server/system-server.inc
@@ -177,7 +177,7 @@ do_compile() {
          -DBUILD_SHARED_LIBS:BOOL=ON \
          ${EXTRA_OECMAKE} . \
         -DTZ_SYS_ETC=${sysconfdir} \
-        -DSYSTEMD_DIR=/lib/systemd/system
+        -DSYSTEMD_DIR=${systemd_unitdir}/system
  
  
  
@@ -203,21 +203,21 @@ do_install() {
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
  
- mkdir -p ${D}//lib/systemd/system/multi-user.target.wants 
- ln -s ../system-server.service  ${D}//lib/systemd/system/multi-user.target.wants/system-server.service  
+ mkdir -p ${D}/${systemd_unitdir}/system/multi-user.target.wants 
+ ln -s ../system-server.service  ${D}/${systemd_unitdir}/system/multi-user.target.wants/system-server.service  
  
- mkdir -p ${D}//lib/systemd/system/sockets.target.wants 
- ln -s ../system-server.socket  ${D}//lib/systemd/system/sockets.target.wants/system-server.socket  
+ mkdir -p ${D}/${systemd_unitdir}/system/sockets.target.wants 
+ ln -s ../system-server.socket  ${D}/${systemd_unitdir}/system/sockets.target.wants/system-server.socket  
  
  
- mkdir -p ${D}//lib/systemd/system/graphical.target.wants 
- ln -s ../regpmon.service  ${D}//lib/systemd/system/graphical.target.wants/regpmon.service  
- install -m 0644 ${S}/packaging/regpmon.service ${D}/lib/systemd/system/regpmon.service
+ mkdir -p ${D}/${systemd_unitdir}/system/graphical.target.wants 
+ ln -s ../regpmon.service  ${D}/${systemd_unitdir}/system/graphical.target.wants/regpmon.service  
+ install -m 0644 ${S}/packaging/regpmon.service ${D}${systemd_unitdir}/system/regpmon.service
  
  
- mkdir -p ${D}//lib/systemd/system/graphical.target.wants 
- ln -s ../zbooting-done.service  ${D}//lib/systemd/system/graphical.target.wants/zbooting-done.service  
- install -m 0644 ${S}/packaging/zbooting-done.service ${D}/lib/systemd/system/zbooting-done.service
+ mkdir -p ${D}/${systemd_unitdir}/system/graphical.target.wants 
+ ln -s ../zbooting-done.service  ${D}/${systemd_unitdir}/system/graphical.target.wants/zbooting-done.service  
+ install -m 0644 ${S}/packaging/zbooting-done.service ${D}${systemd_unitdir}/system/zbooting-done.service
  
  
  
@@ -468,14 +468,14 @@ system-server_files += "${prefix}/bin/sys_pci_noti"
 system-server_files += "${prefix}/bin/mmc-smack-label"
 system-server_files += "${prefix}/bin/device-daemon"
 system-server_files += "${prefix}/bin/fsck_msdosfs"
-system-server_files += "/lib/systemd/system/multi-user.target.wants/system-server.service"
-system-server_files += "/lib/systemd/system/graphical.target.wants/regpmon.service"
-system-server_files += "/lib/systemd/system/sockets.target.wants/system-server.socket"
-system-server_files += "/lib/systemd/system/system-server.service"
-system-server_files += "/lib/systemd/system/system-server.socket"
-system-server_files += "/lib/systemd/system/regpmon.service"
-system-server_files += "/lib/systemd/system/graphical.target.wants/zbooting-done.service"
-system-server_files += "/lib/systemd/system/zbooting-done.service"
+system-server_files += "${systemd_unitdir}/system/multi-user.target.wants/system-server.service"
+system-server_files += "${systemd_unitdir}/system/graphical.target.wants/regpmon.service"
+system-server_files += "${systemd_unitdir}/system/sockets.target.wants/system-server.socket"
+system-server_files += "${systemd_unitdir}/system/system-server.service"
+system-server_files += "${systemd_unitdir}/system/system-server.socket"
+system-server_files += "${systemd_unitdir}/system/regpmon.service"
+system-server_files += "${systemd_unitdir}/system/graphical.target.wants/zbooting-done.service"
+system-server_files += "${systemd_unitdir}/system/zbooting-done.service"
 system-server_files += "${prefix}/share/system-server/sys_pci_noti/res/locale/*/LC_MESSAGES/*.mo"
 system-server_files += "${prefix}/share/license/fsck_msdosfs"
 CONFFILES_${PN} = ""

diff --git a/meta-tizen/recipes-tizen/systemd/systemd.inc b/meta-tizen/recipes-tizen/systemd/systemd.inc
index b181aef..93f462e 100644 (file)
--- a/meta-tizen/recipes-tizen/systemd/systemd.inc
+++ b/meta-tizen/recipes-tizen/systemd/systemd.inc
@@ -131,7 +131,7 @@ do_compile() {
   intltoolize --force --automake
   
   autotools_do_configure
-  oe_runmake -j16           systemunitdir=/lib/systemd/system           userunitdir=/lib/systemd/user
+  oe_runmake -j16           systemunitdir=${systemd_unitdir}/system           userunitdir=${systemd_unitdir}/user
   
   
   

diff --git a/meta-tizen/recipes-tizen/user-session-units/user-session-units-extraconf.inc b/meta-tizen/recipes-tizen/user-session-units/user-session-units-extraconf.inc
index 4806585..88e49fe 100644 (file)
--- a/meta-tizen/recipes-tizen/user-session-units/user-session-units-extraconf.inc
+++ b/meta-tizen/recipes-tizen/user-session-units/user-session-units-extraconf.inc
@@ -3,17 +3,17 @@ FILESEXTRAPATHS_append := "${THISDIR}/user-session-units"
 inherit pkgconfig
 
 do_install_append() {
-    rm -f ${D}/lib/systemd/user/dbus.socket
+    rm -f ${D}${systemd_unitdir}/user/dbus.socket
 
-    echo "[Unit]" > ${D}/lib/systemd/user/default.target
-    echo "Description=User session default target" >> ${D}/lib/systemd/user/default.target
+    echo "[Unit]" > ${D}${systemd_unitdir}/user/default.target
+    echo "Description=User session default target" >> ${D}${systemd_unitdir}/user/default.target
 
-    mkdir -p ${D}/lib/systemd/user/default.target.wants
-    ln -sf ../dbus.service ${D}/lib/systemd/user/default.target.wants/dbus.service
-    rm ${D}/lib/systemd/user/dbus.service
+    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
     
-    rm -f ${D}/lib/systemd/user/default.target
-    ln -sf weston.target ${D}/lib/systemd/user/default.target
+    rm -f ${D}${systemd_unitdir}/user/default.target
+    ln -sf weston.target ${D}${systemd_unitdir}/user/default.target
 }
 
-user-session-units_files += "/lib/systemd/user/*"
+user-session-units_files += "${systemd_unitdir}/user/*"

diff --git a/meta-tizen/recipes-tizen/user-session-units/user-session-units.inc b/meta-tizen/recipes-tizen/user-session-units/user-session-units.inc
index eeeb66f..f12b4f0 100644 (file)
--- a/meta-tizen/recipes-tizen/user-session-units/user-session-units.inc
+++ b/meta-tizen/recipes-tizen/user-session-units/user-session-units.inc
@@ -98,23 +98,23 @@ PACKAGES += " user-session-units "
 PACKAGES += " user-session-units-gnome "
 
 user-session-units-enlightenment_files = ""
-user-session-units-enlightenment_files += "/lib/systemd/user/e17.target"
-user-session-units-enlightenment_files += "/lib/systemd/user/enlightenment.service"
-user-session-units-enlightenment_files += "/lib/systemd/user/e17.target.wants/enlightenment.service"
+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"
 MANIFESTFILES_${PN}-enlightenment = "user-session-units.manifest"
 
 user-session-units_files = ""
 user-session-units_files += "${prefix}/bin/user-session-launch"
-user-session-units_files += "/lib/systemd/system/*"
+user-session-units_files += "${systemd_unitdir}/system/*"
 user-session-units_files += "${sysconfdir}/pam.d/user-session"
 CONFFILES_${PN} = ""
 CONFFILES_${PN} += "${sysconfdir}/pam.d/user-session"
 MANIFESTFILES_${PN} = "user-session-units.manifest"
 
 user-session-units-gnome_files = ""
-user-session-units-gnome_files += "/lib/systemd/user/gnome.target"
-user-session-units-gnome_files += "/lib/systemd/user/gnome-session.service"
-user-session-units-gnome_files += "/lib/systemd/user/gnome.target.wants/gnome-session.service"
+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"
 MANIFESTFILES_${PN}-gnome = "user-session-units.manifest"
 
 FILES_${PN}-enlightenment = "${user-session-units-enlightenment_files}"

diff --git a/meta-tizen/recipes-tizen/vconf/vconf.inc b/meta-tizen/recipes-tizen/vconf/vconf.inc
index 7e302e6..eba2291 100644 (file)
--- a/meta-tizen/recipes-tizen/vconf/vconf.inc
+++ b/meta-tizen/recipes-tizen/vconf/vconf.inc
@@ -108,11 +108,11 @@ do_install() {
    find ${D} -regex ".*\.a$" | xargs rm -f --
  mkdir -p ${D}${prefix}/kdb/db
  mkdir -p ${D}${prefix}/kdb/db/.backup
- mkdir -p ${D}/lib/systemd/system/basic.target.wants
+ mkdir -p ${D}${systemd_unitdir}/system/basic.target.wants
  mkdir -p ${D}${prefix}/lib/tmpfiles.d
- install -m0644 ${S}/packaging/vconf-setup.service ${D}/lib/systemd/system/
+ install -m0644 ${S}/packaging/vconf-setup.service ${D}${systemd_unitdir}/system/
  install -m0644 ${S}/packaging/vconf-setup.conf ${D}${prefix}/lib/tmpfiles.d/
- ln -sf ../vconf-setup.service ${D}/lib/systemd/system/basic.target.wants/
+ ln -sf ../vconf-setup.service ${D}${systemd_unitdir}/system/basic.target.wants/
  
  
 }
@@ -153,8 +153,8 @@ vconf_files += "${prefix}/kdb/kdb_first_boot"
 vconf_files += "${prefix}/lib/*.so.*"
 vconf_files += "%attr(777,root,users) ${prefix}/kdb/db"
 vconf_files += "%attr(777,root,root) ${prefix}/kdb/db/.backup"
-vconf_files += "/lib/systemd/system/basic.target.wants/vconf-setup.service"
-vconf_files += "/lib/systemd/system/vconf-setup.service"
+vconf_files += "${systemd_unitdir}/system/basic.target.wants/vconf-setup.service"
+vconf_files += "${systemd_unitdir}/system/vconf-setup.service"
 vconf_files += "${prefix}/lib/tmpfiles.d/vconf-setup.conf"
 MANIFESTFILES_${PN} = "vconf.manifest"
 DIRFILES_${PN} = ""

diff --git a/meta-tizen/recipes-tizen/weston-common/weston-common.inc b/meta-tizen/recipes-tizen/weston-common/weston-common.inc
index 0226275..f4089a7 100644 (file)
--- a/meta-tizen/recipes-tizen/weston-common/weston-common.inc
+++ b/meta-tizen/recipes-tizen/weston-common/weston-common.inc
@@ -108,10 +108,10 @@ do_install() {
    find ${D} -regex ".*\.a$" | xargs rm -f --
  
  # install weston service as 'display-manager.service' as it's the one wanted by graphical.target
- mkdir -p ${D}/lib/systemd/system
- install -m 644 display-manager-run.service ${D}/lib/systemd/system/display-manager-run.service
- install -m 644 display-manager.service ${D}/lib/systemd/system/display-manager.service
- install -m 644 display-manager.path ${D}/lib/systemd/system/display-manager.path
+ mkdir -p ${D}${systemd_unitdir}/system
+ install -m 644 display-manager-run.service ${D}${systemd_unitdir}/system/display-manager-run.service
+ install -m 644 display-manager.service ${D}${systemd_unitdir}/system/display-manager.service
+ install -m 644 display-manager.path ${D}${systemd_unitdir}/system/display-manager.path
  
  # install Environment file for weston service and weston-user.service
  mkdir -p ${D}${sysconfdir}/sysconfig
@@ -123,8 +123,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}/lib/systemd/user
- install -m 644 weston-user.service ${D}/lib/systemd/user/
+ mkdir -p ${D}${systemd_unitdir}/user
+ install -m 644 weston-user.service ${D}${systemd_unitdir}/user/
  
  # install weston.sh
  mkdir -p ${D}${sysconfdir}/profile.d/
@@ -172,19 +172,19 @@ pkg_preinst_${PN}() {
     groupmod -A display input
     groupmod -A display video
     # setup display manager service
-    mkdir -p /lib/systemd/system/graphical.target.wants/
-    ln -sf ../display-manager.path  /lib/systemd/system/graphical.target.wants/
+    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 /lib/systemd/user/default.target.requires/
-    ln -sf ../weston-user.service  /lib/systemd/user/default.target.requires/
+    mkdir -p ${systemd_unitdir}/user/default.target.requires/
+    ln -sf ../weston-user.service  ${systemd_unitdir}/user/default.target.requires/
 
 }
 
 pkg_postrm_${PN}() {
     #!/bin/sh -e
 
-    rm -f /lib/systemd/system/graphical.target.wants/display-manager.path
-    rm -f /lib/systemd/user/default.target.requires/weston-user.service
+    rm -f ${systemd_unitdir}/system/graphical.target.wants/display-manager.path
+    rm -f ${systemd_unitdir}/user/default.target.requires/weston-user.service
 
 }
 
@@ -199,12 +199,12 @@ weston-common-tz-launcher_files += "${prefix}/bin/wl-pre"
 MANIFESTFILES_${PN}-tz-launcher = "weston-common.manifest"
 
 weston-common_files = ""
-weston-common_files += "/lib/systemd/system/display-manager-run.service"
-weston-common_files += "/lib/systemd/system/display-manager.service"
-weston-common_files += "/lib/systemd/system/display-manager.path"
+weston-common_files += "${systemd_unitdir}/system/display-manager-run.service"
+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 += "/lib/systemd/user/weston-user.service"
+weston-common_files += "${systemd_unitdir}/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/meta-tizen/recipes-tizen/weston-ivi/weston-ivi.inc b/meta-tizen/recipes-tizen/weston-ivi/weston-ivi.inc
index eca174d..e9c1c21 100644 (file)
--- a/meta-tizen/recipes-tizen/weston-ivi/weston-ivi.inc
+++ b/meta-tizen/recipes-tizen/weston-ivi/weston-ivi.inc
@@ -66,9 +66,9 @@ do_install() {
  mkdir -p ${D}
  
  
- install -d ${D}/lib/systemd/user/weston.target.wants
- install -m 644 weston.service ${D}/lib/systemd/user/weston.service
- ln -sf ../weston.service ${D}//lib/systemd/user/weston.target.wants/
+ 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/
  
  mkdir -p ${D}${sysconfdir}/profile.d/
  install -m 0644 weston.sh ${D}${sysconfdir}/profile.d/
@@ -90,8 +90,8 @@ CONFFILES_${PN}-config += "${sysconfdir}/xdg/weston/weston.ini"
 MANIFESTFILES_${PN}-config = "weston-ivi.manifest"
 
 weston-ivi_files = ""
-weston-ivi_files += "/lib/systemd/user/weston.service"
-weston-ivi_files += "/lib/systemd/user/weston.target.wants/weston.service"
+weston-ivi_files += "${systemd_unitdir}/user/weston.service"
+weston-ivi_files += "${systemd_unitdir}/user/weston.target.wants/weston.service"
 weston-ivi_files += "${sysconfdir}/profile.d/*"
 CONFFILES_${PN} = ""
 CONFFILES_${PN} += "${sysconfdir}/profile.d/*"

diff --git a/meta-tizen/recipes-tizen/weston/weston.inc b/meta-tizen/recipes-tizen/weston/weston.inc
index fc0375a..78a2f97 100644 (file)
--- a/meta-tizen/recipes-tizen/weston/weston.inc
+++ b/meta-tizen/recipes-tizen/weston/weston.inc
@@ -133,8 +133,8 @@ do_install() {
  install -m 755 weston-fullscreen ${D}${prefix}/bin
  
  
- install -d ${D}/lib/systemd/user
- install -m 644 ${S}/packaging/weston.target ${D}/lib/systemd/user/weston.target
+ install -d ${D}${systemd_unitdir}/user
+ install -m 644 ${S}/packaging/weston.target ${D}${systemd_unitdir}/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
@@ -175,7 +175,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 += "/lib/systemd/user/weston.target"
+weston_files += "${systemd_unitdir}/user/weston.target"
 MANIFESTFILES_${PN} = "weston.manifest"
 
 weston-clients_files = ""

diff --git a/meta-tizen/recipes-tizen/wrt-widgets/wrt-widgets.inc b/meta-tizen/recipes-tizen/wrt-widgets/wrt-widgets.inc
index 3c5f84d..a179256 100644 (file)
--- a/meta-tizen/recipes-tizen/wrt-widgets/wrt-widgets.inc
+++ b/meta-tizen/recipes-tizen/wrt-widgets/wrt-widgets.inc
@@ -73,8 +73,8 @@ do_install() {
  cp install.conf ${D}/${prefix}/share/widget_demo/
  
  # install xwalk preinstall service in user session
- mkdir -p ${D}/lib/systemd/user
- install -m 644 xwalk_widgets_preinstall.service ${D}/lib/systemd/user/
+ mkdir -p ${D}${systemd_unitdir}/user
+ install -m 644 xwalk_widgets_preinstall.service ${D}${systemd_unitdir}/user/
  
  
 }
@@ -83,15 +83,15 @@ pkg_postinst_${PN}() {
     #!/bin/sh -e
 
     # setup xwalk preinstall service (inside user session)
-    mkdir -p /lib/systemd/user/default.target.wants/
-    ln -sf ../xwalk_widgets_preinstall.service /lib/systemd/user/default.target.wants/
+    mkdir -p ${systemd_unitdir}/user/default.target.wants/
+    ln -sf ../xwalk_widgets_preinstall.service ${systemd_unitdir}/user/default.target.wants/
 
 }
 
 pkg_postrm_${PN}() {
     #!/bin/sh -e
 
-    rm -f /lib/systemd/user/default.target.wants/xwalk_widgets_preinstall.service
+    rm -f ${systemd_unitdir}/user/default.target.wants/xwalk_widgets_preinstall.service
 
 }
 
@@ -102,7 +102,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 += "/lib/systemd/user/xwalk_widgets_preinstall.service"
+wrt-widgets_files += "${systemd_unitdir}/user/xwalk_widgets_preinstall.service"
 MANIFESTFILES_${PN} = "wrt-widgets.manifest"
 
 FILES_${PN} = "${wrt-widgets_files}"