From c39daf6e361adb929764f911fdbc583534d44cd4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 13 Apr 2013 13:26:34 +0200 Subject: rpcbind: move bbappend to oe-core subdirectory Signed-off-by: Martin Jansa --- .../recipes-extended/rpcbind/rpcbind/rpcbind.service | 13 ------------- .../recipes-extended/rpcbind/rpcbind_0.2.0.bbappend | 19 ------------------- .../recipes-extended/rpcbind/rpcbind/rpcbind.service | 13 +++++++++++++ .../recipes-extended/rpcbind/rpcbind_0.2.0.bbappend | 19 +++++++++++++++++++ 4 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind/rpcbind.service delete mode 100644 meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend create mode 100644 meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind/rpcbind.service create mode 100644 meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend diff --git a/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind/rpcbind.service b/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind/rpcbind.service deleted file mode 100644 index a028acebe..000000000 --- a/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind/rpcbind.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=RPC Bind -After=network.target -Wants=rpcbind.target -Before=rpcbind.target - -[Service] -Type=forking -ExecStart=/usr/sbin/rpcbind -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend b/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend deleted file mode 100644 index 6586809a2..000000000 --- a/meta-systemd/meta-oe/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend +++ /dev/null @@ -1,19 +0,0 @@ -inherit systemd - -PRINC := "${@int(PRINC) + 2}" - -# look for files in the layer first -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://rpcbind.service" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "rpcbind.service" - -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system -} - diff --git a/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind/rpcbind.service b/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind/rpcbind.service new file mode 100644 index 000000000..a028acebe --- /dev/null +++ b/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind/rpcbind.service @@ -0,0 +1,13 @@ +[Unit] +Description=RPC Bind +After=network.target +Wants=rpcbind.target +Before=rpcbind.target + +[Service] +Type=forking +ExecStart=/usr/sbin/rpcbind +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend b/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend new file mode 100644 index 000000000..6586809a2 --- /dev/null +++ b/meta-systemd/oe-core/recipes-extended/rpcbind/rpcbind_0.2.0.bbappend @@ -0,0 +1,19 @@ +inherit systemd + +PRINC := "${@int(PRINC) + 2}" + +# look for files in the layer first +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://rpcbind.service" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "rpcbind.service" + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system +} + -- cgit v1.2.3-54-g00ecf