From c78731c0859d79b115d47e2bfcd977086d25fc64 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 14 Mar 2014 20:06:06 +0100 Subject: dhcp: Rename .bbappend to match any version from oe-core Signed-off-by: Martin Jansa --- .../recipes-connectivity/dhcp/dhcp_%.bbappend | 35 ++++++++++++++++++++++ .../dhcp/dhcp_4.2.5-P1.bbappend | 35 ---------------------- 2 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend delete mode 100644 meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend (limited to 'meta-systemd/oe-core') diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend new file mode 100644 index 0000000000..1dd6d58eb6 --- /dev/null +++ b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend @@ -0,0 +1,35 @@ +# look for files in the layer first +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +inherit systemd + +SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client" +SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" +SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service" +SYSTEMD_SERVICE_dhcp-client = "dhclient.service" +SYSTEMD_AUTO_ENABLE_dhcp-client = "disable" + +FILES_dhcp-server += "${systemd_unitdir}/system/dhcpd.service" +FILES_dhcp-relay += "${systemd_unitdir}/system/dhrelay.service" +FILES_dhcp-client += "${systemd_unitdir}/system/dhclient.service" +RPROVIDES_dhcp-server += "dhcp-server-systemd" +RREPLACES_dhcp-server += "dhcp-server-systemd" +RCONFLICTS_dhcp-server += "dhcp-server-systemd" +RPROVIDES_dhcp-relay += "dhcp-relay-systemd" +RREPLACES_dhcp-relay += "dhcp-relay-systemd" +RCONFLICTS_dhcp-relay += "dhcp-relay-systemd" +RPROVIDES_dhcp-client += "dhcp-client-systemd" +RREPLACES_dhcp-client += "dhcp-client-systemd" +RCONFLICTS_dhcp-client += "dhcp-client-systemd" + +SRC_URI += "file://dhcpd.service \ + file://dhclient.service \ + file://dhcrelay.service \ +" +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system +} + diff --git a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend deleted file mode 100644 index 1dd6d58eb6..0000000000 --- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend +++ /dev/null @@ -1,35 +0,0 @@ -# look for files in the layer first -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -inherit systemd - -SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client" -SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" -SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service" -SYSTEMD_SERVICE_dhcp-client = "dhclient.service" -SYSTEMD_AUTO_ENABLE_dhcp-client = "disable" - -FILES_dhcp-server += "${systemd_unitdir}/system/dhcpd.service" -FILES_dhcp-relay += "${systemd_unitdir}/system/dhrelay.service" -FILES_dhcp-client += "${systemd_unitdir}/system/dhclient.service" -RPROVIDES_dhcp-server += "dhcp-server-systemd" -RREPLACES_dhcp-server += "dhcp-server-systemd" -RCONFLICTS_dhcp-server += "dhcp-server-systemd" -RPROVIDES_dhcp-relay += "dhcp-relay-systemd" -RREPLACES_dhcp-relay += "dhcp-relay-systemd" -RCONFLICTS_dhcp-relay += "dhcp-relay-systemd" -RPROVIDES_dhcp-client += "dhcp-client-systemd" -RREPLACES_dhcp-client += "dhcp-client-systemd" -RCONFLICTS_dhcp-client += "dhcp-client-systemd" - -SRC_URI += "file://dhcpd.service \ - file://dhclient.service \ - file://dhcrelay.service \ -" -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system -} - -- cgit 1.2.3-korg