[oe-commits] org.oe.dev merge of '7732d3566dfef1479ce902ea965313de063af76b'

[pfalcon commit]

merge of '7732d3566dfef1479ce902ea965313de063af76b'
     and '9df68d6a3801ea07a13495709fb272b2f10b2af8'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 461baf0776fb41fc21e6d60fbd145c2f6e7a6b3b
ViewMTN: http://monotone.openembedded.org/revision/info/461baf0776fb41fc21e6d60fbd145c2f6e7a6b3b
Files:
1
packages/altboot/altboot_1.1.1+wip-SVNR69.bb
packages/altboot/altboot_1.1.1+wip-SVNR70.bb
packages/fstests/fstests.bb
conf/machine/h5000.conf
Diffs:

#
# mt diff -r7732d3566dfef1479ce902ea965313de063af76b -r461baf0776fb41fc21e6d60fbd145c2f6e7a6b3b
#
# 
# 
# rename "packages/altboot/altboot_1.1.1+wip-SVNR69.bb"
#     to "packages/altboot/altboot_1.1.1+wip-SVNR70.bb"
# 
# patch "packages/altboot/altboot_1.1.1+wip-SVNR70.bb"
#  from [f853485448631fad56e6fb98656afc1312240e9e]
#    to [d8549450283b67303bed9444e9ce7b672b4ef6b7]
# 
# patch "packages/fstests/fstests.bb"
#  from [8e68d354171ec166486b05d059c1d89ac0a78db5]
#    to [a6dc455c3f5af4948f0f78ed2476ee4147530492]
# 
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR69.bb	f853485448631fad56e6fb98656afc1312240e9e
+++ packages/altboot/altboot_1.1.1+wip-SVNR70.bb	d8549450283b67303bed9444e9ce7b672b4ef6b7
@@ -1,8 +1,8 @@ PR = "r0"
 require altboot.inc
 
 PR = "r0"
 
-SVN_REV = "69"
+SVN_REV = "70"
 SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
 	  "
 
============================================================
--- packages/fstests/fstests.bb	8e68d354171ec166486b05d059c1d89ac0a78db5
+++ packages/fstests/fstests.bb	a6dc455c3f5af4948f0f78ed2476ee4147530492
@@ -1,10 +1,12 @@ PV = "0.0+svn${SRCDATE}"
 DESCRIPTION = "Various benchmarking tests for X"
 HOMEPAGE = "http://www.o-hand.com"
 SECTION = "devel"
 LICENSE = "GPL"
 PV = "0.0+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
+DEPENDS = "gtk+"
+
 inherit autotools
 
 SRC_URI = \


#
# mt diff -r9df68d6a3801ea07a13495709fb272b2f10b2af8 -r461baf0776fb41fc21e6d60fbd145c2f6e7a6b3b
#
# 
# 
# patch "conf/machine/h5000.conf"
#  from [e3be93bf378f53331316ca75535d32465f86f9b0]
#    to [fc55c08e143a46f2863d188a7c378b8cc3ee2f2c]
# 
============================================================
--- conf/machine/h5000.conf	e3be93bf378f53331316ca75535d32465f86f9b0
+++ conf/machine/h5000.conf	fc55c08e143a46f2863d188a7c378b8cc3ee2f2c
@@ -6,7 +6,7 @@ TARGET_ARCH = "arm"
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te  h5xxx"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
 require conf/machine/include/tune-xscale.inc
 
@@ -31,5 +31,9 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
 #
 # Modules autoload and other boot properties
 #
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_g_ether = "g_ether"
+
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"