[oe-commits] org.oe.dev merge of '91782f0ec824ced8214a20e5d2f8b080c82c25d5'
xora commit
openembedded-commits at lists.openembedded.org
Tue Feb 26 18:05:19 UTC 2008
merge of '91782f0ec824ced8214a20e5d2f8b080c82c25d5'
and 'bde94cf8dad73aae4dad904a84e442fae7b410f9'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 0425e652c6eebc54317f6dcfa596f669e0e8b24f
ViewMTN: http://monotone.openembedded.org/revision/info/0425e652c6eebc54317f6dcfa596f669e0e8b24f
Files:
1
packages/pulseaudio/pulse.inc
packages/pulseaudio/pulseaudio_0.9.6.bb
packages/pulseaudio/pulseaudio_0.9.9.bb
classes/base.bbclass
classes/rm_work.bbclass
classes/seppuku.bbclass
classes/tinderclient.bbclass
Diffs:
#
# mt diff -r91782f0ec824ced8214a20e5d2f8b080c82c25d5 -r0425e652c6eebc54317f6dcfa596f669e0e8b24f
#
#
#
# patch "packages/pulseaudio/pulse.inc"
# from [21cfea996a2da42f5d28bdf518cec74f51f8454a]
# to [e0b40b31f99b5d34fb4d1e760418348db31be6bf]
#
# patch "packages/pulseaudio/pulseaudio_0.9.6.bb"
# from [b3802cedceb5a7186c47d292a6f3f50b420be551]
# to [a4bbd8173a5406983182473a583d0439a4ed919e]
#
# patch "packages/pulseaudio/pulseaudio_0.9.9.bb"
# from [a076f2143bcd4c95f958a442f117d983aef69d9c]
# to [a42f8d95ac47cb47a5e26144cc42a01d219a00e4]
#
============================================================
--- packages/pulseaudio/pulse.inc 21cfea996a2da42f5d28bdf518cec74f51f8454a
+++ packages/pulseaudio/pulse.inc e0b40b31f99b5d34fb4d1e760418348db31be6bf
@@ -84,7 +84,7 @@ pkg_postinst_${PN}-server() {
grep -q pulse: /etc/passwd || \
adduser --disabled-password --home=/var/run/pulse --system \
--ingroup pulse --no-create-home -g "Pulse audio daemon" pulse
- adduser pulse audio
+ addgroup pulse audio
/etc/init.d/populate-volatile.sh update
}
============================================================
--- packages/pulseaudio/pulseaudio_0.9.6.bb b3802cedceb5a7186c47d292a6f3f50b420be551
+++ packages/pulseaudio/pulseaudio_0.9.6.bb a4bbd8173a5406983182473a583d0439a4ed919e
@@ -1,4 +1,4 @@ require pulse.inc
require pulse.inc
-PR = "r6"
+PR = "r7"
============================================================
--- packages/pulseaudio/pulseaudio_0.9.9.bb a076f2143bcd4c95f958a442f117d983aef69d9c
+++ packages/pulseaudio/pulseaudio_0.9.9.bb a42f8d95ac47cb47a5e26144cc42a01d219a00e4
@@ -8,7 +8,7 @@ SRC_URI += "\
file://fix-dbus-without-hal.patch;patch=1 \
"
-PR = "r2"
+PR = "r3"
# problems w/ pulseaudio 0.9.9 atm:
# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
#
# mt diff -rbde94cf8dad73aae4dad904a84e442fae7b410f9 -r0425e652c6eebc54317f6dcfa596f669e0e8b24f
#
#
#
# patch "classes/base.bbclass"
# from [1a4cea219c6fbdcac157bc9e75d192ac0d8ff7fc]
# to [cb47f4951ca60041e077ae00509c54961b54d573]
#
# patch "classes/rm_work.bbclass"
# from [d5a7e76ed08a44739262da8cae8929a858775dfc]
# to [37e569d9d18711a27e5823cb5e00f79377d3d92b]
#
# patch "classes/seppuku.bbclass"
# from [aa7c1e4b25e78a6657bbd1981530497920099520]
# to [5ccb6b3ee62481e1ee237df90ec2f4a399801311]
#
# patch "classes/tinderclient.bbclass"
# from [dfb5637c7f39403fb14f5bcb72775bc48bab0393]
# to [5228467af99962e39ee66df2bb9bd27b44416e13]
#
============================================================
--- classes/base.bbclass 1a4cea219c6fbdcac157bc9e75d192ac0d8ff7fc
+++ classes/base.bbclass cb47f4951ca60041e077ae00509c54961b54d573
@@ -424,13 +424,21 @@ python base_do_clean() {
os.system('rm -f '+ dir)
}
+#Uncomment this for bitbake 1.8.12
+#addtask rebuild after do_${BB_DEFAULT_TASK}
addtask rebuild
do_rebuild[dirs] = "${TOPDIR}"
do_rebuild[nostamp] = "1"
python base_do_rebuild() {
"""rebuild a package"""
- bb.build.exec_task('do_clean', d)
- bb.build.exec_task('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1), d)
+ from bb import __version__
+ try:
+ from distutils.version import LooseVersion
+ except ImportError:
+ def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
+ if (LooseVersion(__version__) < LooseVersion('1.8.11')):
+ bb.build.exec_func('do_clean', d)
+ bb.build.exec_task('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1), d)
}
addtask mrproper
@@ -442,7 +450,7 @@ python base_do_mrproper() {
if dir == '/': bb.build.FuncFailed("wrong DATADIR")
bb.debug(2, "removing " + dir)
os.system('rm -rf ' + dir)
- bb.build.exec_task('do_clean', d)
+ bb.build.exec_func('do_clean', d)
}
addtask fetch
@@ -663,6 +671,17 @@ python base_eventhandler() {
if pesteruser:
bb.fatal('The following variable(s) were not set: %s\nPlease set them directly, or choose a MACHINE or DISTRO that sets them.' % ', '.join(pesteruser))
+ #
+ # Handle removing stamps for 'rebuild' task
+ #
+ if name.startswith("StampUpdate"):
+ for (fn, task) in e.targets:
+ #print "%s %s" % (task, fn)
+ if task == "do_rebuild":
+ dir = "%s.*" % e.stampPrefix[fn]
+ bb.note("Removing stamps: " + dir)
+ os.system('rm -f '+ dir)
+
if not data in e.__dict__:
return NotHandled
@@ -900,7 +919,19 @@ python () {
return
python () {
+ import bb
+ from bb import __version__
base_after_parse(d)
+
+ # Remove this for bitbake 1.8.12
+ try:
+ from distutils.version import LooseVersion
+ except ImportError:
+ def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1
+ if (LooseVersion(__version__) >= LooseVersion('1.8.11')):
+ deps = bb.data.getVarFlag('do_rebuild', 'deps', d) or []
+ deps.append('do_' + bb.data.getVar('BB_DEFAULT_TASK', d, 1))
+ bb.data.setVarFlag('do_rebuild', 'deps', deps, d)
}
def check_app_exists(app, d):
============================================================
--- classes/rm_work.bbclass d5a7e76ed08a44739262da8cae8929a858775dfc
+++ classes/rm_work.bbclass 37e569d9d18711a27e5823cb5e00f79377d3d92b
@@ -25,3 +25,23 @@ addtask rm_work_all after do_rm_work
}
do_rm_work_all[recrdeptask] = "do_rm_work"
addtask rm_work_all after do_rm_work
+
+
+addhandler rmwork_stampfixing_eventhandler
+python rmwork_stampfixing_eventhandler() {
+ from bb.event import getName
+ import os
+
+ if getName(e) == "StampUpdate":
+ for (fn, task) in e.targets:
+ if task == 'rm_work_all':
+ continue
+ stamp = "%s.do_rm_work" % e.stampPrefix[fn]
+ if os.path.exists(stamp):
+ dir = "%s.*" % e.stampPrefix[fn]
+ bb.note("Removing stamps: " + dir)
+ os.system('rm -f '+ dir)
+
+ return NotHandled
+}
+
============================================================
--- classes/seppuku.bbclass aa7c1e4b25e78a6657bbd1981530497920099520
+++ classes/seppuku.bbclass 5ccb6b3ee62481e1ee237df90ec2f4a399801311
@@ -303,7 +303,7 @@ python seppuku_eventhandler() {
if name == "PkgFailed":
if not bb.data.getVar('SEPPUKU_AUTOBUILD', data, True) == "0":
- build.exec_task('do_clean', data)
+ build.exec_func('do_clean', data)
elif name == "TaskFailed":
cj = cookielib.CookieJar()
opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
============================================================
--- classes/tinderclient.bbclass dfb5637c7f39403fb14f5bcb72775bc48bab0393
+++ classes/tinderclient.bbclass 5228467af99962e39ee66df2bb9bd27b44416e13
@@ -328,7 +328,7 @@ def tinder_do_tinder_report(event):
log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('PF', event.data, True)
elif name == "PkgFailed":
if not data.getVar('TINDER_AUTOBUILD', event.data, True) == "0":
- build.exec_task('do_clean', event.data)
+ build.exec_func('do_clean', event.data)
log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('PF', event.data, True)
status = 200
# remember the failure for the -k case
More information about the Openembedded-commits
mailing list