[oe-commits] org.oe.dev iana-etc 2.20: Don't install as /etc/services and /etc/protocols as these

[lenehan commit]

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.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 4e09f4798bea30744177e90c2dcfff5f0f17fab2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4e09f4798bea30744177e90c2dcfff5f0f17fab2
Files:
1
packages/iana-etc/iana-etc_2.20.bb
Diffs:

#
# mt diff -ra8fec6455f36945976c79105d31ee298a06da5f7 -r4e09f4798bea30744177e90c2dcfff5f0f17fab2
#
# 
# 
# patch "packages/iana-etc/iana-etc_2.20.bb"
#  from [1ac37d6f2237b8b3d2698cb9043b507d850169dc]
#    to [ca8b60d989df53dad89e2c0b6a36c10d19c1cfab]
# 
============================================================
--- packages/iana-etc/iana-etc_2.20.bb	1ac37d6f2237b8b3d2698cb9043b507d850169dc
+++ packages/iana-etc/iana-etc_2.20.bb	ca8b60d989df53dad89e2c0b6a36c10d19c1cfab
@@ -1,15 +1,18 @@ LICENSE = "OPL"
 DESCRIPTION = "The iana-etc package provides the Unix/Linux /etc/services and /etc/protocols files."
 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
 }