Patchwork [meta-oe,v2] 19/22] gpsd: remove unneeded systemd code

login
register
mail settings
Submitter Andreas Müller
Date Feb. 16, 2012, 2:03 a.m.
Message ID <1329357796-27398-20-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/21333/
State Superseded, archived
Headers show

Comments

Andreas Müller - Feb. 16, 2012, 2:03 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)
Otavio Salvador - Feb. 16, 2012, 10:09 a.m.
Acked-by: Otavio Salvador <otavio@ossystems.com.br>

On Thu, Feb 16, 2012 at 00:03, Andreas Müller
<schnitzeltony@googlemail.com>wrote:

> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb |   12 ++----------
>  1 files changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bbb/meta-oe/recipes-navigation/gpsd/
> gpsd_2.96.bb
> index ce2ab02..927107a 100644
> --- a/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb
> +++ b/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb
> @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM =
> "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
>  DEPENDS = "dbus-glib ncurses python libusb1"
>  PROVIDES = "virtual/gpsd"
>
> -PR = "r1"
> +PR = "r2"
>
>  EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
>                 --x-libraries=${STAGING_LIBDIR} \
> @@ -68,11 +68,6 @@ do_install_append() {
>     install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/
>     install -d ${D}${base_libdir}/udev/
>     install -m 0755 ${S}/gpsd.hotplug.wrapper ${D}${base_libdir}/udev/
> -
> -    #support for systemd
> -    install -d ${D}${base_libdir}/systemd/system
> -    install -m 644 ${WORKDIR}/${PN}.socket
> ${D}${base_libdir}/systemd/system
> -    install -m 644 ${WORKDIR}/${PN}.service
> ${D}${base_libdir}/systemd/system
>  }
>
>  pkg_postinst_${PN}-conf() {
> @@ -83,7 +78,7 @@ pkg_postrm_${PN}-conf() {
>        update-alternatives --remove gpsd-defaults
> ${sysconfdir}/default/gpsd.default
>  }
>
> -PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev
> gpsd-conf gpsd-gpsctl gps-utils ${PN}-systemd"
> +PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev
> gpsd-conf gpsd-gpsctl gps-utils"
>
>  FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug"
>
> @@ -113,6 +108,3 @@ RDEPENDS_gps-utils = "python-pygps"
>  DESCRIPTION_python-pygps = "Python bindings to gpsd"
>  FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*"
>  RDEPENDS_python-pygps = "python-core python-curses gpsd python-json"
> -
> -FILES_${PN}-systemd += "${base_libdir}/systemd"
> -RDEPENDS_${PN}-systemd += "${PN}"
> --
> 1.7.4.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Patch

diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb b/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb
index ce2ab02..927107a 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb
@@ -5,7 +5,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus-glib ncurses python libusb1"
 PROVIDES = "virtual/gpsd"
 
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
                 --x-libraries=${STAGING_LIBDIR} \
@@ -68,11 +68,6 @@  do_install_append() {
     install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/
     install -d ${D}${base_libdir}/udev/
     install -m 0755 ${S}/gpsd.hotplug.wrapper ${D}${base_libdir}/udev/
-
-    #support for systemd
-    install -d ${D}${base_libdir}/systemd/system
-    install -m 644 ${WORKDIR}/${PN}.socket ${D}${base_libdir}/systemd/system
-    install -m 644 ${WORKDIR}/${PN}.service ${D}${base_libdir}/systemd/system
 }
 
 pkg_postinst_${PN}-conf() {
@@ -83,7 +78,7 @@  pkg_postrm_${PN}-conf() {
 	update-alternatives --remove gpsd-defaults ${sysconfdir}/default/gpsd.default	
 }
 
-PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils ${PN}-systemd"
+PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils"
 
 FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug"
 
@@ -113,6 +108,3 @@  RDEPENDS_gps-utils = "python-pygps"
 DESCRIPTION_python-pygps = "Python bindings to gpsd"
 FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*"
 RDEPENDS_python-pygps = "python-core python-curses gpsd python-json"
-
-FILES_${PN}-systemd += "${base_libdir}/systemd"
-RDEPENDS_${PN}-systemd += "${PN}"