From 092bfdbe910ba3551e4fe452d017ac273492874e Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Mon, 22 Sep 2014 17:49:47 +0200 Subject: [PATCH] meta-tizen: update recipes Change-Id: I4c0bceb537a870149226d36684560cae457e289b (From meta-tizen rev: 38bc14587b5a0fd092b7d35ced682e8248c042d1) Signed-off-by: Ronan Le Martret Signed-off-by: Patrick Ohly --- .../recipes-image/config-image/config-image.bb | 2 +- .../automotive-message-broker.inc | 5 +- .../automotive-message-broker_git.bb | 2 +- .../common-api-dbus-runtime-extraconf.inc | 0 .../common-api-dbus-runtime.inc | 126 +++++++++++++++++++++ .../common-api-dbus-runtime_git.bb | 10 ++ .../common-api-runtime-extraconf.inc | 0 .../common-api-runtime/common-api-runtime.inc | 122 ++++++++++++++++++++ .../common-api-runtime/common-api-runtime_git.bb | 10 ++ .../download-provider/download-provider.inc | 60 +++++----- .../download-provider/download-provider_git.bb | 2 +- .../ecryptfs-utils/ecryptfs-utils.inc | 53 ++++++--- .../ecryptfs-utils/ecryptfs-utils_git.bb | 2 +- meta-tizen/recipes-tizen/efl/efl.inc | 32 +++++- meta-tizen/recipes-tizen/efl/efl_git.bb | 2 +- .../genivi-audio-manager-extraconf.inc | 33 ++---- .../genivi-audio-manager/genivi-audio-manager.inc | 6 +- .../genivi-audio-manager_git.bb | 2 +- meta-tizen/recipes-tizen/libgsasl/libgsasl.inc | 7 +- meta-tizen/recipes-tizen/libgsasl/libgsasl_git.bb | 2 +- meta-tizen/recipes-tizen/libhangul/libhangul.inc | 3 +- .../recipes-tizen/libhangul/libhangul_git.bb | 2 +- .../pulseaudio-module-murphy-ivi_git.bb | 2 +- .../system-server/system-server-extraconf.inc | 3 - .../recipes-tizen/system-server/system-server.inc | 4 +- .../system-server/system-server_git.bb | 2 +- 26 files changed, 404 insertions(+), 90 deletions(-) create mode 100644 meta-tizen/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime-extraconf.inc create mode 100644 meta-tizen/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime.inc create mode 100644 meta-tizen/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime_git.bb create mode 100644 meta-tizen/recipes-tizen/common-api-runtime/common-api-runtime-extraconf.inc create mode 100644 meta-tizen/recipes-tizen/common-api-runtime/common-api-runtime.inc create mode 100644 meta-tizen/recipes-tizen/common-api-runtime/common-api-runtime_git.bb diff --git a/meta-tizen/recipes-image/config-image/config-image.bb b/meta-tizen/recipes-image/config-image/config-image.bb index 4fc8a2b..2f2e4f6 100644 --- a/meta-tizen/recipes-image/config-image/config-image.bb +++ b/meta-tizen/recipes-image/config-image/config-image.bb @@ -71,7 +71,7 @@ pkg_postinst_${PN} () { rm -fr $D${localstatedir}/log #rm -fr $D/lib/systemd - #rm -fr $D/usr/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/automotive-message-broker/automotive-message-broker.inc b/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker.inc index 174598a..fb477a6 100644 --- a/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker.inc +++ b/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker.inc @@ -131,7 +131,7 @@ DEPENDS += "boost" do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} - #setup -q -n automotive-message-broker-0.11.900 + #setup -q -n automotive-message-broker-0.11.901 } @@ -168,7 +168,8 @@ do_compile() { -Dgpsnmea_plugin=ON \ -Dcangen_plugin=ON \ -Dcansim_plugin=ON \ - -Denable_docs=ON + -Denable_docs=ON \ + -Dusebluez5=ON oe_runmake -j16 diff --git a/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker_git.bb b/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker_git.bb index b48d28f..eb4b1be 100644 --- a/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker_git.bb +++ b/meta-tizen/recipes-tizen/automotive-message-broker/automotive-message-broker_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/automotive-message-broker;tag=4d85122ae488d43757855760da785171f06e7552;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/automotive-message-broker;tag=567ede081ff46fd521494356af4eda0a3e724fd2;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime-extraconf.inc b/meta-tizen/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime-extraconf.inc new file mode 100644 index 0000000..e69de29 diff --git a/meta-tizen/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime.inc b/meta-tizen/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime.inc new file mode 100644 index 0000000..d2cf27b --- /dev/null +++ b/meta-tizen/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime.inc @@ -0,0 +1,126 @@ +DESCRIPTION = "GENIVI IPC Common API C++ DBus" +HOMEPAGE = "http://nohomepage.org" +SECTION = "Automotive/GENIVI" +LICENSE = "MPL-2.0" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by libCommonAPI-DBus +PROVIDES += "libCommonAPI-DBus" + + +#PROVIDES by CommonAPI-DBus +PROVIDES += "CommonAPI-DBus" + + +#PROVIDES by CommonAPI-DBus-dev +PROVIDES += "CommonAPI-DBus-dev" + + +RDEPENDS = "" +#RDEPENDS of CommonAPI-DBus (CommonAPI-DBus) +RDEPENDS_CommonAPI-DBus += "eglibc" + +#RDEPENDS of CommonAPI-DBus-dev (CommonAPI-DBus-dev) +RDEPENDS_CommonAPI-DBus-dev += "libCommonAPI-DBus" + + +DEPENDS = "" +#DEPENDS of CommonAPI-DBus +DEPENDS += "dbus" +DEPENDS += "common-api-runtime" +DEPENDS += "glib-2.0" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + + +} +do_patch_append() { + bb.build.exec_func('do_prep', d) +} + +do_configure() { +} + +do_compile() { + cd ${S} + LANG=C + export LANG + unset DISPLAY + LD_AS_NEEDED=1; export LD_AS_NEEDED ; + + autoreconf -i + + autotools_do_configure + make -j16 + + + +} +EXTRA_OECONF += " " + +do_install() { + export RPM_BUILD_ROOT=${D} + cd ${S} + LANG=C + export LANG + unset DISPLAY + rm -rf ${D} + mkdir -p ${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 -- + + +} + +pkg_postinst_libCommonAPI-DBus() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_libCommonAPI-DBus() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " libCommonAPI-DBus " +PACKAGES += " CommonAPI-DBus-dev " + +libCommonAPI-DBus_files = "" +libCommonAPI-DBus_files += "${prefix}/lib/*so.*" + +CommonAPI-DBus-dev_files = "" +CommonAPI-DBus-dev_files += "${prefix}/include/CommonAPI-2.1/CommonAPI/*" +CommonAPI-DBus-dev_files += "${prefix}/include/CommonAPI-2.1/pugixml/*" +CommonAPI-DBus-dev_files += "${prefix}/lib/*.so" +CommonAPI-DBus-dev_files += "${prefix}/lib/pkgconfig/*.pc" + +FILES_libCommonAPI-DBus = "${libCommonAPI-DBus_files}" +FILES_CommonAPI-DBus-dev = "${CommonAPI-DBus-dev_files}" + +PKG_libCommonAPI-DBus= "libCommonAPI-DBus" +PKG_CommonAPI-DBus-dev= "CommonAPI-DBus-dev" + +require common-api-dbus-runtime-extraconf.inc + diff --git a/meta-tizen/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime_git.bb b/meta-tizen/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime_git.bb new file mode 100644 index 0000000..547160f --- /dev/null +++ b/meta-tizen/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime_git.bb @@ -0,0 +1,10 @@ +require common-api-dbus-runtime.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/profile/ivi/common-api-dbus-runtime;tag=f5383391b93eaa4640494f87bbadeb7ad97504a9;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-tizen/recipes-tizen/common-api-runtime/common-api-runtime-extraconf.inc b/meta-tizen/recipes-tizen/common-api-runtime/common-api-runtime-extraconf.inc new file mode 100644 index 0000000..e69de29 diff --git a/meta-tizen/recipes-tizen/common-api-runtime/common-api-runtime.inc b/meta-tizen/recipes-tizen/common-api-runtime/common-api-runtime.inc new file mode 100644 index 0000000..57e3c3d --- /dev/null +++ b/meta-tizen/recipes-tizen/common-api-runtime/common-api-runtime.inc @@ -0,0 +1,122 @@ +DESCRIPTION = "GENIVI IPC Common API C++ Runtime" +HOMEPAGE = "http://nohomepage.org" +SECTION = "Automotive/GENIVI" +LICENSE = "MPL-2.0" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by CommonAPI +PROVIDES += "CommonAPI" + + +#PROVIDES by libCommonAPI +PROVIDES += "libCommonAPI" + + +#PROVIDES by CommonAPI-dev +PROVIDES += "CommonAPI-dev" + + +RDEPENDS = "" +#RDEPENDS of CommonAPI (CommonAPI) +RDEPENDS_CommonAPI += "eglibc" + +#RDEPENDS of CommonAPI-dev (CommonAPI-dev) +RDEPENDS_CommonAPI-dev += "libCommonAPI" + + +DEPENDS = "" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + + +} +do_patch_append() { + bb.build.exec_func('do_prep', d) +} + +do_configure() { +} + +do_compile() { + cd ${S} + LANG=C + export LANG + unset DISPLAY + LD_AS_NEEDED=1; export LD_AS_NEEDED ; + + autoreconf -i + + autotools_do_configure + + make -j16 + + + +} +EXTRA_OECONF += "" + +do_install() { + export RPM_BUILD_ROOT=${D} + cd ${S} + LANG=C + export LANG + unset DISPLAY + rm -rf ${D} + mkdir -p ${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 -- + + +} + +pkg_postinst_libCommonAPI() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_libCommonAPI() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " libCommonAPI " +PACKAGES += " CommonAPI-dev " + +libCommonAPI_files = "" +libCommonAPI_files += "${prefix}/lib/*so.*" + +CommonAPI-dev_files = "" +CommonAPI-dev_files += "${prefix}/include/CommonAPI-2.1/CommonAPI/*" +CommonAPI-dev_files += "${prefix}/lib/*.so" +CommonAPI-dev_files += "${prefix}/lib/pkgconfig/*.pc" + +FILES_libCommonAPI = "${libCommonAPI_files}" +FILES_CommonAPI-dev = "${CommonAPI-dev_files}" + +PKG_libCommonAPI= "libCommonAPI" +PKG_CommonAPI-dev= "CommonAPI-dev" + +require common-api-runtime-extraconf.inc + diff --git a/meta-tizen/recipes-tizen/common-api-runtime/common-api-runtime_git.bb b/meta-tizen/recipes-tizen/common-api-runtime/common-api-runtime_git.bb new file mode 100644 index 0000000..70f278c --- /dev/null +++ b/meta-tizen/recipes-tizen/common-api-runtime/common-api-runtime_git.bb @@ -0,0 +1,10 @@ +require common-api-runtime.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/profile/ivi/common-api-runtime;tag=307112a91ac86e5a4fb3cc0b7c772a561e6845d3;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-tizen/recipes-tizen/download-provider/download-provider.inc b/meta-tizen/recipes-tizen/download-provider/download-provider.inc index 33f1c25..07e10ee 100644 --- a/meta-tizen/recipes-tizen/download-provider/download-provider.inc +++ b/meta-tizen/recipes-tizen/download-provider/download-provider.inc @@ -63,8 +63,6 @@ do_prep() { #setup -q - - } do_patch_append() { bb.build.exec_func('do_prep', d) @@ -81,28 +79,36 @@ do_compile() { LD_AS_NEEDED=1; export LD_AS_NEEDED ; - CFLAGS="${CFLAGS:-$CFLAGS} -fPIC -D_REENTRANT -fvisibility=hidden"; export CFLAGS - FFLAGS="${FFLAGS:-$CFLAGS} -fPIC -fvisibility=hidden"; export FFLAGS - LDFLAGS+=" -Wl,--as-needed -Wl,--hash-style=both"; export LDFLAGS - cmake \ - -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ - -DBIN_INSTALL_DIR:PATH=${prefix}/bin \ - -DLIB_INSTALL_DIR:PATH=${prefix}/lib \ - -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \ - -DPKG_NAME=download-provider \ - -DPKG_VERSION=1.1.6 \ - -DPKG_RELEASE=0 \ - -DIMAGE_DIR:PATH=${prefix}/share/download-provider/images \ - -DLOCALE_DIR:PATH=${prefix}/share/download-provider/locales \ - -DSYSTEMD_DIR:PATH=/lib/systemd/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 \ - -DSUPPORT_LOG_MESSAGE:BOOL=ON \ - -DSUPPORT_CHECK_IPC:BOOL=ON \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON . - make -j16 + CFLAGS="${CFLAGS:-$CFLAGS} -fPIC -D_REENTRANT -fvisibility=hidden"; export CFLAGS + FFLAGS="${FFLAGS:-$CFLAGS} -fPIC -fvisibility=hidden"; export FFLAGS + LDFLAGS="${LDFLAGS} -Wl,--as-needed -Wl,--hash-style=both"; export LDFLAGS + + + cmake \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ + -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \ + -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \ + -DLIB_INSTALL_DIR:PATH=${prefix}/lib \ + -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \ + -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + ${EXTRA_OECMAKE} . \ + -DBIN_INSTALL_DIR:PATH=${prefix}/bin \ + -DPKG_NAME=download-provider \ + -DPKG_VERSION=1.1.6 \ + -DPKG_RELEASE=0 \ + -DIMAGE_DIR:PATH=${prefix}/share/download-provider/images \ + -DLOCALE_DIR:PATH=${prefix}/share/locale \ + -DSYSTEMD_DIR:PATH=/lib/systemd/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 \ + -DSUPPORT_LOG_MESSAGE:BOOL=ON \ + -DSUPPORT_CHECK_IPC:BOOL=ON + + oe_runmake -j16 @@ -132,10 +138,13 @@ do_install() { ln -s ../download-provider.service ${D}/lib/systemd/system/graphical.target.wants/ ln -s ../download-provider.socket ${D}/lib/systemd/system/sockets.target.wants/ + #find_lang download-provider + + _target=""; _symlinks=0; - fdupes -q -n -r ${D}${prefix}/share/download-provider/locales | + fdupes -q -n -r ${D}${prefix}/share/locale | while read _file; do if test -z "$_target" ; then _target="$_file"; @@ -201,7 +210,6 @@ download-provider_files += "/lib/systemd/system/graphical.target.wants/download- download-provider_files += "/lib/systemd/system/download-provider.socket" download-provider_files += "/lib/systemd/system/sockets.target.wants/download-provider.socket" download-provider_files += "${prefix}/share/download-provider/sql/download-provider-schema.sql" -download-provider_files += "${prefix}/share/download-provider/locales/*" MANIFESTFILES_${PN} = "download-provider.manifest" download-provider-dev_files = "" diff --git a/meta-tizen/recipes-tizen/download-provider/download-provider_git.bb b/meta-tizen/recipes-tizen/download-provider/download-provider_git.bb index e4a6bfc..1c0836a 100644 --- a/meta-tizen/recipes-tizen/download-provider/download-provider_git.bb +++ b/meta-tizen/recipes-tizen/download-provider/download-provider_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/download-provider;tag=0bf02f3d4683689e0bdb132e0ff1ccee1e328ad9;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/framework/web/download-provider;tag=1fb4a3614bd271355b6babf42076d3bda2da122c;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/ecryptfs-utils/ecryptfs-utils.inc b/meta-tizen/recipes-tizen/ecryptfs-utils/ecryptfs-utils.inc index 0e16b2e..7939b5c 100644 --- a/meta-tizen/recipes-tizen/ecryptfs-utils/ecryptfs-utils.inc +++ b/meta-tizen/recipes-tizen/ecryptfs-utils/ecryptfs-utils.inc @@ -1,4 +1,4 @@ -DESCRIPTION = "eCryptfs user space utilities" +DESCRIPTION = "ECryptfs utilities" HOMEPAGE = "http://nohomepage.org" SECTION = "System/Libraries" LICENSE = "GPL-2.0+" @@ -43,10 +43,13 @@ RDEPENDS_libecryptfs-dev += "keyutils" DEPENDS = "" #DEPENDS of ecryptfs-utils -inherit pythonnative DEPENDS += "keyutils" DEPENDS_append_class-native = " intltool-native" DEPENDS_append_class-target = " intltool-native" +inherit pythonnative +DEPENDS_append_class-native = " fdupes-native" +DEPENDS_append_class-target = " fdupes-native" +DEPENDS += "glib-2.0" DEPENDS += "nss" DEPENDS += "libpam" @@ -75,7 +78,7 @@ do_compile() { autotools_do_configure - make -j16 + oe_runmake -j16 @@ -103,17 +106,40 @@ do_install() { find ${D} -regex ".*\.la$" | xargs rm -f -- find ${D} -regex ".*\.a$" | xargs rm -f -- + #find_lang ecryptfs-utils + + + _target=""; + _symlinks=0; + + fdupes -q -n -r ${D} | + 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 + } -pkg_postinst_${PN}() { +pkg_postinst_libecryptfs() { #!/bin/sh -e [ "x$D" == "x" ] && ldconfig } -pkg_postrm_${PN}() { +pkg_postrm_libecryptfs() { #!/bin/sh -e [ "x$D" == "x" ] && ldconfig @@ -121,8 +147,8 @@ pkg_postrm_${PN}() { PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " libecryptfs " -PACKAGES += " ecryptfs-utils " PACKAGES += " libecryptfs-python " +PACKAGES += " ecryptfs-utils " PACKAGES += " libecryptfs-dev " libecryptfs_files = "" @@ -130,13 +156,16 @@ libecryptfs_files += "${prefix}/lib/libecryptfs.so.*" libecryptfs_files += "${prefix}/lib/ecryptfs/*" MANIFESTFILES_libecryptfs = "ecryptfs-utils.manifest" +libecryptfs-python_files = "" +libecryptfs-python_files += "/usr/lib/python2.7/site-packages/ecryptfs-utils/*" +libecryptfs-python_files += "/usr/lib64/python2.7/site-packages/ecryptfs-utils/*" + ecryptfs-utils_files = "" -ecryptfs-utils_files += "AUTHORS COPYING INSTALL NEWS README" +ecryptfs-utils_files += "AUTHORS NEWS" ecryptfs-utils_files += "${prefix}/bin/ecryptfs*" ecryptfs-utils_files += "/sbin/mount.ecryptfs*" ecryptfs-utils_files += "/sbin/umount.ecryptfs*" ecryptfs-utils_files += "/lib/security/pam_ecryptfs.so" -ecryptfs-utils_files += "${prefix}/share/locale/*/LC_MESSAGES/ecryptfs-utils.mo" ecryptfs-utils_files += "${mandir}/man1/*ecryptfs*" ecryptfs-utils_files += "${mandir}/man7/*ecryptfs*" ecryptfs-utils_files += "${mandir}/man8/*ecryptfs*" @@ -144,23 +173,19 @@ ecryptfs-utils_files += "${prefix}/share/doc/ecryptfs-utils/*" ecryptfs-utils_files += "${prefix}/share/ecryptfs-utils/*" MANIFESTFILES_${PN} = "ecryptfs-utils.manifest" -libecryptfs-python_files = "" -libecryptfs-python_files += "/usr/lib/python2.7/site-packages/ecryptfs-utils/*" -libecryptfs-python_files += "/usr/lib64/python2.7/site-packages/ecryptfs-utils/*" - libecryptfs-dev_files = "" libecryptfs-dev_files += "${prefix}/include/ecryptfs.h" libecryptfs-dev_files += "${prefix}/lib/libecryptfs.so" libecryptfs-dev_files += "${prefix}/lib/pkgconfig/libecryptfs.pc" FILES_libecryptfs = "${libecryptfs_files}" -FILES_${PN} = "${ecryptfs-utils_files}" FILES_libecryptfs-python = "${libecryptfs-python_files}" +FILES_${PN} = "${ecryptfs-utils_files}" FILES_libecryptfs-dev = "${libecryptfs-dev_files}" PKG_libecryptfs= "libecryptfs" -PKG_ecryptfs-utils= "ecryptfs-utils" PKG_libecryptfs-python= "libecryptfs-python" +PKG_ecryptfs-utils= "ecryptfs-utils" PKG_libecryptfs-dev= "libecryptfs-dev" require ecryptfs-utils-extraconf.inc diff --git a/meta-tizen/recipes-tizen/ecryptfs-utils/ecryptfs-utils_git.bb b/meta-tizen/recipes-tizen/ecryptfs-utils/ecryptfs-utils_git.bb index 2a4bc2d..1fbf02a 100644 --- a/meta-tizen/recipes-tizen/ecryptfs-utils/ecryptfs-utils_git.bb +++ b/meta-tizen/recipes-tizen/ecryptfs-utils/ecryptfs-utils_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/ecryptfs-utils;tag=0342ba1b12a89cc2d2a9d9b820c8270585bee62c;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/ecryptfs-utils;tag=78d8f9d78bb72e281f6409c40668ae7c2977191e;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/efl/efl.inc b/meta-tizen/recipes-tizen/efl/efl.inc index 72974ad..34237fc 100644 --- a/meta-tizen/recipes-tizen/efl/efl.inc +++ b/meta-tizen/recipes-tizen/efl/efl.inc @@ -351,6 +351,8 @@ DEPENDS += "zlib" DEPENDS += "pulseaudio" DEPENDS += "libexif" DEPENDS += "wayland" +DEPENDS_append_class-native = " fdupes-native" +DEPENDS_append_class-target = " fdupes-native" DEPENDS += "gstreamer1.0" do_prep() { @@ -360,7 +362,6 @@ do_prep() { cp ${S}/packaging/efl.manifest . - } do_patch_append() { bb.build.exec_func('do_prep', d) @@ -376,8 +377,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - CFLAGS+=" -DMESA_EGL_NO_X11_HEADERS " + CFLAGS="${CFLAGS} -DMESA_EGL_NO_X11_HEADERS " autotools_do_configure @@ -386,7 +386,6 @@ do_compile() { - } EXTRA_OECONF += " --enable-tizen --enable-g-main-loop --disable-xim --disable-scim --disable-gesture --with-tests=regular --enable-wayland --enable-egl --with-opengl=es --enable-tile-rotate --disable-rpath --with-x11=none --enable-tile-rotate --disable-rpath --enable-always-build-examples --enable-systemd --enable-lua-old --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aaa" @@ -408,9 +407,31 @@ do_install() { rm -f ${D}${infodir}/dir find ${D} -regex ".*\.la$" | xargs rm -f -- find ${D} -regex ".*\.a$" | xargs rm -f -- - make datadir=${D}${prefix}/share install-examples + oe_runmake datadir=${D}${prefix}/share install-examples rm -rf ${D}${prefix}/lib/ecore/system/upower + #find_lang efl + + _target=""; + _symlinks=0; + + fdupes -q -n -r ${D} | + 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 + } @@ -758,7 +779,6 @@ evas-dev_files += "${prefix}/lib/cmake/Evas/*.cmake" MANIFESTFILES_evas-dev = "efl.manifest" efl-data_files = "" -efl-data_files += "${prefix}/share/locale/*/*/*.mo" efl-data_files += "${prefix}/include/efl-1/Efl_Config.h" MANIFESTFILES_${PN}-data = "efl.manifest" diff --git a/meta-tizen/recipes-tizen/efl/efl_git.bb b/meta-tizen/recipes-tizen/efl/efl_git.bb index e103c72..247c9e6 100644 --- a/meta-tizen/recipes-tizen/efl/efl_git.bb +++ b/meta-tizen/recipes-tizen/efl/efl_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/efl;tag=78b3840c9c1d8915542145735414d75a2b349ec0;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/efl;tag=16ff2075e5f9622bcae0970f613ec43c556bfbdf;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager-extraconf.inc b/meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager-extraconf.inc index 49b3fe7..458d20d 100644 --- a/meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager-extraconf.inc +++ b/meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager-extraconf.inc @@ -1,29 +1,20 @@ -inherit pkgconfig cmake +inherit pkgconfig +inherit tizen_cmake -INSANE_SKIP_${PN} = "dev-so" - -EXTRA_OECMAKE += " \ - -DUSE_BUILD_LIBS=OFF \ - -DWITH_TESTS=OFF \ - -DWITH_DBUS_WRAPPER=ON \ - -DWITH_NSM=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - " - -cmake_do_install_append() { - - export RPM_BUILD_ROOT=${D} - rm -f ${D}${infodir}/dir +LDFLAGS += "-lpthread" - 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* +do_configure_prepend() { + sed -i 's@PATHS /lib@PATHS ${STAGING_DIR_HOST}/usr/lib@g' ${S}/cmake/FindMURPHY.cmake + sed -i 's@^/usr/include@${STAGING_DIR_HOST}/usr/include@g' ${S}/cmake/FindMURPHY.cmake + + sed -i 's@PATHS "/usr/include/dbus-1.0"@PATHS "${STAGING_DIR_HOST}/usr/include/dbus-1.0"@g' ${S}/cmake/FindDBUS.cmake + sed -i 's@^/usr/lib@${STAGING_DIR_HOST}/usr/lib@g' ${S}/cmake/FindDBUS.cmake + sed -i 's@PATHS "/usr/lib"@NO_DEFAULT_PATH PATHS "${STAGING_DIR_HOST}/usr/lib"@g' ${S}/cmake/FindDBUS.cmake } +INSANE_SKIP_${PN} = "dev-so" + FILES_${PN}-dbg += "${prefix}/lib/audioManager/command/.debug" FILES_${PN}-dbg += "${prefix}/lib/audioManager/control/.debug" FILES_${PN}-dbg += "${prefix}/lib/audioManager/routing/.debug" \ No newline at end of file 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 6cfb863..75286d0 100644 --- a/meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc +++ b/meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager.inc @@ -37,6 +37,8 @@ DEPENDS_append_class-target = " cmake-native" inherit pythonnative DEPENDS += "dbus" DEPENDS += "zlib" +DEPENDS += "common-api-runtime" +DEPENDS += "common-api-dbus-runtime" DEPENDS += "murphy" DEPENDS_append_class-native = " bison-native" DEPENDS_append_class-target = " bison-native" @@ -45,7 +47,7 @@ DEPENDS += "sqlite3" do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} - #setup -q -n genivi-audio-manager-3.2 + #setup -q -n genivi-audio-manager-6.0 } @@ -77,7 +79,7 @@ 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_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=/usr .. #make VERBOSE=1 oe_runmake -j16 diff --git a/meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager_git.bb b/meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager_git.bb index 9d234ea..492e523 100644 --- a/meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager_git.bb +++ b/meta-tizen/recipes-tizen/genivi-audio-manager/genivi-audio-manager_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/genivi/genivi-audio-manager;tag=31b92358be419b8e3127a2d78e7ba08721f03439;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/genivi/genivi-audio-manager;tag=e73abf1288387f6c0d58cde8ac48a1950062294b;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/libgsasl/libgsasl.inc b/meta-tizen/recipes-tizen/libgsasl/libgsasl.inc index 06828bf..ab65c26 100644 --- a/meta-tizen/recipes-tizen/libgsasl/libgsasl.inc +++ b/meta-tizen/recipes-tizen/libgsasl/libgsasl.inc @@ -56,7 +56,7 @@ do_compile() { autotools_do_configure - make -j16 + oe_runmake -j16 @@ -84,6 +84,8 @@ do_install() { find ${D} -regex ".*\.la$" | xargs rm -f -- find ${D} -regex ".*\.a$" | xargs rm -f -- + #find_lang libgsasl + } @@ -111,9 +113,8 @@ libgsasl-dev_files += "${prefix}/lib/pkgconfig/libgsasl.pc" MANIFESTFILES_${PN}-dev = "libgsasl.manifest" libgsasl_files = "" -libgsasl_files += "AUTHORS COPYING COPYING.LIB INSTALL NEWS README THANKS" +libgsasl_files += "AUTHORS NEWS README THANKS" libgsasl_files += "${prefix}/lib/libgsasl.so.*" -libgsasl_files += "${prefix}/share/locale/*/LC_MESSAGES/libgsasl.mo" MANIFESTFILES_${PN} = "libgsasl.manifest" FILES_${PN}-dev = "${libgsasl-dev_files}" diff --git a/meta-tizen/recipes-tizen/libgsasl/libgsasl_git.bb b/meta-tizen/recipes-tizen/libgsasl/libgsasl_git.bb index 1499324..a886f01 100644 --- a/meta-tizen/recipes-tizen/libgsasl/libgsasl_git.bb +++ b/meta-tizen/recipes-tizen/libgsasl/libgsasl_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/libgsasl;tag=2f967f78ec7fd99025a69c21b470e2328b73ea0d;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/libgsasl;tag=edbe0cde3ef2bf4bc1248f053ddcf210fb27f2b3;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/libhangul/libhangul.inc b/meta-tizen/recipes-tizen/libhangul/libhangul.inc index a20734f..f5b8ea3 100644 --- a/meta-tizen/recipes-tizen/libhangul/libhangul.inc +++ b/meta-tizen/recipes-tizen/libhangul/libhangul.inc @@ -73,7 +73,7 @@ do_install() { make DESTDIR=${RPM_BUILD_ROOT} install rm -f ${D}${prefix}/lib/*.la - + #find_lang libhangul } @@ -108,7 +108,6 @@ libhangul_files += "${prefix}/lib/lib*.so.*" libhangul_files += "${prefix}/share/libhangul/hanja/" libhangul_files += "${prefix}/share/libhangul/hanja/hanja.txt" libhangul_files += "${prefix}/bin/hangul" -libhangul_files += "${prefix}/share/locale/ko/LC_MESSAGES/libhangul.mo" MANIFESTFILES_${PN} = "libhangul.manifest" DIRFILES_${PN} = "" DIRFILES_${PN} += "${prefix}/share/libhangul/hanja/" diff --git a/meta-tizen/recipes-tizen/libhangul/libhangul_git.bb b/meta-tizen/recipes-tizen/libhangul/libhangul_git.bb index f49aadd..a63f0b1 100644 --- a/meta-tizen/recipes-tizen/libhangul/libhangul_git.bb +++ b/meta-tizen/recipes-tizen/libhangul/libhangul_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/uifw/libhangul;tag=35a2329d67aeee91547184adc9e78384a85e73c5;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/uifw/libhangul;tag=1f08e8e287b8409e363fe9588fd52de9530a506c;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi_git.bb b/meta-tizen/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi_git.bb index 616cd72..310c343 100644 --- a/meta-tizen/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi_git.bb +++ b/meta-tizen/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi_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/pulseaudio-module-murphy-ivi;tag=1d515e19a11c4eb61324141e026ced7bf02ce89a;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/pulseaudio-module-murphy-ivi;tag=eacc58c41e0ba000c2faa14e60c72ebf02fe258d;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-tizen/recipes-tizen/system-server/system-server-extraconf.inc b/meta-tizen/recipes-tizen/system-server/system-server-extraconf.inc index 3c61be7..7c6ccac 100644 --- a/meta-tizen/recipes-tizen/system-server/system-server-extraconf.inc +++ b/meta-tizen/recipes-tizen/system-server/system-server-extraconf.inc @@ -1,5 +1,2 @@ -FILES_${PN} += "/usr/lib/systemd/system/system-server.service" -FILES_${PN} += "/usr/lib/systemd/system/system-server.socket" - inherit tizen_cmake diff --git a/meta-tizen/recipes-tizen/system-server/system-server.inc b/meta-tizen/recipes-tizen/system-server/system-server.inc index 635db94..3999dc1 100644 --- a/meta-tizen/recipes-tizen/system-server/system-server.inc +++ b/meta-tizen/recipes-tizen/system-server/system-server.inc @@ -175,7 +175,9 @@ do_compile() { -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ - ${EXTRA_OECMAKE} . -DTZ_SYS_ETC=${sysconfdir} + ${EXTRA_OECMAKE} . \ + -DTZ_SYS_ETC=${sysconfdir} \ + -DSYSTEMD_DIR=/lib/systemd/system diff --git a/meta-tizen/recipes-tizen/system-server/system-server_git.bb b/meta-tizen/recipes-tizen/system-server/system-server_git.bb index 722b2a7..c7d44e7 100644 --- a/meta-tizen/recipes-tizen/system-server/system-server_git.bb +++ b/meta-tizen/recipes-tizen/system-server/system-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/system/system-server;tag=458698a096ec94b8e6849179d8438d0e0b2a5503;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/system/system-server;tag=c63f1ea1a039aa5efabab0d427426a92a0e343b4;nobranch=1" BBCLASSEXTEND += " native " -- 2.7.4