[oe-commits] org.oe.dev dhcp: Fix dbg packaging and clean up hardcoded paths (from poky)

[hrw commit]

dhcp: Fix dbg packaging and clean up hardcoded paths (from poky)

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: d73a99d1d26d0bc0a51e7739f788e34faf47bcb1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d73a99d1d26d0bc0a51e7739f788e34faf47bcb1
Files:
1
packages/dhcp/dhcp_3.0.2.bb
Diffs:

#
# mt diff -rcb1353500f8d4fe7392e73732f0ee081707a2877 -rd73a99d1d26d0bc0a51e7739f788e34faf47bcb1
#
# 
# 
# patch "packages/dhcp/dhcp_3.0.2.bb"
#  from [ec621cd5c1703d1269a0a84bbf1dcae4128fab12]
#    to [22a60b2567e7a2cf31517547c1c7800734714419]
# 
============================================================
--- packages/dhcp/dhcp_3.0.2.bb	ec621cd5c1703d1269a0a84bbf1dcae4128fab12
+++ packages/dhcp/dhcp_3.0.2.bb	22a60b2567e7a2cf31517547c1c7800734714419
@@ -1,12 +1,12 @@ LICENSE = "BSD"
 SECTION = "console/network"
 DESCRIPTION = "Internet Software Consortium DHCP package"
 HOMEPAGE = "http://www.isc.org/"
 LICENSE = "BSD"
-PR = "r4"
+PR = "r5"
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-3.0-history/dhcp-${PV}.tar.gz \
 	   file://noattrmode.patch;patch=1 \
 	   file://fixincludes.patch;patch=1 \
-           file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \
+	   file://dhcp-3.0.3-dhclient-dbus.patch;patch=1;pnum=0 \
 	   file://init-relay file://default-relay \
 	   file://init-server file://default-server \
 	   file://dhclient.conf file://dhcpd.conf"
@@ -36,11 +36,12 @@ do_install() {
 	install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
 }
 
-PACKAGES =+ "dhcp-server dhcp-client dhcp-relay dhcp-omshell"
-FILES_dhcp-server = "${sbindir}/dhcpd /etc/init.d/dhcp-server /etc/default/dhcp-server /etc/dhcp/dhcpd.conf"
-FILES_dhcp-relay = "${sbindir}/dhcrelay /etc/init.d/dhcp-relay /etc/default/dhcp-relay"
+PACKAGES += "dhcp-server dhcp-client dhcp-relay dhcp-omshell"
+FILES_${PN} = ""
+FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
+FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"
 
-FILES_dhcp-client = "/sbin/ /etc/dhcp/dhclient.conf"
+FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf"
 RDEPENDS_dhcp-client = "bash"
 
 FILES_dhcp-omshell = "${bindir}/omshell"