diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 14:49:10 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:05 +0200 |
commit | fe76f1ab77c118e077d2c98f405b6b78ad35a124 (patch) | |
tree | c58f86229942a17f87a9c0ec3b2942315b191cad | |
parent | 1e29c4586eaf7af68ec8ea4276114cc6aec05a11 (diff) | |
download | meta-openembedded-fe76f1ab77c118e077d2c98f405b6b78ad35a124.tar.gz |
atftp: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/atftp/atftp/atftpd.service (renamed from meta-systemd/meta-oe/recipes-extended/atftp/atftp/atftpd.service) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-extended/atftp/atftp_git.bb | 19 | ||||
-rw-r--r-- | meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend | 19 |
3 files changed, 17 insertions, 21 deletions
diff --git a/meta-systemd/meta-oe/recipes-extended/atftp/atftp/atftpd.service b/meta-oe/recipes-extended/atftp/atftp/atftpd.service index 480bc702e..480bc702e 100644 --- a/meta-systemd/meta-oe/recipes-extended/atftp/atftp/atftpd.service +++ b/meta-oe/recipes-extended/atftp/atftp/atftpd.service | |||
diff --git a/meta-oe/recipes-extended/atftp/atftp_git.bb b/meta-oe/recipes-extended/atftp/atftp_git.bb index 774dd6884..67a2c1b4c 100644 --- a/meta-oe/recipes-extended/atftp/atftp_git.bb +++ b/meta-oe/recipes-extended/atftp/atftp_git.bb | |||
@@ -4,6 +4,7 @@ HOMEPAGE = "http://packages.debian.org/atftp" | |||
4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f" |
6 | PV = "0.7.1+git${SRCPV}" | 6 | PV = "0.7.1+git${SRCPV}" |
7 | PR = "r3" | ||
7 | 8 | ||
8 | SRCREV = "be3291a18c069ae23a124ffdc56d64a5ff0bbec7" | 9 | SRCREV = "be3291a18c069ae23a124ffdc56d64a5ff0bbec7" |
9 | 10 | ||
@@ -11,10 +12,11 @@ SRC_URI = "git://atftp.git.sourceforge.net/gitroot/atftp/atftp;protocol=git \ | |||
11 | file://atftpd-0.7_circumvent_tftp_size_restrictions.patch \ | 12 | file://atftpd-0.7_circumvent_tftp_size_restrictions.patch \ |
12 | file://atftpd-0.7_unprotected_assignments_crash.patch \ | 13 | file://atftpd-0.7_unprotected_assignments_crash.patch \ |
13 | file://atftpd.init \ | 14 | file://atftpd.init \ |
15 | file://atftpd.service \ | ||
14 | " | 16 | " |
15 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
16 | 18 | ||
17 | inherit autotools update-rc.d useradd | 19 | inherit autotools update-rc.d useradd systemd |
18 | 20 | ||
19 | INITSCRIPT_PACKAGES = "${PN}d" | 21 | INITSCRIPT_PACKAGES = "${PN}d" |
20 | INITSCRIPT_NAME_${PN}d = "atftpd" | 22 | INITSCRIPT_NAME_${PN}d = "atftpd" |
@@ -31,10 +33,23 @@ do_install_append() { | |||
31 | install -d ${D}/srv/tftp | 33 | install -d ${D}/srv/tftp |
32 | 34 | ||
33 | rm ${D}${sbindir}/in.tftpd | 35 | rm ${D}${sbindir}/in.tftpd |
36 | |||
37 | install -d ${D}${systemd_unitdir}/system | ||
38 | install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system | ||
34 | } | 39 | } |
35 | 40 | ||
36 | PACKAGES =+ "atftpd" | 41 | PACKAGES =+ "atftpd" |
37 | 42 | ||
38 | FILES_${PN} = "${bindir}/*" | 43 | FILES_${PN} = "${bindir}/*" |
39 | 44 | ||
40 | FILES_${PN}d = "${sbindir}/* ${sysconfdir}/init.d/* /srv/tftp" | 45 | FILES_${PN}d = "${sbindir}/* \ |
46 | ${sysconfdir}/init.d/* \ | ||
47 | /srv/tftp \ | ||
48 | ${systemd_unitdir}/system/atftpd.service \ | ||
49 | " | ||
50 | |||
51 | SYSTEMD_PACKAGES = "${PN}d" | ||
52 | SYSTEMD_SERVICE_${PN}d = "atftpd.service" | ||
53 | RPROVIDES_${PN}d += "${PN}d-systemd" | ||
54 | RREPLACES_${PN}d += "${PN}d-systemd" | ||
55 | RCONFLICTS_${PN}d += "${PN}d-systemd" | ||
diff --git a/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend b/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend deleted file mode 100644 index ed9cf9dd7..000000000 --- a/meta-systemd/meta-oe/recipes-extended/atftp/atftp_git.bbappend +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | PRINC := "${@int(PRINC) + 2}" | ||
4 | |||
5 | inherit systemd | ||
6 | |||
7 | SRC_URI += "file://atftpd.service" | ||
8 | |||
9 | SYSTEMD_PACKAGES = "${PN}d" | ||
10 | SYSTEMD_SERVICE_${PN}d = "atftpd.service" | ||
11 | FILES_${PN}d += "${systemd_unitdir}/system/atftpd.service" | ||
12 | RPROVIDES_${PN}d += "${PN}d-systemd" | ||
13 | RREPLACES_${PN}d += "${PN}d-systemd" | ||
14 | RCONFLICTS_${PN}d += "${PN}d-systemd" | ||
15 | do_install_append() { | ||
16 | install -d ${D}${systemd_unitdir}/system | ||
17 | install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system | ||
18 | } | ||
19 | |||