[oe-commits] org.oe.dev merge of '16f0fa7ec858ba228dd9d241b0cff7a309a42dff'

[oe commit]

merge of '16f0fa7ec858ba228dd9d241b0cff7a309a42dff'
     and '8a98b05914e98533aa6ec6041337074cd4a83fe6'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 897d1eec6ab0aede858323e185dd9177b7b35833
ViewMTN: http://monotone.openembedded.org/revision/info/897d1eec6ab0aede858323e185dd9177b7b35833
Files:
1
classes/base.bbclass
classes/packaged-staging.bbclass
packages/gypsy/gypsy.inc
packages/gypsy/gypsy_svn.bb
Diffs:

#
# mt diff -r16f0fa7ec858ba228dd9d241b0cff7a309a42dff -r897d1eec6ab0aede858323e185dd9177b7b35833
#
# 
# 
# patch "classes/base.bbclass"
#  from [b37f42836fc2adcb03d14179319ac508313a2b86]
#    to [1288ed5512b85cb9b059f144d7e8bd8975cbcbe5]
# 
# patch "classes/packaged-staging.bbclass"
#  from [59a91d125afea47071a318c45a9942ffd3d8111b]
#    to [ec2561490be2fcdce7651e0ee01cb5bc8dbecf19]
# 
============================================================
--- classes/base.bbclass	b37f42836fc2adcb03d14179319ac508313a2b86
+++ classes/base.bbclass	1288ed5512b85cb9b059f144d7e8bd8975cbcbe5
@@ -1,4 +1,4 @@
-BB_DEFAULT_TASK = "build"
+BB_DEFAULT_TASK ?= "build"
 
 # like os.path.join but doesn't treat absolute RHS specially
 def base_path_join(a, *p):
============================================================
--- classes/packaged-staging.bbclass	59a91d125afea47071a318c45a9942ffd3d8111b
+++ classes/packaged-staging.bbclass	ec2561490be2fcdce7651e0ee01cb5bc8dbecf19
@@ -225,5 +225,5 @@ python do_package_stage () {
     bb.utils.unlockfile(lf)
 }
 
-addtask package_stage after do_package_write_ipk do_package_write_deb do_package_write do_populate_staging before do_build
+addtask package_stage after do_package_write do_populate_staging before do_build
 


#
# mt diff -r8a98b05914e98533aa6ec6041337074cd4a83fe6 -r897d1eec6ab0aede858323e185dd9177b7b35833
#
# 
# 
# patch "packages/gypsy/gypsy.inc"
#  from [816a8a3e7c95ea800fd63fba2e778e93cd84bbef]
#    to [85b5dc8a1cf38b17b7eae3af2cd38122493263fa]
# 
# patch "packages/gypsy/gypsy_svn.bb"
#  from [079cf68a5fae747fa3a2080dd75e0b659a566f08]
#    to [7c8bebbab2c817b985ad6679a088c571ea02dbb1]
# 
============================================================
--- packages/gypsy/gypsy.inc	816a8a3e7c95ea800fd63fba2e778e93cd84bbef
+++ packages/gypsy/gypsy.inc	85b5dc8a1cf38b17b7eae3af2cd38122493263fa
@@ -9,4 +9,8 @@ do_configure_prepend () {
 	touch ${S}/gtk-doc.make
 }
 
+do_stage() {
+	autotools_stage_all
+}
+
 FILES_${PN} += "${datadir}/dbus-1/services/"
============================================================
--- packages/gypsy/gypsy_svn.bb	079cf68a5fae747fa3a2080dd75e0b659a566f08
+++ packages/gypsy/gypsy_svn.bb	7c8bebbab2c817b985ad6679a088c571ea02dbb1
@@ -1,9 +1,9 @@ SRC_URI = "svn://svn.o-hand.com/repos/${
 require gypsy.inc
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \
-           file://fixups.patch;patch=1"
+           file://fixups.patch;patch=1;maxrev=107"
 
 PV = "0.0+svnr${SRCREV}"
 S = "${WORKDIR}/${PN}"