Fix Tizen systemd build

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

diff --git a/recipes-image/images/tizen-common-core-image-minimal.bb b/recipes-image/images/tizen-common-core-image-minimal.bb
index 776ba26..80348af 100644 (file)
--- a/recipes-image/images/tizen-common-core-image-minimal.bb
+++ b/recipes-image/images/tizen-common-core-image-minimal.bb
@@ -8,7 +8,7 @@ inherit core-image distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "wayland pam"
 
-CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples clutter-1.0-examples"
+CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples gtk+3-demo clutter-1.0-examples"
 
 DESCRIPTION = "A weston image with Tizen common."
 

diff --git a/recipes-tizen/systemd/systemd-extraconf.inc b/recipes-tizen/systemd/systemd-extraconf.inc
index 484106b..eeea340 100644 (file)
--- a/recipes-tizen/systemd/systemd-extraconf.inc
+++ b/recipes-tizen/systemd/systemd-extraconf.inc
@@ -1,3 +1,4 @@
+
 systemd_files += "${sysconfdir}/*"
 
 systemd_files += "/usr/lib64/python2.7"
@@ -41,10 +42,12 @@ do_install_append() {
 
 }
 
+EXTRA_OECONF = " --disable-manpages \
+                 --without-python \
+               "
+GTKDOC_DOCDIR = "${S}/docs/"
 
-
-
-
-
-
-
+do_configure_prepend() {
+       rm -f ${S}/docs/gtk-doc.make
+       echo 'EXTRA_DIST =' > ${S}/docs/gtk-doc.make
+}

diff --git a/recipes-tizen/systemd/systemd.inc b/recipes-tizen/systemd/systemd.inc
index 3970acf..299d40d 100644 (file)
--- a/recipes-tizen/systemd/systemd.inc
+++ b/recipes-tizen/systemd/systemd.inc
@@ -121,26 +121,6 @@ do_compile() {
    CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ; 
    CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; 
    FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; 
-   ./autogen.sh --build=${TARGET_SYS} --host=${HOST_SYS} \
-         --target=x86_64-tizen-linux \
-         --program-prefix= \
-         --prefix=${prefix} \
-         --exec-prefix=${prefix} \
-         --bindir=${prefix}/bin \
-         --sbindir=${prefix}/sbin \
-         --sysconfdir=${sysconfdir} \
-         --datadir=${prefix}/share \
-         --includedir=${prefix}/include \
-         --libdir=${prefix}/lib \
-         --libexecdir=${prefix}/libexec \
-         --localstatedir=${localstatedir} \
-         --sharedstatedir=${prefix}/com \
-         --mandir=${mandir} \
-         --infodir=${infodir}
- 
-   CFLAGS="${CFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CFLAGS ; 
-   CXXFLAGS="${CXXFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables}" ; export CXXFLAGS ; 
-   FFLAGS="${FFLAGS:--O2 -g -m64 -fmessage-length=0 -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -I%_fmoddir}" ; export FFLAGS ; 
    autotools_do_configure --build=${TARGET_SYS} --host=${HOST_SYS} \
          --target=x86_64-tizen-linux \
          --program-prefix= \

diff --git a/recipes-tizen/user-session-units/user-session-units.inc b/recipes-tizen/user-session-units/user-session-units.inc
index 76b5f54..827720b 100644 (file)
--- a/recipes-tizen/user-session-units/user-session-units.inc
+++ b/recipes-tizen/user-session-units/user-session-units.inc
@@ -100,8 +100,7 @@ do_compile() {
          --localstatedir=${localstatedir} \
          --sharedstatedir=${prefix}/com \
          --mandir=${mandir} \
-         --infodir=${infodir}
-
+         --infodir=${infodir} --enable-gnome --enable-enlightenment
  
  make -j16
  

diff --git a/recipes-tizen/weston-common/weston-common-extraconf.inc b/recipes-tizen/weston-common/weston-common-extraconf.inc
index 5602b95..3fd0654 100644 (file)
--- a/recipes-tizen/weston-common/weston-common-extraconf.inc
+++ b/recipes-tizen/weston-common/weston-common-extraconf.inc
@@ -2,9 +2,9 @@ inherit useradd
 
 USERADD_PACKAGES = "${PN}"
 
-GROUPADD_PARAM_${PN} = "-g 191 display;-g 100 users"
+GROUPADD_PARAM_${PN} = "-g 191 display;-g 100 users,-g 1004 input,-g 190 systemd-journal,-g 54 lock"
 
-USERADD_PARAM_${PN} = "  -d /run/display -m  -u 115  -g display -G users  -s /bin/sh display; "
+USERADD_PARAM_${PN} = "  -d /run/display -m  -u 115  -g display -G users,input,tty,display  -s /bin/sh display; "
 USERADD_PARAM_${PN} += " -d /home/alice -m -u 5001   -g users   -G display -r -s /bin/sh alice; "
 USERADD_PARAM_${PN} += " -d /home/bob   -m -u 5002   -g users   -G display -r -s /bin/sh bob; "
 USERADD_PARAM_${PN} += " -d /home/carole -m -u 5003   -g users   -G display -r -s /bin/sh carole; "