Patchwork [meta-oe,V2,19/32] atftp: move systemd support to meta-systemd

login
mail settings
Submitter Andreas Müller
Date July 13, 2012, 8:30 a.m.
Message ID <1342168240-7760-20-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/31879/
State Accepted
Headers show

Comments

Andreas Müller - July 13, 2012, 8:30 a.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta-oe/recipes-extended/atftp/atftp_0.7.bb        |   10 +++-------
 .../recipes-extended/atftp/atftp}/atftpd.service   |    0
 .../recipes-extended/atftp/atftp_0.7.bbappend      |   10 ++++++++++
 3 files changed, 13 insertions(+), 7 deletions(-)
 rename {meta-oe/recipes-extended/atftp/files => meta-systemd/meta-oe/recipes-extended/atftp/atftp}/atftpd.service (100%)
 create mode 100644 meta-systemd/meta-oe/recipes-extended/atftp/atftp_0.7.bbappend

Patch

diff --git a/meta-oe/recipes-extended/atftp/atftp_0.7.bb b/meta-oe/recipes-extended/atftp/atftp_0.7.bb
index 1af4b63..ff1e11d 100644
--- a/meta-oe/recipes-extended/atftp/atftp_0.7.bb
+++ b/meta-oe/recipes-extended/atftp/atftp_0.7.bb
@@ -3,19 +3,15 @@  SECTION = "network"
 HOMEPAGE = "http://packages.debian.org/atftp"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg.orig.tar.gz;name=archive \
            ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg-11.diff.gz;name=patch \
-           file://atftpd.init \
-           file://atftpd.service"
+           file://atftpd.init"
 
 S = "${WORKDIR}/atftp-${PV}.dfsg"
 
-inherit autotools update-rc.d systemd useradd
-
-SYSTEMD_PACKAGES = "atftpd-systemd"
-SYSTEMD_SERVICE_atftpd-systemd = "atftpd.service"
+inherit autotools update-rc.d useradd
 
 INITSCRIPT_PACKAGES = "${PN}d"
 INITSCRIPT_NAME_${PN}d = "atftpd"
diff --git a/meta-oe/recipes-extended/atftp/files/atftpd.service b/meta-systemd/meta-oe/recipes-extended/atftp/atftp/atftpd.service
similarity index 100%
rename from meta-oe/recipes-extended/atftp/files/atftpd.service
rename to meta-systemd/meta-oe/recipes-extended/atftp/atftp/atftpd.service
diff --git a/meta-systemd/meta-oe/recipes-extended/atftp/atftp_0.7.bbappend b/meta-systemd/meta-oe/recipes-extended/atftp/atftp_0.7.bbappend
new file mode 100644
index 0000000..3706d9f
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-extended/atftp/atftp_0.7.bbappend
@@ -0,0 +1,10 @@ 
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SRC_URI += "file://atftpd.service"
+
+SYSTEMD_PACKAGES = "atftpd-systemd"
+SYSTEMD_SERVICE_atftpd-systemd = "atftpd.service"