From 1e6cf9483d41cf8033ada4fd15a07bb4d85aa724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 10 Jun 2012 21:46:48 +0000 Subject: [PATCH] dhcp: move systemd support to meta-systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../meta-oe/recipes-connectivity/dhcp/dhcp}/dhcpd.service | 0 .../meta-oe/recipes-connectivity/dhcp/dhcp}/dhcrelay.service | 0 .../meta-oe}/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename {meta-oe/recipes-connectivity/dhcp/files => meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp}/dhcpd.service (100%) rename {meta-oe/recipes-connectivity/dhcp/files => meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp}/dhcrelay.service (100%) rename {meta-oe => meta-systemd/meta-oe}/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend (79%) diff --git a/meta-oe/recipes-connectivity/dhcp/files/dhcpd.service b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcpd.service similarity index 100% rename from meta-oe/recipes-connectivity/dhcp/files/dhcpd.service rename to meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcpd.service diff --git a/meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcrelay.service similarity index 100% rename from meta-oe/recipes-connectivity/dhcp/files/dhcrelay.service rename to meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp/dhcrelay.service diff --git a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend similarity index 79% rename from meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend rename to meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend index edd44c16d3..5fd7ccb601 100644 --- a/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend +++ b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend @@ -1,9 +1,9 @@ # look for files in the layer first -FILESEXTRAPATHS := "${THISDIR}/files" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" inherit systemd -PRINC := "${@int(PRINC) + 1}" +PRINC := "${@int(PRINC) + 2}" SYSTEMD_PACKAGES = "dhcp-server-systemd dhcp-relay-systemd" SYSTEMD_SERVICE_dhcp-server-systemd = "dhcpd.service"