From ed84e64d22400595b68da4e75b48ab7ecc342aa9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 11 Jun 2013 18:44:22 +0200 Subject: openssh: Rename bbappend to match new version from oe-core Signed-off-by: Martin Jansa --- .../openssh/openssh_6.2p1.bbappend | 21 --------------------- .../openssh/openssh_6.2p2.bbappend | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 21 deletions(-) delete mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p1.bbappend create mode 100644 meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p2.bbappend (limited to 'meta-systemd') diff --git a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p1.bbappend b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p1.bbappend deleted file mode 100644 index 4789ad06fe..0000000000 --- a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p1.bbappend +++ /dev/null @@ -1,21 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PRINC := "${@int(PRINC) + 3}" - -SYSTEMD_PACKAGES = "${PN}-sshd" -SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket" -FILES_${PN}-sshd += "${systemd_unitdir}/system/sshd.socket" -RPROVIDES_${PN}-sshd += "${PN}-sshd-systemd" -RREPLACES_${PN}-sshd += "${PN}-sshd-systemd" -RCONFLICTS_${PN}-sshd += "${PN}-sshd-systemd" - -inherit systemd - -SRC_URI += "file://sshd.socket file://sshd@.service file://sshdgenkeys.service" -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system -} - diff --git a/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p2.bbappend b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p2.bbappend new file mode 100644 index 0000000000..d9ad9ba2a5 --- /dev/null +++ b/meta-systemd/oe-core/recipes-connectivity/openssh/openssh_6.2p2.bbappend @@ -0,0 +1,19 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SYSTEMD_PACKAGES = "${PN}-sshd" +SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket" +FILES_${PN}-sshd += "${systemd_unitdir}/system/sshd.socket" +RPROVIDES_${PN}-sshd += "${PN}-sshd-systemd" +RREPLACES_${PN}-sshd += "${PN}-sshd-systemd" +RCONFLICTS_${PN}-sshd += "${PN}-sshd-systemd" + +inherit systemd + +SRC_URI += "file://sshd.socket file://sshd@.service file://sshdgenkeys.service" +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/sshd.socket ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/sshd@.service ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/sshdgenkeys.service ${D}${systemd_unitdir}/system +} + -- cgit 1.2.3-korg