From: Kévin THIERRY Date: Fri, 26 Sep 2014 07:30:11 +0000 (+0200) Subject: Remove "inherit pkgconfig" in extraconf files X-Git-Tag: ivi_rev_0.2~21 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3614c05a23d3b5cba6523315f1767dacd5c3f6f7;p=scm%2Fbb%2Fmeta-tizen.git Remove "inherit pkgconfig" in extraconf files "inherit pkgconfig" is now automatically added in the generated recipes. Also update recipes. Change-Id: I351203294269063435f65665c2ec6076f338e04d Signed-off-by: Kévin THIERRY --- diff --git a/recipes-tizen/Modello-Dashboard/Modello-Dashboard_git.bb b/recipes-tizen/Modello-Dashboard/Modello-Dashboard_git.bb index d5ecd2d..58d848e 100644 --- a/recipes-tizen/Modello-Dashboard/Modello-Dashboard_git.bb +++ b/recipes-tizen/Modello-Dashboard/Modello-Dashboard_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_Dashboard;tag=84072ca1ad946e2dab57404c96b7b16f32526f3a;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Dashboard;tag=8422877a0bc43f97743cd99e960a707b87625cfd;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer_git.bb b/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer_git.bb index 202638c..35837b3 100644 --- a/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer_git.bb +++ b/recipes-tizen/Modello-Multimediaplayer/Modello-Multimediaplayer_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_Multimediaplayer;tag=c4bb6a9773f27415adb1d7bd255f2ab5ac549434;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Multimediaplayer;tag=75e18c4aaa730a5e5de933c978edabfc9591497b;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/Modello-Nav/Modello-Nav_git.bb b/recipes-tizen/Modello-Nav/Modello-Nav_git.bb index 61bc629..4cbe456 100644 --- a/recipes-tizen/Modello-Nav/Modello-Nav_git.bb +++ b/recipes-tizen/Modello-Nav/Modello-Nav_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_Nav;tag=89e7e7adcec485b1ffc8da33d2fbcded50b3df3c;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Nav;tag=bfaedf923c5f3b9997033419ccb8021173d4c728;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/Modello-Phone/Modello-Phone_git.bb b/recipes-tizen/Modello-Phone/Modello-Phone_git.bb index c443868..7a6a6d8 100644 --- a/recipes-tizen/Modello-Phone/Modello-Phone_git.bb +++ b/recipes-tizen/Modello-Phone/Modello-Phone_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_Phone;tag=2aae49875dba76afbefac8b76d6ce505f94be9ab;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_Phone;tag=c0506d3ef282ce32e2aeff1b00887ca2ff1a7feb;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/Modello-SDL/Modello-SDL_git.bb b/recipes-tizen/Modello-SDL/Modello-SDL_git.bb index adefce2..5fd570b 100644 --- a/recipes-tizen/Modello-SDL/Modello-SDL_git.bb +++ b/recipes-tizen/Modello-SDL/Modello-SDL_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_SDL;tag=ca736df169a33e30e7bdb2a7b37307a67d3d7ba7;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/Modello_SDL;tag=8c233b3ab7d8d27fa20777594ba05b6ff433ebcd;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2-extraconf.inc b/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2-extraconf.inc index dfd2f55..6fcb7c3 100644 --- a/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2-extraconf.inc +++ b/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2-extraconf.inc @@ -1,5 +1,3 @@ -inherit pkgconfig - do_compile() { cd ${S} LANG=C diff --git a/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2.inc b/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2.inc index 84bbf2e..f25bfea 100644 --- a/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2.inc +++ b/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2.inc @@ -1,7 +1,7 @@ DESCRIPTION = "ALSA Scenario pkg" HOMEPAGE = "http://nohomepage.org" -SECTION = "Multimedia/Audio" -LICENSE = "LGPLv2+" +SECTION = "Multimedia/Audio FW" +LICENSE = "LGPL-2.0+" SRC_URI = "" @@ -24,16 +24,19 @@ RDEPENDS = "" #RDEPENDS of alsa-scenario-dev (alsa-scenario-dev) RDEPENDS_alsa-scenario-dev += "alsa-scenario" +#RDEPENDS of alsa-scenario (alsa-scenario) +RDEPENDS_alsa-scenario += "eglibc" + DEPENDS = "" #DEPENDS of alsa-scenario DEPENDS += "alsa-lib" +inherit pkgconfig do_prep() { cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} #setup -q - cp ${S}/packaging/alsa-scenario.manifest . @@ -52,11 +55,12 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - cp -f /usr/share/libtool/config/config.guess ${WORKDIR}/alsa-scenario-0.2.1/ - cp -f /usr/share/libtool/config/config.sub ${WORKDIR}/alsa-scenario-0.2.1/ + cp ${S}/packaging/alsa-scenario.manifest . + cp -f ${prefix}/share/libtool/config/config.guess ${WORKDIR}/alsa-scenario-0.2.1/ + cp -f ${prefix}/share/libtool/config/config.sub ${WORKDIR}/alsa-scenario-0.2.1/ autotools_do_configure - make -j16 + oe_runmake -j16 @@ -72,6 +76,7 @@ do_install() { rm -rf ${D} mkdir -p ${D} + rm -rf ${D} oe_runmake \ DESTDIR=${D} \ @@ -83,6 +88,7 @@ do_install() { find ${D} -regex ".*\.a$" | xargs rm -f -- + } pkg_postinst_${PN}() { @@ -105,11 +111,9 @@ alsa-scenario-dev_files = "" alsa-scenario-dev_files += "${prefix}/include/alsa/*.h" alsa-scenario-dev_files += "${prefix}/lib/libascenario.so" alsa-scenario-dev_files += "${prefix}/lib/pkgconfig/libascenario.pc" -MANIFESTFILES_alsa-scenario-dev = "alsa-scenario.manifest" alsa-scenario_files = "" alsa-scenario_files += "${prefix}/lib/libascenario-0.2.so.*" -MANIFESTFILES_alsa-scenario = "alsa-scenario.manifest" FILES_alsa-scenario-dev = "${alsa-scenario-dev_files}" FILES_alsa-scenario = "${alsa-scenario_files}" diff --git a/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2_git.bb b/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2_git.bb index 7177dc4..ab4c540 100644 --- a/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2_git.bb +++ b/recipes-tizen/alsa-scenario-0.2/alsa-scenario-0.2_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/multimedia/alsa-scenario-0.2;tag=8a7abb902764c6afdd4c3fab4d0ac29716117207;nobranch=1" +SRC_URI += "git://review.tizen.org/framework/multimedia/alsa-scenario-0.2;tag=b32d188303681bc9a441edc464e60b62de51ae0e;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/avsystem/avsystem-extraconf.inc b/recipes-tizen/avsystem/avsystem-extraconf.inc index 7586638..0b3f5d2 100644 --- a/recipes-tizen/avsystem/avsystem-extraconf.inc +++ b/recipes-tizen/avsystem/avsystem-extraconf.inc @@ -1,8 +1,6 @@ SRC_URI += "file://add-subdir-objects-option.patch" SRC_URI += "file://add-PA_PROP_MEDIA_POLICY-Define.patch" -inherit pkgconfig - avsystem-dbg_files += "${prefix}/local/bin/.debug" avsystem-dbg_files += "${prefix}/local/bin/.debug/*" avsystem-dbg_files += "${prefix}/lib/.debug/*.so.*" diff --git a/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime.inc b/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime.inc index d2cf27b..06cc835 100644 --- a/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime.inc +++ b/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime.inc @@ -35,8 +35,9 @@ RDEPENDS_CommonAPI-DBus-dev += "libCommonAPI-DBus" DEPENDS = "" #DEPENDS of CommonAPI-DBus DEPENDS += "dbus" -DEPENDS += "common-api-runtime" DEPENDS += "glib-2.0" +inherit pkgconfig +DEPENDS += "common-api-runtime" do_prep() { cd ${S} @@ -62,7 +63,7 @@ do_compile() { autoreconf -i autotools_do_configure - make -j16 + oe_runmake -j16 diff --git a/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime_git.bb b/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime_git.bb index 547160f..7aa41d2 100644 --- a/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime_git.bb +++ b/recipes-tizen/common-api-dbus-runtime/common-api-dbus-runtime_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/common-api-dbus-runtime;tag=f5383391b93eaa4640494f87bbadeb7ad97504a9;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/common-api-dbus-runtime;tag=a1dd3cf92c548e65b3a8bd2b83f35902a5450a6d;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/dbus-python/dbus-python-extraconf.inc b/recipes-tizen/dbus-python/dbus-python-extraconf.inc index ad06b02..51d75bc 100644 --- a/recipes-tizen/dbus-python/dbus-python-extraconf.inc +++ b/recipes-tizen/dbus-python/dbus-python-extraconf.inc @@ -1,5 +1,3 @@ -inherit pkgconfig - PROVIDES += "python-dbus" RPROVIDES_${PN} += "python-dbus" diff --git a/recipes-tizen/dbus-python/dbus-python.inc b/recipes-tizen/dbus-python/dbus-python.inc index a71b1ed..0f8a21c 100644 --- a/recipes-tizen/dbus-python/dbus-python.inc +++ b/recipes-tizen/dbus-python/dbus-python.inc @@ -21,13 +21,10 @@ PROVIDES += "dbus-python-dev" RDEPENDS = "" #RDEPENDS of dbus-python-dev (${PN}-dev) -RDEPENDS_${PN}-dev += "dbus" RDEPENDS_${PN}-dev += "dbus-python" #RDEPENDS of dbus-python (${PN}) RDEPENDS_${PN} += "python-xml" -RDEPENDS_${PN} += "dbus" -RDEPENDS_${PN} += "libxml2-python" DEPENDS = "" @@ -36,6 +33,7 @@ inherit pythonnative DEPENDS += "dbus" DEPENDS_append_class-native = " fdupes-native" DEPENDS_append_class-target = " fdupes-native" +inherit pkgconfig DEPENDS += "dbus-glib" do_prep() { @@ -63,7 +61,8 @@ do_compile() { export CFLAGS="$CFLAGS -fstack-protector -fno-strict-aliasing -fPIC" autotools_do_configure - make -j16 + oe_runmake -j16 + @@ -123,6 +122,7 @@ do_install() { done + } PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" diff --git a/recipes-tizen/dbus-python/dbus-python_git.bb b/recipes-tizen/dbus-python/dbus-python_git.bb index 745c52b..11e3317 100644 --- a/recipes-tizen/dbus-python/dbus-python_git.bb +++ b/recipes-tizen/dbus-python/dbus-python_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/dbus-python;tag=0910bc53d2965584e7305b4f32158fa56af6197f;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/dbus-python;tag=a8f0e5c73d4bbf6068a598971ad24135a881fab9;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/dlog/dlog.inc b/recipes-tizen/dlog/dlog.inc index fcc5fec..db018f2 100644 --- a/recipes-tizen/dlog/dlog.inc +++ b/recipes-tizen/dlog/dlog.inc @@ -39,6 +39,7 @@ DEPENDS = "" #DEPENDS of dlog DEPENDS += "systemd" DEPENDS += "tizen-platform-config" +inherit pkgconfig do_prep() { cd ${S} diff --git a/recipes-tizen/dlog/dlog_git.bb b/recipes-tizen/dlog/dlog_git.bb index c24ced4..1fcad32 100644 --- a/recipes-tizen/dlog/dlog_git.bb +++ b/recipes-tizen/dlog/dlog_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/dlog;tag=c43bce370f4aaa09f48df4e2c1d2b99f133526d0;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/system/dlog;tag=e64b52e3386dbe906496b2e40640989ca720c8a6;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/edbus/edbus-extraconf.inc b/recipes-tizen/edbus/edbus-extraconf.inc index 15d8a02..e69de29 100644 --- a/recipes-tizen/edbus/edbus-extraconf.inc +++ b/recipes-tizen/edbus/edbus-extraconf.inc @@ -1,2 +0,0 @@ -inherit pkgconfig - diff --git a/recipes-tizen/efl/efl-extraconf.inc b/recipes-tizen/efl/efl-extraconf.inc index 3d70eb2..53d4dd2 100644 --- a/recipes-tizen/efl/efl-extraconf.inc +++ b/recipes-tizen/efl/efl-extraconf.inc @@ -1,5 +1,3 @@ -inherit pkgconfig - INSANE_SKIP_${PN} = "dev-so" EXTRA_OECONF += " \ diff --git a/recipes-tizen/elementary/elementary-extraconf.inc b/recipes-tizen/elementary/elementary-extraconf.inc index e5a1ad5..4b84deb 100644 --- a/recipes-tizen/elementary/elementary-extraconf.inc +++ b/recipes-tizen/elementary/elementary-extraconf.inc @@ -1,5 +1,3 @@ -inherit pkgconfig - SRC_URI += "file://Fix_build.patch" do_configure_prepend() { diff --git a/recipes-tizen/ibus/ibus-extraconf.inc b/recipes-tizen/ibus/ibus-extraconf.inc index adc0055..720dae2 100644 --- a/recipes-tizen/ibus/ibus-extraconf.inc +++ b/recipes-tizen/ibus/ibus-extraconf.inc @@ -1,5 +1,3 @@ -inherit pkgconfig - SRC_URI += " file://Remove_vala_test.patch " DEPENDS_append_class-target = " vala-native " diff --git a/recipes-tizen/libgsignon-glib/libgsignon-glib.inc b/recipes-tizen/libgsignon-glib/libgsignon-glib.inc index 9e885cf..3480230 100644 --- a/recipes-tizen/libgsignon-glib/libgsignon-glib.inc +++ b/recipes-tizen/libgsignon-glib/libgsignon-glib.inc @@ -38,6 +38,7 @@ RDEPENDS_${PN} += "gsignond-plugin-sasl" DEPENDS = "" #DEPENDS of libgsignon-glib DEPENDS += "libcheck" +inherit pkgconfig DEPENDS += "glib-2.0" do_prep() { diff --git a/recipes-tizen/libgsignon-glib/libgsignon-glib_git.bb b/recipes-tizen/libgsignon-glib/libgsignon-glib_git.bb index 4225a03..48db1a6 100644 --- a/recipes-tizen/libgsignon-glib/libgsignon-glib_git.bb +++ b/recipes-tizen/libgsignon-glib/libgsignon-glib_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/libgsignon-glib;tag=4c38ceaa060430023737564f510fb307f2515cf0;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/upstream/libgsignon-glib;tag=09502b1c5ce5f901be78bbae6eea19606252abc0;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/libhangul/libhangul-extraconf.inc b/recipes-tizen/libhangul/libhangul-extraconf.inc index 6128d08..010ee21 100644 --- a/recipes-tizen/libhangul/libhangul-extraconf.inc +++ b/recipes-tizen/libhangul/libhangul-extraconf.inc @@ -1,5 +1,3 @@ -inherit pkgconfig - do_configure_prepend() { # Fix configure error: "error: required file './ABOUT-NLS' not found" sed -i 's/^AM_INIT_AUTOMAKE$/AM_INIT_AUTOMAKE(\[foreign\])/' configure.ac diff --git a/recipes-tizen/libmm-common/libmm-common-extraconf.inc b/recipes-tizen/libmm-common/libmm-common-extraconf.inc index 15d8a02..e69de29 100644 --- a/recipes-tizen/libmm-common/libmm-common-extraconf.inc +++ b/recipes-tizen/libmm-common/libmm-common-extraconf.inc @@ -1,2 +0,0 @@ -inherit pkgconfig - diff --git a/recipes-tizen/libmm-log/libmm-log-extraconf.inc b/recipes-tizen/libmm-log/libmm-log-extraconf.inc index d0ee75a..e69de29 100644 --- a/recipes-tizen/libmm-log/libmm-log-extraconf.inc +++ b/recipes-tizen/libmm-log/libmm-log-extraconf.inc @@ -1 +0,0 @@ -inherit pkgconfig diff --git a/recipes-tizen/libmm-player/libmm-player_git.bb b/recipes-tizen/libmm-player/libmm-player_git.bb index 232f360..4502b32 100644 --- a/recipes-tizen/libmm-player/libmm-player_git.bb +++ b/recipes-tizen/libmm-player/libmm-player_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/multimedia/libmm-player;tag=7a97ce895b719ae4cf99bb0d6ca1715c1f4c265b;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/multimedia/libmm-player;tag=258eeffdd8fb94dbb718231faf4d755a3d036fd7;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/libnet-client/libnet-client-extraconf.inc b/recipes-tizen/libnet-client/libnet-client-extraconf.inc index 2dbb7d6..fc71b53 100644 --- a/recipes-tizen/libnet-client/libnet-client-extraconf.inc +++ b/recipes-tizen/libnet-client/libnet-client-extraconf.inc @@ -1,5 +1,3 @@ -inherit pkgconfig - INSANE_SKIP_${PN} = "dev-so" do_install() { diff --git a/recipes-tizen/libpinyin/libpinyin-extraconf.inc b/recipes-tizen/libpinyin/libpinyin-extraconf.inc index 9b9c23a..c8d6c90 100644 --- a/recipes-tizen/libpinyin/libpinyin-extraconf.inc +++ b/recipes-tizen/libpinyin/libpinyin-extraconf.inc @@ -1,5 +1,3 @@ -inherit pkgconfig - DEPENDS_append_class-target += "libpinyin-native" EXTRA_OEMAKE_class-target += " utils_storage=${STAGING_BINDIR_NATIVE}" diff --git a/recipes-tizen/murphy/murphy-extraconf.inc b/recipes-tizen/murphy/murphy-extraconf.inc index c71b2f3..f4e982d 100644 --- a/recipes-tizen/murphy/murphy-extraconf.inc +++ b/recipes-tizen/murphy/murphy-extraconf.inc @@ -1,3 +1,8 @@ +do_install_append() { + rm -fr ${D}${systemd_unitdir}/user + rm ${D}/usr/lib/libmurphy-plugin-system-monitor* +} + FILES_${PN}-dev += " /usr/include/murphy" FILES_${PN}-dbg += " /usr/lib/murphy/plugins/.debug" @@ -7,8 +12,3 @@ murphy-doc_files += "${prefix}/share/doc/murphy/CODING-STYLE" murphy-doc_files += "${prefix}/share/doc/murphy/ChangeLog" murphy-doc_files += "${prefix}/share/doc/murphy/NEWS" murphy-doc_files += "${prefix}/share/doc/murphy/README" - -do_install_append() { - rm -fr ${D}${systemd_unitdir}/user - rm ${D}/usr/lib/libmurphy-plugin-system-monitor* -} \ No newline at end of file diff --git a/recipes-tizen/node-startup-controller/node-startup-controller.inc b/recipes-tizen/node-startup-controller/node-startup-controller.inc index 081d07e..6e49cce 100644 --- a/recipes-tizen/node-startup-controller/node-startup-controller.inc +++ b/recipes-tizen/node-startup-controller/node-startup-controller.inc @@ -29,8 +29,11 @@ DEPENDS = "" DEPENDS += "systemd" DEPENDS += "dlt-daemon" DEPENDS += "zlib" +inherit pkgconfig DEPENDS += "glib-2.0" DEPENDS += "python-xml" +DEPENDS_append_class-native = " fdupes-native" +DEPENDS_append_class-target = " fdupes-native" DEPENDS += "gtk-doc" do_prep() { @@ -87,6 +90,27 @@ do_install() { find ${D} -regex ".*\.a$" | xargs rm -f -- + _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 + + } PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" diff --git a/recipes-tizen/node-startup-controller/node-startup-controller_git.bb b/recipes-tizen/node-startup-controller/node-startup-controller_git.bb index 60d7455..7195bd0 100644 --- a/recipes-tizen/node-startup-controller/node-startup-controller_git.bb +++ b/recipes-tizen/node-startup-controller/node-startup-controller_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/node-startup-controller;tag=6043da529f31137dd5acee16ab4ae45e8aab64d7;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/node-startup-controller;tag=55ada10dd917375bb5bf57d340b8f0e21271fb21;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/pam/pam-extraconf.inc b/recipes-tizen/pam/pam-extraconf.inc index c50702c..49a5423 100644 --- a/recipes-tizen/pam/pam-extraconf.inc +++ b/recipes-tizen/pam/pam-extraconf.inc @@ -1,54 +1,61 @@ SRC_URI += "file://system-auth" -inherit pkgconfig +INSANE_SKIP_pam-modules-extra = "dev-so" + +PROVIDES += 'libpam' + +RPROVIDES_${PN} += "libpam" +RPROVIDES_${PN} += "libpam-runtime" + +RPROVIDES_${PN}-modules-extra += "pam-plugin-faildelay" +RPROVIDES_${PN}-modules-extra += "pam-plugin-securetty" +RPROVIDES_${PN}-modules-extra += "pam-plugin-nologin" +RPROVIDES_${PN}-modules-extra += "pam-plugin-env" +RPROVIDES_${PN}-modules-extra += "pam-plugin-group" +RPROVIDES_${PN}-modules-extra += "pam-plugin-limits" +RPROVIDES_${PN}-modules-extra += "pam-plugin-lastlog" +RPROVIDES_${PN}-modules-extra += "pam-plugin-motd" +RPROVIDES_${PN}-modules-extra += "pam-plugin-mail" +RPROVIDES_${PN}-modules-extra += "pam-plugin-shells" +RPROVIDES_${PN}-modules-extra += "pam-plugin-rootok" +RPROVIDES_${PN}-modules-extra += "pam-plugin-keyinit" +RPROVIDES_${PN}-modules-extra += "pam-plugin-loginuid" -do_compile() { - cd ${S} - LANG=C - export LANG - unset DISPLAY - LD_AS_NEEDED=1; export LD_AS_NEEDED ; - - - autotools_do_configure - - make CFLAGS="$CFLAGS -lfl -lcrypt" - - - -} EXTRA_OECONF = " --libdir=${prefix}/lib --includedir=${prefix}/include/security --enable-isadir=../..${prefix}/lib/security --disable-audit --with-db-uniquename=_pam --with-libiconv-prefix=/usr --enable-read-both-confs " EXTRA_OECONF += "--disable-nis \ --disable-regenerate-docu \ --disable-prelude" - - PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit," -pam-dev_files += "${prefix}/include/*" +do_compile() { + cd ${S} + LANG=C + export LANG + unset DISPLAY + LD_AS_NEEDED=1; export LD_AS_NEEDED ; + autotools_do_configure + make CFLAGS="$CFLAGS -lfl -lcrypt" +} + +do_install_append() { + install -m 0644 ${WORKDIR}/system-auth ${D}${sysconfdir}/pam.d +} pam_files += "${prefix}/sbin/*" +pam_files += "/var/log" pam-dbg_files += "${prefix}/lib/security/.debug/*" pam-dbg_files += "${prefix}/lib/security/pam_filter/.debug/*" FILES_${PN}-dbg += "${pam-dbg_files}" -INSANE_SKIP_pam-modules-extra = "dev-so" +pam-dev_files += "${prefix}/include/*" pam-dev_files += "${prefix}/lib/security/pam_unix_acct.so" pam-dev_files += "${prefix}/lib/security/pam_unix_auth.so" pam-dev_files += "${prefix}/lib/security/pam_unix_passwd.so" pam-dev_files += "${prefix}/lib/security/pam_unix_session.so" -do_install_append() { -install -m 0644 ${WORKDIR}/system-auth ${D}${sysconfdir}/pam.d - -} - -PROVIDES += 'libpam' -RPROVIDES_${PN} += "libpam" - pam-modules-extra_files = "" pam-modules-extra_files += "pam.manifest" pam-modules-extra_files += "${prefix}/lib/security/pam_access.so" @@ -78,27 +85,10 @@ pam-modules-extra_files += "${prefix}/lib/security/pam_unix_passwd.so" pam-modules-extra_files += "${prefix}/lib/security/pam_unix_session.so" pam-modules-extra_files += "${prefix}/lib/security/pam_warn.so" pam-modules-extra_files += "${prefix}/lib/security/pam_smack.so" - -RPROVIDES_${PN} += "libpam-runtime" -RPROVIDES_${PN}-modules-extra += "pam-plugin-faildelay" -RPROVIDES_${PN}-modules-extra += "pam-plugin-securetty" -RPROVIDES_${PN}-modules-extra += "pam-plugin-nologin" -RPROVIDES_${PN}-modules-extra += "pam-plugin-env" -RPROVIDES_${PN}-modules-extra += "pam-plugin-group" -RPROVIDES_${PN}-modules-extra += "pam-plugin-limits" -RPROVIDES_${PN}-modules-extra += "pam-plugin-lastlog" -RPROVIDES_${PN}-modules-extra += "pam-plugin-motd" -RPROVIDES_${PN}-modules-extra += "pam-plugin-mail" -RPROVIDES_${PN}-modules-extra += "pam-plugin-shells" -RPROVIDES_${PN}-modules-extra += "pam-plugin-rootok" -RPROVIDES_${PN}-modules-extra += "pam-plugin-keyinit" -RPROVIDES_${PN}-modules-extra += "pam-plugin-loginuid" - - -pam_files += "/var/log" +pam-modules-extra_files += "${prefix}/lib/security/pam_cracklib.so" do_install_append() { - mkdir -p $D/var/log + mkdir -p $D/var/log } pkg_postinst_${PN}() { @@ -106,12 +96,11 @@ pkg_postinst_${PN}() { [ "x\$D" == "x" ] && ldconfig if [ ! -a $D/var/log/faillog ] ; then - mkdir -p $D/var/log - /usr/bin/install -m 600 /dev/null $D/var/log/faillog + mkdir -p $D/var/log + /usr/bin/install -m 600 /dev/null $D/var/log/faillog fi if [ ! -a $D/var/log/tallylog ] ; then - mkdir -p $D/var/log - /usr/bin/install -m 600 /dev/null $D/var/log/tallylog + mkdir -p $D/var/log + /usr/bin/install -m 600 /dev/null $D/var/log/tallylog fi - } diff --git a/recipes-tizen/phoned/phoned_git.bb b/recipes-tizen/phoned/phoned_git.bb index 03efae0..bbc9ed2 100644 --- a/recipes-tizen/phoned/phoned_git.bb +++ b/recipes-tizen/phoned/phoned_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/phoned;tag=11632547d96d1b02b8ece75789e420a3d1ca95d3;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/phoned;tag=9bc11b7607090e103bf0f87a83d06f4f637bea46;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/tizen-platform-config/tizen-platform-config.inc b/recipes-tizen/tizen-platform-config/tizen-platform-config.inc index 49d5cfb..ba2b080 100644 --- a/recipes-tizen/tizen-platform-config/tizen-platform-config.inc +++ b/recipes-tizen/tizen-platform-config/tizen-platform-config.inc @@ -74,7 +74,7 @@ do_compile() { } -EXTRA_OECONF += " --enable-static" +EXTRA_OECONF += " --disable-static" do_install() { export RPM_BUILD_ROOT=${D} @@ -93,7 +93,7 @@ do_install() { install rm -f ${D}${infodir}/dir find ${D} -regex ".*\.la$" | xargs rm -f -- - + find ${D} -regex ".*\.a$" | xargs rm -f -- } @@ -122,7 +122,6 @@ libtzplatform-config-dev_files += "${prefix}/lib/*.so" libtzplatform-config-dev_files += "${prefix}/lib/pkgconfig/*.pc" libtzplatform-config-dev_files += "${prefix}/include/*.h" libtzplatform-config-dev_files += "${sysconfdir}/rpm/macros.tizen-platform" -libtzplatform-config-dev_files += "${prefix}/lib/*.a" CONFFILES_libtzplatform-config-dev = "" CONFFILES_libtzplatform-config-dev += "${sysconfdir}/rpm/macros.tizen-platform" MANIFESTFILES_libtzplatform-config-dev = "tizen-platform-config.manifest" diff --git a/recipes-tizen/user-session-units/user-session-units-extraconf.inc b/recipes-tizen/user-session-units/user-session-units-extraconf.inc index 88e49fe..abcd33d 100644 --- a/recipes-tizen/user-session-units/user-session-units-extraconf.inc +++ b/recipes-tizen/user-session-units/user-session-units-extraconf.inc @@ -1,7 +1,5 @@ FILESEXTRAPATHS_append := "${THISDIR}/user-session-units" -inherit pkgconfig - do_install_append() { rm -f ${D}${systemd_unitdir}/user/dbus.socket diff --git a/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension-extraconf.inc b/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension-extraconf.inc index 98d150f..8b7aa70 100644 --- a/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension-extraconf.inc +++ b/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension-extraconf.inc @@ -1,26 +1,23 @@ +RPROVIDES_genivi-shell += "wayland-ivi-extension" + DEPENDS += "wayland-native" DEPENDS += "weston-ivi-shell" -RPROVIDES_genivi-shell += "wayland-ivi-extension" +INSANE_SKIP_genivi-shell-dev = "staticdev" +B="${S}" do_prep() { - cd ${S} chmod -Rf a+rX,u+w,g-w,o-w ${S} cp ${S}/packaging/genivi-shell.manifest . - sed -i "s@\${LIBS} \${WESTON_LIBDIR}/weston/ivi-shell.so@\${LIBS} ${PKG_CONFIG_SYSROOT_DIR}\${WESTON_LIBDIR}/weston/ivi-shell.so@g" ${S}/weston-ivi-shell/CMakeLists.txt -} - -cmake_do_configure_prepend() { ${STAGING_BINDIR_NATIVE}/wayland-scanner code < protocol/ivi-controller.xml > protocol/ivi-controller-protocol.c + sed -i "s@\${LIBS} \${WESTON_LIBDIR}/weston/ivi-shell.so@\${LIBS} ${PKG_CONFIG_SYSROOT_DIR}\${WESTON_LIBDIR}/weston/ivi-shell.so@g" ${S}/weston-ivi-shell/CMakeLists.txt } PACKAGES += " genivi-shell-dbg " FILES_genivi-shell-dbg = "${prefix}/lib/weston/.debug/ivi-controller.so" -B="${S}" - -FILES_genivi-shell += "${prefix}/bin/IVISurfaceCreator" \ No newline at end of file +FILES_genivi-shell += "${prefix}/bin/IVISurfaceCreator" diff --git a/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc b/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc index 81eb79b..d8e357d 100644 --- a/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc +++ b/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension.inc @@ -31,6 +31,7 @@ DEPENDS = "" inherit tizen_cmake DEPENDS += "libxkbcommon" DEPENDS += "cairo" +inherit pkgconfig DEPENDS += "weston-ivi-shell" DEPENDS += "weston" DEPENDS += "wayland" @@ -45,6 +46,23 @@ do_prep() { /usr/bin/wayland-scanner code < protocol/ivi-controller.xml \ > protocol/ivi-controller-protocol.c + +} +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 ; + + cat ivi-extension-protocol.pc.in \ | sed s\#@libdir@\#${prefix}/lib\#g \ | sed s\#@includedir@\#${prefix}/include/genivi-shell\#g \ @@ -66,24 +84,7 @@ do_prep() { -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ ${EXTRA_OECMAKE} . - -} -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 ; - - - make -j16 V=1 + oe_runmake -j16 V=1 diff --git a/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension_git.bb b/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension_git.bb index 7855e68..b97c42c 100644 --- a/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension_git.bb +++ b/recipes-tizen/wayland-ivi-extension/wayland-ivi-extension_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/wayland-ivi-extension;tag=acce51eebfa69c51d2a7f6cc739ec4899055350b;nobranch=1" +SRC_URI += "git://review.tizen.org/profile/ivi/wayland-ivi-extension;tag=38accb3b08d2e4c0f4669aaca658470d56a97bd2;nobranch=1" BBCLASSEXTEND += " native " diff --git a/recipes-tizen/weekeyboard/weekeyboard-extraconf.inc b/recipes-tizen/weekeyboard/weekeyboard-extraconf.inc index 40ac5ce..528f1a7 100644 --- a/recipes-tizen/weekeyboard/weekeyboard-extraconf.inc +++ b/recipes-tizen/weekeyboard/weekeyboard-extraconf.inc @@ -1,4 +1,2 @@ -inherit pkgconfig - EXTRA_OECONF += " --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc "