From: "Andreas Müller" <schnitzeltony@googlemail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [RFC, meta-oe 26/27] gpsd: move systemd support to meta-systemd
Date: Sun, 10 Jun 2012 23:46:59 +0200 [thread overview]
Message-ID: <1339364820-2880-27-git-send-email-schnitzeltony@googlemail.com> (raw)
In-Reply-To: <1339364820-2880-1-git-send-email-schnitzeltony@googlemail.com>
Note: During build test it was discovered that bluez4 was added to RDEPENDS.
Maybe a conditional DEPENDS on bluez4 should be added for deterministic build
results.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb | 13 ++++---------
meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb | 14 ++++----------
meta-oe/recipes-navigation/gpsd/gpsd_git.bb | 14 ++++----------
.../recipes-navigation/gpsd/gpsd_3.4.bbappend | 14 ++++++++++++++
.../recipes-navigation/gpsd/gpsd_3.5.bbappend | 14 ++++++++++++++
.../recipes-navigation/gpsd/gpsd_git.bbappend | 14 ++++++++++++++
6 files changed, 54 insertions(+), 29 deletions(-)
create mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend
create mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bbappend
create mode 100644 meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_git.bbappend
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
index 4f00cf4..a5c88a4 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native"
PROVIDES = "virtual/gpsd"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
file://0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch \
@@ -21,13 +21,12 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
SRC_URI[md5sum] = "c01353459faa68834309109d4e868460"
SRC_URI[sha256sum] = "79f7de9ead63c7f5d2c9a92e85b5f82e53323c4d451ef8e27ea265ac3ef9a70f"
-inherit scons update-rc.d python-dir systemd
+inherit scons update-rc.d python-dir
INITSCRIPT_NAME = "gpsd"
INITSCRIPT_PARAMS = "defaults 35"
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.socket"
+SYSTEMD_OESCONS ??= "false"
export STAGING_INCDIR
export STAGING_LIBDIR
@@ -37,7 +36,7 @@ EXTRA_OESCONS = " \
libQgpsmm='false' \
debug='true' \
strip='false' \
- systemd='true' \
+ systemd='${SYSTEMD_OESCONS}' \
"
# this cannot be used, because then chrpath is not found and only static lib is built
# target=${HOST_SYS}
@@ -81,10 +80,6 @@ do_install_append() {
install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
- #support for systemd
- install -d ${D}${systemd_unitdir}/system/
- install -m 0644 ${S}/systemd/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
- install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
}
pkg_postinst_${PN}-conf() {
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
index 60b30df..1adc68a 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
DEPENDS = "dbus dbus-glib ncurses python libusb1"
PROVIDES = "virtual/gpsd"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
@@ -22,13 +22,12 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
SRC_URI[md5sum] = "e96881798a0ab67aa3cd5f3249f0e536"
SRC_URI[sha256sum] = "5ebb0b00c49421eb8fbead81342e5ce63e82065e5ff27da586f10e342b999171"
-inherit scons update-rc.d python-dir systemd
+inherit scons update-rc.d python-dir
INITSCRIPT_NAME = "gpsd"
INITSCRIPT_PARAMS = "defaults 35"
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.socket"
+SYSTEMD_OESCONS ??= "false"
export STAGING_INCDIR
export STAGING_LIBDIR
@@ -38,7 +37,7 @@ EXTRA_OESCONS = " \
libQgpsmm='false' \
debug='true' \
strip='false' \
- systemd='true' \
+ systemd='${SYSTEMD_OESCONS}' \
"
# this cannot be used, because then chrpath is not found and only static lib is built
# target=${HOST_SYS}
@@ -81,11 +80,6 @@ do_install_append() {
#support for python
install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
-
- #support for systemd
- install -d ${D}${systemd_unitdir}/system/
- install -m 0644 ${S}/systemd/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
- install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
}
pkg_postinst_${PN}-conf() {
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
index 0cf0685..1c7d76f 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
DEPENDS = "dbus dbus-glib ncurses python libusb1"
PROVIDES = "virtual/gpsd"
-PR = "r1"
+PR = "r2"
SRCREV = "f8744f4af8cef211de698df5d8e6caddfe33f29d"
@@ -25,13 +25,12 @@ SRC_URI = "git://git.sv.gnu.org/gpsd.git;protocol=git;branch=master \
"
S = "${WORKDIR}/git"
-inherit scons update-rc.d python-dir systemd
+inherit scons update-rc.d python-dir
INITSCRIPT_NAME = "gpsd"
INITSCRIPT_PARAMS = "defaults 35"
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.socket"
+SYSTEMD_OESCONS ??= "false"
export STAGING_INCDIR
export STAGING_LIBDIR
@@ -41,7 +40,7 @@ EXTRA_OESCONS = " \
libQgpsmm='false' \
debug='true' \
strip='false' \
- systemd='true' \
+ systemd='${SYSTEMD_OESCONS}' \
"
# this cannot be used, because then chrpath is not found and only static lib is built
# target=${HOST_SYS}
@@ -84,11 +83,6 @@ do_install_append() {
#support for python
install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps
-
- #support for systemd
- install -d ${D}${systemd_unitdir}/system/
- install -m 0644 ${S}/systemd/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
- install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
}
pkg_postinst_${PN}-conf() {
diff --git a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend
new file mode 100644
index 0000000..1026e22
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bbappend
@@ -0,0 +1,14 @@
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.socket"
+SYSTEMD_OESCONS = "true"
+
+do_install_append() {
+ #support for systemd
+ install -d ${D}${systemd_unitdir}/system/
+ install -m 0644 ${S}/systemd/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
+ install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
+}
diff --git a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bbappend b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bbappend
new file mode 100644
index 0000000..1026e22
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bbappend
@@ -0,0 +1,14 @@
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.socket"
+SYSTEMD_OESCONS = "true"
+
+do_install_append() {
+ #support for systemd
+ install -d ${D}${systemd_unitdir}/system/
+ install -m 0644 ${S}/systemd/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
+ install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
+}
diff --git a/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_git.bbappend b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_git.bbappend
new file mode 100644
index 0000000..1026e22
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-navigation/gpsd/gpsd_git.bbappend
@@ -0,0 +1,14 @@
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.socket"
+SYSTEMD_OESCONS = "true"
+
+do_install_append() {
+ #support for systemd
+ install -d ${D}${systemd_unitdir}/system/
+ install -m 0644 ${S}/systemd/${PN}.service ${D}${systemd_unitdir}/system/${PN}.service
+ install -m 0644 ${S}/systemd/${PN}.socket ${D}${systemd_unitdir}/system/${PN}.socket
+}
--
1.7.4.4
next prev parent reply other threads:[~2012-06-10 21:52 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-10 21:46 [RFC, meta-oe 00/27] transit to meta-systemd (cover-letter-only) Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 01/27] systemd.bbclass: move to meta-systemd Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 02/27] move systemd recipes " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 03/27] layer.conf/README: search directory structure for bbappends changed Andreas Müller
2012-06-10 23:12 ` Khem Raj
2012-06-11 8:52 ` Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 04/27] polkit: meta-systemd rework Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 05/27] gdm: move systemd support to meta-systemd Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 06/27] busybox: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 07/27] ntp: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 08/27] syslog-ng: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 09/27] udisks: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 10/27] lighttpd: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 11/27] cronie: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 12/27] elsa: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 13/27] net-snmp: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 14/27] atftp: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 15/27] dhcp: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 16/27] connman: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 17/27] gateone: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 18/27] cherokee: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 19/27] openssh: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 20/27] cloud9: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 21/27] xinput-calibrator: : " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 22/27] xserver-nodm-init: " Andreas Müller
2012-06-21 7:35 ` [RFC, meta-oe 22/27 v2] " Martin Jansa
2012-06-21 18:00 ` Koen Kooi
2012-06-21 18:10 ` Martin Jansa
2012-06-21 18:30 ` Andreas Müller
2012-06-21 19:02 ` Martin Jansa
2012-06-21 19:04 ` Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 23/27] dropbear: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 24/27] keymaps: " Andreas Müller
2012-06-10 21:46 ` [RFC, meta-oe 25/27] rsyslog: " Andreas Müller
2012-06-10 21:46 ` Andreas Müller [this message]
2012-06-10 21:47 ` [RFC, meta-oe 27/27] networkmanager: " Andreas Müller
2012-06-16 17:16 ` [RFC, meta-oe 00/27] transit to meta-systemd (cover-letter-only) Martin Jansa
2012-06-16 17:47 ` Martin Jansa
2012-06-16 17:59 ` Martin Jansa
2012-07-02 21:32 ` Paul Eggleton
2012-07-03 7:21 ` Andreas Müller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339364820-2880-27-git-send-email-schnitzeltony@googlemail.com \
--to=schnitzeltony@googlemail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.