[oe-commits] org.oe.dev merge of '2f59921c707cbaf0d9cf6efc81b2c89ef6be04bd'

[crofton commit]

merge of '2f59921c707cbaf0d9cf6efc81b2c89ef6be04bd'
     and 'e4773d4add8eb87abae550658daa23ce8a2065fa'

Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 398bc51e114a5414e2a0ed00059e3e98a2c10bba
ViewMTN: http://monotone.openembedded.org/revision.psp?id=398bc51e114a5414e2a0ed00059e3e98a2c10bba
Files:
1
packages/netbase/netbase_4.21.bb
packages/scummvm/scummvm.inc
conf/machine/davinci-dvevm.conf
Diffs:

#
# mt diff -r2f59921c707cbaf0d9cf6efc81b2c89ef6be04bd -r398bc51e114a5414e2a0ed00059e3e98a2c10bba
#
# 
# 
# patch "packages/netbase/netbase_4.21.bb"
#  from [23eca4d14ac0f328bd75fa024d96b2514d2ff9a6]
#    to [3fec27517cd3465754989f44477022d59bf7749a]
# 
# patch "packages/scummvm/scummvm.inc"
#  from [ce32e4b570cd9283a37a56668c0906cae153a009]
#    to [881cbe05da932099a88bebbb6f1576dde96ad1d6]
# 
============================================================
--- 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"
============================================================
--- 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
-}
-


#
# mt diff -re4773d4add8eb87abae550658daa23ce8a2065fa -r398bc51e114a5414e2a0ed00059e3e98a2c10bba
#
# 
# 
# patch "conf/machine/davinci-dvevm.conf"
#  from [e9f21b6a37024cda89bab889af2959652df27a9e]
#    to [ad3f1d36c3ae769c5772533d8f1a3c8a48db13e4]
# 
============================================================
--- conf/machine/davinci-dvevm.conf	e9f21b6a37024cda89bab889af2959652df27a9e
+++ conf/machine/davinci-dvevm.conf	ad3f1d36c3ae769c5772533d8f1a3c8a48db13e4
@@ -12,7 +12,7 @@ PREFERRED_VERSION_u-boot = "git"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 PREFERRED_VERSION_u-boot = "git"
-UBOOT_MACHINE = "davinci_dvevm"
+UBOOT_MACHINE = "davinci_dvevm_config"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"