[oe-commits] org.oe.dev merge of '06538476a57a7ec542febb49515ebf5c936fe6de'

[lenehan commit]

merge of '06538476a57a7ec542febb49515ebf5c936fe6de'
     and '930c3cb990617ba61f08fd6fc4371224b675d4ab'

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: e4773d4add8eb87abae550658daa23ce8a2065fa
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e4773d4add8eb87abae550658daa23ce8a2065fa
Files:
1
packages/iana-etc/iana-etc_2.20.bb
packages/netbase/netbase_4.21.bb
packages/scummvm/scummvm.inc
Diffs:

#
# mt diff -r06538476a57a7ec542febb49515ebf5c936fe6de -re4773d4add8eb87abae550658daa23ce8a2065fa
#
# 
# 
# patch "packages/iana-etc/iana-etc_2.20.bb"
#  from [1ac37d6f2237b8b3d2698cb9043b507d850169dc]
#    to [ca8b60d989df53dad89e2c0b6a36c10d19c1cfab]
# 
# patch "packages/netbase/netbase_4.21.bb"
#  from [23eca4d14ac0f328bd75fa024d96b2514d2ff9a6]
#    to [3fec27517cd3465754989f44477022d59bf7749a]
# 
============================================================
--- 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
 }
============================================================
--- packages/netbase/netbase_4.21.bb	23eca4d14ac0f328bd75fa024d96b2514d2ff9a6
+++ packages/netbase/netbase_4.21.bb	3fec27517cd3465754989f44477022d59bf7749a
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 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 ${sysconfdir}/rpc \
+                   ${sysconfdir}/protocols ${sysconfdir}/services"
-CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces"


#
# mt diff -r930c3cb990617ba61f08fd6fc4371224b675d4ab -re4773d4add8eb87abae550658daa23ce8a2065fa
#
# 
# 
# patch "packages/scummvm/scummvm.inc"
#  from [ce32e4b570cd9283a37a56668c0906cae153a009]
#    to [881cbe05da932099a88bebbb6f1576dde96ad1d6]
# 
============================================================
--- packages/scummvm/scummvm.inc	ce32e4b570cd9283a37a56668c0906cae153a009
+++ packages/scummvm/scummvm.inc	881cbe05da932099a88bebbb6f1576dde96ad1d6
@@ -11,18 +11,14 @@ EXTRA_OECONF = "--host=${HOST_SYS} \
 		--backend=sdl \
 		--with-sdl-prefix=${STAGING_BINDIR_NATIVE}/.. \
 		--disable-alsa \
+		--prefix=${prefix} \
 		--with-ogg-prefix=${STAGING_LIBDIR}/.. \
 		--with-vorbis-prefix=${STAGING_LIBDIR}/.. \
 		--with-mpeg2-prefix=${STAGING_LIBDIR}/.. \
 		--with-mad-prefix=${STAGING_LIBDIR}/.. "
 
+EXTRA_OEMAKE = "MANDIR=${mandir}"
+
 do_configure() {
 	./configure ${EXTRA_OECONF}
 }
-
-
-do_install() {
-	install -d ${D}${bindir}
-	install -m 0755 scummvm ${D}${bindir}/scummvm
-}
-