[oe-commits] org.oe.dev merge of '67dbe8b946b7e61ce8c584272ff315f0a7b698d2'

[pfalcon commit]

merge of '67dbe8b946b7e61ce8c584272ff315f0a7b698d2'
     and '895f25e3b9a12c824a7627b17b4bd30d2affbd1d'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: f7f1a87db91fd74a3e661901b014f70b0719706e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f7f1a87db91fd74a3e661901b014f70b0719706e
Files:
1
packages/linux/linux-handhelds-2.6_2.6.21-hh7.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh13.bb
packages/linux/compulab-pxa270_2.6.16.bb
Diffs:

#
# mt diff -r67dbe8b946b7e61ce8c584272ff315f0a7b698d2 -rf7f1a87db91fd74a3e661901b014f70b0719706e
#
# 
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh7.bb"
# 
# delete "packages/linux/linux-handhelds-2.6_2.6.21-hh8.bb"
# 
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh13.bb"
#  content [252b9c26ddd2fda4271f4352999ce0facbfece99]
# 
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh13.bb	252b9c26ddd2fda4271f4352999ce0facbfece99
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh13.bb	252b9c26ddd2fda4271f4352999ce0facbfece99
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig"
+
+require linux-handhelds-2.6.inc


#
# mt diff -r895f25e3b9a12c824a7627b17b4bd30d2affbd1d -rf7f1a87db91fd74a3e661901b014f70b0719706e
#
# 
# 
# patch "packages/linux/compulab-pxa270_2.6.16.bb"
#  from [c792b7e8d3021c9d56ee96df4f48cb823b7941e4]
#    to [aa641b64bcb45bd089254790a8c5e4761f3d34cd]
# 
============================================================
--- packages/linux/compulab-pxa270_2.6.16.bb	c792b7e8d3021c9d56ee96df4f48cb823b7941e4
+++ packages/linux/compulab-pxa270_2.6.16.bb	aa641b64bcb45bd089254790a8c5e4761f3d34cd
@@ -66,8 +66,8 @@ do_deploy[dirs] = "${S}"
 
 do_deploy[dirs] = "${S}"
 
-addtask deploy before do_build after do_compile
-addtask compulab_image before do_build after do_deploy
+addtask deploy before do_install after do_compile
+addtask compulab_image before do_install after do_deploy
 
 COMPATIBLE_MACHINE = "compulab-pxa270"