iana-etc 2.20: Don't install as /etc/services and /etc/protocols as these

conflict with those from net-base. Instead install them as
/etc/protocols.iana and /etc/servcies.iana. Users will need to manually copy
over any entries they need (or the entire file.) See #2505 for details.

diff --git a/packages/iana-etc/iana-etc_2.20.bb b/packages/iana-etc/iana-etc_2.20.bb
index ccf0b8d..6d8c615 100644 (file)
--- a/packages/iana-etc/iana-etc_2.20.bb
+++ b/packages/iana-etc/iana-etc_2.20.bb
@@ -3,13 +3,16 @@ AUTHOR = "Seth W. Klein"
 HOMEPAGE = "http://www.sethwklein.net/projects/iana-etc/"
 SECTION = "base"
 LICENSE = "OPL"
+PR = "r1"
 
 SRC_URI = "http://www.sethwklein.net/projects/iana-etc/downloads/${P}.tar.bz2"
 
-do_make(){
-        oe_runmake 'STRIP=yes'
-}
+# Don't install as /etc/protocols and /etc/services since they are installed
+# by net-base and are considered config files. Install this side by side so
+# end-user can manaulyl copy them and/or take entries from them. See #2505.
 
-do_install(){
-        oe_runmake 'DESTDIR=${D}' install
+do_install() {
+        install -d ${D}${sysconfdir}
+        install -m 644 protocols ${D}${sysconfdir}/protocols.iana
+        install -m 644 services ${D}${sysconfdir}/services.iana
 }