From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by mail.openembedded.org (Postfix) with ESMTP id E669E6AD1A for ; Thu, 20 Jun 2013 07:49:40 +0000 (UTC) Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1UpZcj-0005bG-NX from Fahad_Usman@mentor.com for openembedded-devel@lists.openembedded.org; Thu, 20 Jun 2013 00:49:41 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 20 Jun 2013 00:49:41 -0700 Received: from [137.202.157.99] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server (TLS) id 14.2.247.3; Thu, 20 Jun 2013 08:49:36 +0100 Message-ID: <51C2B405.4070303@mentor.com> Date: Thu, 20 Jun 2013 12:49:25 +0500 From: "Usman, Fahad" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: Fahad Usman References: <1371544147-10662-1-git-send-email-fahad_usman@mentor.com> In-Reply-To: <1371544147-10662-1-git-send-email-fahad_usman@mentor.com> X-Originating-IP: [137.202.0.76] X-OriginalArrivalTime: 20 Jun 2013 07:49:41.0894 (UTC) FILETIME=[B91D4260:01CE6D8A] Cc: openembedded-devel@lists.openembedded.org Subject: Re: [meta-oe][PATCH] tracker: add new recipe X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jun 2013 07:49:41 -0000 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit On 06/18/2013 01:29 PM, Fahad Usman wrote: > - copy tracker recipe from meta-guacamayo layer to meta-oe > - package files that were not being shipped > - add systemd suppert for tracker > > Signed-off-by: Fahad Usman > --- > meta-oe/recipes-support/tracker/files/90tracker | 4 ++ > .../tracker/files/tracker-dbus.service | 15 +++++ > .../tracker/files/tracker-miner-fs.service | 12 ++++ > .../tracker/files/tracker-store.service | 12 ++++ > ...-Fix-missing-gobject-introspection-checks.patch | 17 ++++++ > .../enable-sqlite-crosscompile.patch | 13 ++++ > .../fix-removable-media-detection.patch | 30 ++++++++++ > meta-oe/recipes-support/tracker/tracker_0.14.2.bb | 70 ++++++++++++++++++++++ > 8 files changed, 173 insertions(+) > create mode 100644 meta-oe/recipes-support/tracker/files/90tracker > create mode 100644 meta-oe/recipes-support/tracker/files/tracker-dbus.service > create mode 100644 meta-oe/recipes-support/tracker/files/tracker-miner-fs.service > create mode 100644 meta-oe/recipes-support/tracker/files/tracker-store.service > create mode 100644 meta-oe/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch > create mode 100644 meta-oe/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch > create mode 100644 meta-oe/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch > create mode 100644 meta-oe/recipes-support/tracker/tracker_0.14.2.bb > > diff --git a/meta-oe/recipes-support/tracker/files/90tracker b/meta-oe/recipes-support/tracker/files/90tracker > new file mode 100644 > index 0000000..9594b91 > --- /dev/null > +++ b/meta-oe/recipes-support/tracker/files/90tracker > @@ -0,0 +1,4 @@ > +#!/bin/sh > + > +/usr/bin/trackerd -m & > + > diff --git a/meta-oe/recipes-support/tracker/files/tracker-dbus.service b/meta-oe/recipes-support/tracker/files/tracker-dbus.service > new file mode 100644 > index 0000000..9d4fb74 > --- /dev/null > +++ b/meta-oe/recipes-support/tracker/files/tracker-dbus.service > @@ -0,0 +1,15 @@ > +[Unit] > +Description=tracker DBus session bus handler > +Before=tracker-store.service > +After=dbus.service > +Requires=dbus.service > +BindTo=tracker-store.service > + > +[Service] > +Type=forking > +EnvironmentFile=-/tmp/tracker.env > +ExecStartPre=/bin/rm -rf /tmp/tracker.env > +ExecStart=/bin/sh -c 'echo "DBUS_SESSION_BUS_ADDRESS=`dbus-daemon --fork --session --print-address`" > /tmp/tracker.env' > + > +[Install] > +WantedBy=multi-user.target > diff --git a/meta-oe/recipes-support/tracker/files/tracker-miner-fs.service b/meta-oe/recipes-support/tracker/files/tracker-miner-fs.service > new file mode 100644 > index 0000000..f143924 > --- /dev/null > +++ b/meta-oe/recipes-support/tracker/files/tracker-miner-fs.service > @@ -0,0 +1,12 @@ > +[Unit] > +Description=tracker-miner-fs > +After=syslog.target local-fs.target udev.service dbus.service tracker-store.service > +Requires=tracker-store.service > + > +[Service] > +Environment=HOME=/home/root > +EnvironmentFile=-/tmp/tracker.env > +ExecStart=/usr/libexec/tracker-miner-fs > + > +[Install] > +WantedBy=multi-user.target > diff --git a/meta-oe/recipes-support/tracker/files/tracker-store.service b/meta-oe/recipes-support/tracker/files/tracker-store.service > new file mode 100644 > index 0000000..7ca9ff0 > --- /dev/null > +++ b/meta-oe/recipes-support/tracker/files/tracker-store.service > @@ -0,0 +1,12 @@ > +[Unit] > +Description=tracker-store > +After=syslog.target local-fs.target dbus.service > +Requires=dbus.service tracker-dbus.service > +BindTo=tracker-dbus.service > + > +[Service] > +EnvironmentFile=-/tmp/tracker.env > +ExecStart=/usr/libexec/tracker-store > + > +[Install] > +WantedBy=multi-user.target > diff --git a/meta-oe/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch b/meta-oe/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch > new file mode 100644 > index 0000000..8701f58 > --- /dev/null > +++ b/meta-oe/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch > @@ -0,0 +1,17 @@ > +diff -Naur ../tracker-0.10.8/configure.ac tracker-0.10.8//configure.ac > +--- ../tracker-0.10.8/configure.ac 2011-04-08 15:03:30.000000000 +0300 > ++++ tracker-0.10.8//configure.ac 2011-04-11 13:47:16.625914002 +0300 > +@@ -218,7 +218,12 @@ > + > + # Needed to generate .gir files, > + # see http://live.gnome.org/GnomeGoals/AddGObjectIntrospectionSupport > +-GOBJECT_INTROSPECTION_CHECK([0.9.5]) > ++#GOBJECT_INTROSPECTION_CHECK([0.9.5]) > ++# Satisfy missing introspection foo > ++AM_CONDITIONAL(HAVE_INTROSPECTION, test "0" == "1") > ++ > ++INTROSPECTION_CFLAGS="" > ++AC_SUBST(INTROSPECTION_CFLAGS) > + > + # NOTE: dbus and dbus-glib-1 are only used now for libtracker-client > + # which is deprecated and tracker-writeback which will be refactored > diff --git a/meta-oe/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch b/meta-oe/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch > new file mode 100644 > index 0000000..5dadda2 > --- /dev/null > +++ b/meta-oe/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch > @@ -0,0 +1,13 @@ > +Index: tracker-0.10.17/m4/sqlite-threadsafe.m4 > +=================================================================== > +--- tracker-0.10.17.orig/m4/sqlite-threadsafe.m4 > ++++ tracker-0.10.17/m4/sqlite-threadsafe.m4 > +@@ -45,7 +45,7 @@ int main () > + ]])], > + [ax_cv_sqlite_threadsafe=yes], > + [ax_cv_sqlite_threadsafe=no], > +- [ax_cv_sqlite_threadsafe=no])]) > ++ [ax_cv_sqlite_threadsafe=yes])]) > + > + LIBS="$save_LIBS" > + ]) > diff --git a/meta-oe/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch b/meta-oe/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch > new file mode 100644 > index 0000000..6c3d9de > --- /dev/null > +++ b/meta-oe/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch > @@ -0,0 +1,30 @@ > +Index: tracker-0.14.2/src/libtracker-miner/tracker-storage.c > +=================================================================== > +--- tracker-0.14.2.orig/src/libtracker-miner/tracker-storage.c 2011-08-03 13:53:16.000000000 +0100 > ++++ tracker-0.14.2/src/libtracker-miner/tracker-storage.c 2012-09-10 08:25:18.322215126 +0100 > +@@ -20,6 +20,7 @@ > + #include "config.h" > + > + #include > ++#include > + > + #include > + #include > +@@ -646,6 +647,17 @@ > + gchar *content_type; > + gboolean is_multimedia; > + gboolean is_blank; > ++ struct stat st; > ++ > ++ /* > ++ * Consider all files under /media to be > ++ * removable unless the file .this-is-root is > ++ * present. > ++ */ > ++ if (!strncmp (mount_path, "/media/", > ++ strlen ("/media/")) && > ++ stat ("/media/.this-is-root", &st)) > ++ is_removable = TRUE; > + > + content_type = mount_guess_content_type (mount, &is_optical, &is_multimedia, &is_blank); > + > diff --git a/meta-oe/recipes-support/tracker/tracker_0.14.2.bb b/meta-oe/recipes-support/tracker/tracker_0.14.2.bb > new file mode 100644 > index 0000000..5838c2d > --- /dev/null > +++ b/meta-oe/recipes-support/tracker/tracker_0.14.2.bb > @@ -0,0 +1,70 @@ > +DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly." > +LICENSE = "GPLv2" > +LIC_FILES_CHKSUM = "file://COPYING;md5=ee31012bf90e7b8c108c69f197f3e3a4" > +DEPENDS = "file gstreamer gamin dbus libexif gettext sqlite3 icu" > +RDEPENDS_${PN} += " gvfs gsettings-desktop-schemas" > +HOMEPAGE = "http://projects.gnome.org/tracker/" > + > +PR = "r7" > + > +inherit autotools pkgconfig gnome gettext gsettings systemd > + > +VER_DIR = "${@gnome_verdir("${PV}")}" > +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${PV}.tar.xz \ > + file://0005-Fix-missing-gobject-introspection-checks.patch \ > + file://enable-sqlite-crosscompile.patch \ > + file://fix-removable-media-detection.patch \ > + file://90tracker \ > + file://tracker-store.service \ > + file://tracker-miner-fs.service \ > + file://tracker-dbus.service \ > + " > + > +SYSTEMD_SERVICE_${PN} = " tracker-store.service tracker-miner-fs.service tracker-dbus.service " > +SYSTEMD_AUTO_ENABLE = "disable" > + > +EXTRA_OECONF += " tracker_cv_have_ioprio=yes --disable-introspection" > + > +# Disable the desktop-centric miners > +EXTRA_OECONF += "--disable-miner-thunderbird --disable-miner-firefox \ > + --disable-miner-evolution --disable-miner-flickr" > + > +LEAD_SONAME = "libtrackerclient.so.0" > + > +do_install_append() { > + cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true > +# install -d ${D}/${sysconfdir}/X11/Xsession.d/ > +# install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/ > + > + install -d ${D}${systemd_unitdir}/system > + install -m 0644 ${WORKDIR}/tracker-store.service ${D}${systemd_unitdir}/system > + install -m 0644 ${WORKDIR}/tracker-miner-fs.service ${D}${systemd_unitdir}/system > + install -m 0644 ${WORKDIR}/tracker-dbus.service ${D}${systemd_unitdir}/system > +} > + > +PACKAGES =+ "${PN}-tests ${PN}-vala ${PN}-nautilus-extension" > + > +FILES_${PN} += "${datadir}/dbus-1/ \ > + ${libdir}/tracker-${VER_DIR}/*.so.* \ > + ${libdir}/tracker-${VER_DIR}/extract-modules/*.so \ > + ${datadir}/icons/hicolor/*/apps/tracker.* \ > + ${libdir}/nautilus/extensions-2.0/*.la \ > + ${datadir}/glib-2.0/schemas/* \ > + ${systemd_unitdir}/system/tracker-store.service \ > + ${systemd_unitdir}/system/tracker-miner-fs.service \ > + ${systemd_unitdir}/system/tracker-dbus.service \ > +" > + > +FILES_${PN}-dev += "${libdir}/tracker-${VER_DIR}/*.la \ > + ${libdir}/tracker-${VER_DIR}/*.so \ > + ${libdir}/tracker-${VER_DIR}/extract-modules/*.la" > + > +FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a" > +FILES_${PN}-dbg += "${libdir}/*/*/.debug \ > + ${libdir}/*/.debug" > +FILES_${PN}-tests = "${datadir}/tracker-tests/" > +FILES_${PN}-vala = "${datadir}/vala/" > +FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so" > + > +SRC_URI[md5sum] = "f3a871beeebf86fd752863ebd22af9ac" > +SRC_URI[sha256sum] = "9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1" kindly merge this patch in dylan branch as well Thanks, Fahad.