[oe] [meta-systemd][PATCH 2/4] dhcp: remove parts now merged into OE-Core recipe

[Paul Eggleton]

On Wednesday 17 September 2014 15:41:24 Paul Eggleton wrote:
> --- a/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
> +++ b/meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
> @@ -1,35 +1,18 @@
>  # 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_PACKAGES += "dhcp-client"
>  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"

Oops, I got a bit carried away, the RPROVIDES/RREPLACES/RCONFLICTS lines 
should not be removed. I have updated this commit on the branch to leave them 
in.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre