[oe-commits] org.oe.dev merge of '447b400a2b8caf7591734fb1f909d36eda572edc'

pfalcon commit openembedded-commits at lists.openembedded.org
Sat Dec 22 22:10:50 UTC 2007


merge of '447b400a2b8caf7591734fb1f909d36eda572edc'
     and 'b781317fba3fb746b1b5c4ba5bab647df2775330'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 9df68d6a3801ea07a13495709fb272b2f10b2af8
ViewMTN: http://monotone.openembedded.org/revision/info/9df68d6a3801ea07a13495709fb272b2f10b2af8
Files:
1
conf/machine/h2200.conf
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
packages/altboot/altboot_1.1.1+wip-SVNR69.bb
packages/altboot/altboot_1.1.1+wip-SVNR70.bb
packages/fstests/fstests.bb
Diffs:

#
# mt diff -r447b400a2b8caf7591734fb1f909d36eda572edc -r9df68d6a3801ea07a13495709fb272b2f10b2af8
#
# 
# 
# patch "conf/machine/h2200.conf"
#  from [631917e12eef6e20330b4c190ce6f535a9eb3ed3]
#    to [73636ed45d256967ed2b6da85adaf7af07cc9fb4]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
#  from [149a069ee31e27ea584bde100650235a4afbbee0]
#    to [24d42cd14a664a47dbb84ff409985fbb833cc4e6]
# 
============================================================
--- conf/machine/h2200.conf	631917e12eef6e20330b4c190ce6f535a9eb3ed3
+++ conf/machine/h2200.conf	73636ed45d256967ed2b6da85adaf7af07cc9fb4
@@ -40,7 +40,7 @@ module_autoload_snd-mixer-oss = "snd-mix
 #
 module_autoload_snd-pcm-oss 	= "snd-pcm-oss"
 module_autoload_snd-mixer-oss = "snd-mixer-oss"
-module_autoload_snd-h2000-audio = "snd-h2000-audio"
+module_autoload_snd-h2200-audio = "snd-h2200-audio"
 
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb	149a069ee31e27ea584bde100650235a4afbbee0
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb	24d42cd14a664a47dbb84ff409985fbb833cc4e6
@@ -1,7 +1,7 @@ LICENSE = "GPL"
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 


#
# mt diff -rb781317fba3fb746b1b5c4ba5bab647df2775330 -r9df68d6a3801ea07a13495709fb272b2f10b2af8
#
# 
# 
# 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 = \






More information about the Openembedded-commits mailing list