From 5f26b009643d8a1a73aecb3aa0b7c5873943e7a1 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 13 Apr 2013 13:49:05 +0200
Subject: yp-tools, ypbind-mt: move systemd support from meta-systemd back to
 meta-networking

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-support/nis/files/domainname.service      | 12 ------------
 .../recipes-support/nis/files/ypbind.service          | 14 --------------
 .../recipes-support/nis/yp-tools_2.12.bbappend        | 19 -------------------
 .../recipes-support/nis/ypbind-mt_1.36.bbappend       | 17 -----------------
 4 files changed, 62 deletions(-)
 delete mode 100644 meta-systemd/meta-networking/recipes-support/nis/files/domainname.service
 delete mode 100644 meta-systemd/meta-networking/recipes-support/nis/files/ypbind.service
 delete mode 100644 meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend
 delete mode 100644 meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend

(limited to 'meta-systemd')

diff --git a/meta-systemd/meta-networking/recipes-support/nis/files/domainname.service b/meta-systemd/meta-networking/recipes-support/nis/files/domainname.service
deleted file mode 100644
index 21aa92cb36..0000000000
--- a/meta-systemd/meta-networking/recipes-support/nis/files/domainname.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NIS Domainname
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/nisdomainname
-ExecStart=/usr/bin/domainname $NISDOMAINNAME
-RemainAfterExit=true
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/meta-systemd/meta-networking/recipes-support/nis/files/ypbind.service b/meta-systemd/meta-networking/recipes-support/nis/files/ypbind.service
deleted file mode 100644
index 1f8df42af5..0000000000
--- a/meta-systemd/meta-networking/recipes-support/nis/files/ypbind.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=YP Bind
-Requires=domainname.service
-After=domainname.service network.target
-Before=systemd-user-sessions.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/ypbind.pid
-ExecStart=/usr/sbin/ypbind
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend b/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend
deleted file mode 100644
index d5ea1ca0b6..0000000000
--- a/meta-systemd/meta-networking/recipes-support/nis/yp-tools_2.12.bbappend
+++ /dev/null
@@ -1,19 +0,0 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 2}"
-
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://domainname.service"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "domainname.service"
-
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/domainname.service ${D}${systemd_unitdir}/system
-}
-
diff --git a/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend b/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend
deleted file mode 100644
index 8f11247a0f..0000000000
--- a/meta-systemd/meta-networking/recipes-support/nis/ypbind-mt_1.36.bbappend
+++ /dev/null
@@ -1,17 +0,0 @@
-inherit systemd
-
-PRINC := "${@int(PRINC) + 2}"
-
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://ypbind.service"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "ypbind.service"
-do_install_append() {
-	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/ypbind.service ${D}${systemd_unitdir}/system
-}
-- 
cgit v1.2.3-54-g00ecf