summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorJamie Lenehan <lenehan@twibble.org>2007-08-18 11:20:49 +0000
committerJamie Lenehan <lenehan@twibble.org>2007-08-18 11:20:49 +0000
commitc80b8c18df2b36fa0ba5c0731a15eb40ff502908 (patch)
treef937e280a24a30c423ee9a93ed5c158f6af97eba /packages
parent0b4d85ed076f242708e2a1afa9e49cc7175449e1 (diff)
parent1e050fd0909b7179148517ddbffdbd2ab6362134 (diff)
merge of '06538476a57a7ec542febb49515ebf5c936fe6de'
and '930c3cb990617ba61f08fd6fc4371224b675d4ab'
Diffstat (limited to 'packages')
-rw-r--r--packages/iana-etc/iana-etc_2.20.bb13
-rw-r--r--packages/netbase/netbase_4.21.bb6
2 files changed, 12 insertions, 7 deletions
diff --git a/packages/iana-etc/iana-etc_2.20.bb b/packages/iana-etc/iana-etc_2.20.bb
index ccf0b8da8a..6d8c615877 100644
--- 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
}
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index 6775008ea5..f9be31845c 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \
infrastructure for basic TCP/IP based networking."
SECTION = "base"
LICENSE = "GPL"
-PR = "r20"
+PR = "r21"
inherit update-rc.d
@@ -54,4 +54,6 @@ do_install () {
install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces
}
-CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces"
+CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts \
+ ${sysconfdir}/network/interfaces ${sysconfdir}/rpc \
+ ${sysconfdir}/protocols ${sysconfdir}/services"