[oe-commits] org.oe.dev merge of 'dcad4c29f9b9e4345ed6d8ade8f43504cde65b34'

[pfalcon commit]

merge of 'dcad4c29f9b9e4345ed6d8ade8f43504cde65b34'
     and 'e6858d7efc8dabfe5569175c65dc71b0e94e25c6'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 447b400a2b8caf7591734fb1f909d36eda572edc
ViewMTN: http://monotone.openembedded.org/revision/info/447b400a2b8caf7591734fb1f909d36eda572edc
Files:
1
packages/altboot/altboot_1.1.1+wip-SVNR69.bb
packages/altboot/altboot_1.1.1+wip-SVNR70.bb
packages/fstests/fstests.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
packages/linux/linux-handhelds-2.6
packages/linux/linux-handhelds-2.6-2.6.21
packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
packages/linux/linux-handhelds-2.6_cvs.bb
Diffs:

#
# mt diff -rdcad4c29f9b9e4345ed6d8ade8f43504cde65b34 -r447b400a2b8caf7591734fb1f909d36eda572edc
#
# 
# 
# 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 -re6858d7efc8dabfe5569175c65dc71b0e94e25c6 -r447b400a2b8caf7591734fb1f909d36eda572edc
#
# 
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb"
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb"
# 
# rename "packages/linux/linux-handhelds-2.6"
#     to "packages/linux/linux-handhelds-2.6-2.6.21"
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb"
#  from [49685f54bf88b77f0c58a25c20ad416690435f97]
#    to [75393e4feb74ea7e937ef54139a105955ca45032]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb"
#  from [252b9c26ddd2fda4271f4352999ce0facbfece99]
#    to [149a069ee31e27ea584bde100650235a4afbbee0]
# 
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
#  from [252b9c26ddd2fda4271f4352999ce0facbfece99]
#    to [149a069ee31e27ea584bde100650235a4afbbee0]
# 
# patch "packages/linux/linux-handhelds-2.6_cvs.bb"
#  from [cde5e382dd8c6dd8cc444aa1729ad55e47f7e066]
#    to [632168097c40dba491d572a468f18dac758475fb]
# 
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb	49685f54bf88b77f0c58a25c20ad416690435f97
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb	75393e4feb74ea7e937ef54139a105955ca45032
@@ -5,6 +5,10 @@ DEFAULT_PREFERENCE = "-1"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb	252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb	149a069ee31e27ea584bde100650235a4afbbee0
@@ -5,6 +5,10 @@ DEFAULT_PREFERENCE = "-1"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb	252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb	149a069ee31e27ea584bde100650235a4afbbee0
@@ -5,6 +5,10 @@ DEFAULT_PREFERENCE = "-1"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 
============================================================
--- packages/linux/linux-handhelds-2.6_cvs.bb	cde5e382dd8c6dd8cc444aa1729ad55e47f7e066
+++ packages/linux/linux-handhelds-2.6_cvs.bb	632168097c40dba491d572a468f18dac758475fb
@@ -6,10 +6,14 @@ DEFAULT_PREFERENCE = "-1"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 K_MAJOR = "2"
 K_MINOR = "6"
 K_MICRO = "21"
-HHV     = "14"
+HHV     = "20"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
            file://defconfig"