[oe-commits] org.oe.dev merge of '8feaf9690f0a2100128b1830f061fb71951fd3f4'
pH5 commit
openembedded-commits at lists.openembedded.org
Thu Aug 23 08:46:10 UTC 2007
merge of '8feaf9690f0a2100128b1830f061fb71951fd3f4'
and 'aa7e855436eea5f20330a56ce6657b0a9ebc844c'
Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: cd77402853633ef4e740eb0e0ab98935d7cfd103
ViewMTN: http://monotone.openembedded.org/revision.psp?id=cd77402853633ef4e740eb0e0ab98935d7cfd103
Files:
1
packages/gsm/files/fic-gta01
packages/gsm/files/fic-gta01/default
packages/gsm/files/fix-mlbuf.patch
packages/gsm/files/htcuniversal
packages/gsm/files/htcuniversal/default
packages/gsm/files/magician
packages/gsm/files/magician/default
packages/python/python-openmoko
packages/python/python-openmoko/python-path.patch
packages/gsm/files/default
packages/gsm/libgsmd_svn.bb
packages/python/python-openmoko_0.1.bb
classes/seppuku.bbclass
Diffs:
#
# mt diff -r8feaf9690f0a2100128b1830f061fb71951fd3f4 -rcd77402853633ef4e740eb0e0ab98935d7cfd103
#
#
#
# delete "packages/gsm/files/fic-gta01"
#
# delete "packages/gsm/files/fic-gta01/default"
#
# delete "packages/gsm/files/fix-mlbuf.patch"
#
# delete "packages/gsm/files/htcuniversal"
#
# delete "packages/gsm/files/htcuniversal/default"
#
# delete "packages/gsm/files/magician"
#
# delete "packages/gsm/files/magician/default"
#
# add_dir "packages/python/python-openmoko"
#
# add_file "packages/python/python-openmoko/python-path.patch"
# content [40983bb354b660303ebeaaa838b0b8332b6eaf8d]
#
# patch "packages/gsm/files/default"
# from [7ce0e5ef1d869657220f2726615b4248e22cf672]
# to [f0238ff8fc0e3123941c19055fb0dd74d4fc5ed4]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [18ab9bc749d84c6a0e5c87697ffa494314fde676]
# to [ff7c3845f7e03d5a5327937e2feb3a7d129fd962]
#
# patch "packages/python/python-openmoko_0.1.bb"
# from [f5da0eaa8107b799301f621fa8dca1a37b9541ac]
# to [718047398e690d79f5a31a2a007d7bedcc7ae4f0]
#
============================================================
--- packages/python/python-openmoko/python-path.patch 40983bb354b660303ebeaaa838b0b8332b6eaf8d
+++ packages/python/python-openmoko/python-path.patch 40983bb354b660303ebeaaa838b0b8332b6eaf8d
@@ -0,0 +1,21 @@
+--- python.orig/m4/python.m4
++++ python/m4/python.m4
+@@ -43,12 +43,18 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
++AC_ARG_WITH(python-includes,
++ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval)
++if test x$py_exec_prefix != x; then
++PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++else
+ py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+ py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+ PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+ if test "$py_prefix" != "$py_exec_prefix"; then
+ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+ fi
++fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+ save_CPPFLAGS="$CPPFLAGS"
============================================================
--- packages/gsm/files/default 7ce0e5ef1d869657220f2726615b4248e22cf672
+++ packages/gsm/files/default f0238ff8fc0e3123941c19055fb0dd74d4fc5ed4
@@ -1,9 +1,44 @@
# gsmd This shell script configures for the gsmd init script.
-# If you must specify special options, uncomment and modify the next line
-#GSMD_OPTS="-s 115200 -F"
+. /etc/init.d/functions
-# If your GSM device needs to be powered up, uncomment and modify the next line
-#GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
+case `cpuinfo_id` in
+ "GTA01", "GTA02")
+ GSMD_OPTS="-s 115200 -F"
+ GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
+ GSM_DEV="/dev/ttySAC0"
+ ;;
+ "HTC Apache", "HTC Blueangel")
+ GSMD_OPTS="-s 115200 -F"
+ GSM_DEV="/dev/ttyS0"
+ ;;
+ "HTC Himalaya")
+ GSMD_OPTS="-s 115200 -F"
+ GSM_DEV="/dev/ttyS2"
+ ;;
+ "HTC Magician")
+ GSMD_OPTS="-s 115200 -F"
+ GSM_DEV="/dev/ttyS1"
+ ;;
+ "HTC Universal")
+ GSMD_OPTS="-s 115200 -F -w 1"
+ GSM_DEV="/dev/ttyS0"
+ ;;
+ "Palm Treo 650")
+ GSMD_OPTS="-s 460800 -F -w 1"
+ GSM_DEV="/dev/ttyS0"
+ ;;
+ *)
+ # Unknown board
+ # If you must specify special options, uncomment and modify the next line
+ #GSMD_OPTS="-s 115200 -F"
+
+ # If your GSM device needs to be powered up, uncomment and modify the next line
+ #GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
+
+ # This should be in a common /etc/default/serial, together with
+ # BT_DEV and IR_DEV for devices that have those on a serial port
+ #GSM_DEV="/dev/ttyS1"
+ ;;
+esac
-#GSM_DEV="/dev/ttyS1"
============================================================
--- packages/gsm/libgsmd_svn.bb 18ab9bc749d84c6a0e5c87697ffa494314fde676
+++ packages/gsm/libgsmd_svn.bb ff7c3845f7e03d5a5327937e2feb3a7d129fd962
@@ -6,8 +6,6 @@ PR = "r20"
PV = "0.1+svn${SRCDATE}"
PR = "r20"
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
file://gsmd \
file://default"
@@ -31,22 +29,24 @@ PACKAGES =+ "${PN}-tools gsmd gsmd-plugi
PACKAGES =+ "${PN}-tools gsmd gsmd-plugins \
gsmd-plugin-machine-generic gsmd-plugin-machine-tihtc \
+ gsmd-plugin-vendor-bcm \
gsmd-plugin-vendor-qc \
- gsmd-plugin-vendor-ti \
+ gsmd-plugin-vendor-ti \
gsmd-plugin-vendor-tihtc \
- gsmd-plugin-vendor-bcm \
- "
+ "
RDEPENDS_${PN} = "gsmd"
RDEPENDS_gsmd-plugins = "gsmd-plugin-machine-generic \
gsmd-plugin-machine-tihtc \
+ gsmd-plugin-vendor-bcm \
gsmd-plugin-vendor-qc \
gsmd-plugin-vendor-ti \
gsmd-plugin-vendor-tihtc \
- gsmd-plugin-vendor-bcm \
- "
+ "
+RDEPENDS_gsmd = "initscripts"
RRECOMMENDS_gsmd = "gsmd-plugins"
+FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*"
FILES_${PN}-tools = "${bindir}/*"
FILES_gsmd = "${sbindir}/gsmd ${sysconfdir}"
FILES_gsmd-plugins = ""
============================================================
--- packages/python/python-openmoko_0.1.bb f5da0eaa8107b799301f621fa8dca1a37b9541ac
+++ packages/python/python-openmoko_0.1.bb 718047398e690d79f5a31a2a007d7bedcc7ae4f0
@@ -1,13 +1,15 @@ SECTION = "devel/python"
DESCRIPTION = "Python Bindings for the OpenMoko Platform"
AUTHOR = "Holger 'Zecke' Freyther"
LICENSE = "LGPL"
DEPENDS = "python-pygtk libmokoui2 libmokojournal2 libmokogsmd2"
SECTION = "devel/python"
+PR = "r1"
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/bindings;module=python;proto=http"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/bindings;module=python;proto=http \
+ file://python-path.patch;patch=1"
+
S = "${WORKDIR}/python"
inherit autotools distutils-base
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
-
-
#
# mt diff -raa7e855436eea5f20330a56ce6657b0a9ebc844c -rcd77402853633ef4e740eb0e0ab98935d7cfd103
#
#
#
# patch "classes/seppuku.bbclass"
# from [a69586a66f285bca06d5d46b92195f56ece0749d]
# to [600990318f058b4d0322d76c901d7805b090a8c3]
#
============================================================
--- classes/seppuku.bbclass a69586a66f285bca06d5d46b92195f56ece0749d
+++ classes/seppuku.bbclass 600990318f058b4d0322d76c901d7805b090a8c3
@@ -335,16 +335,23 @@ python seppuku_eventhandler() {
(bug_open, bug_number) = seppuku_find_bug_report(debug_file, opener, query, product, component, bugname)
print >> debug_file, "Bug is open: %s and bug number: %s" % (bug_open, bug_number)
- # The bug is present and still open, no need to attach an error log
+ # The bug is present and still open, attach an error log
if bug_number and bug_open:
print >> debug_file, "The bug is known as '%s'" % bug_number
+ if file:
+ if not seppuku_create_attachment(debug_file, poster, attach, product, component, bug_number, text, file):
+ print >> debug_file, "Failed to attach the build log for bug #%s" % bug_number
+ else:
+ print >> debug_file, "Created an attachment for '%s' '%s' '%s'" % (product, component, bug_number)
+ else:
+ print >> debug_file, "Not trying to create an attachment for bug #%s" % bug_number
return NotHandled
if bug_number and not bug_open:
if not seppuku_reopen_bug(poster, reopen, product, component, bug_number, bugname, text):
- print >> debug_file, "Failed to reopen the bug report"
+ print >> debug_file, "Failed to reopen the bug #%s" % bug_number
else:
- print >> debug_file, "Reopened the bug report"
+ print >> debug_file, "Reopened the bug #%s" % bug_number
else:
bug_number = seppuku_file_bug(poster, newbug, product, component, bugname, text)
if not bug_number:
@@ -354,11 +361,11 @@ python seppuku_eventhandler() {
if bug_number and file:
if not seppuku_create_attachment(debug_file, poster, attach, product, component, bug_number, text, file):
- print >> debug_file, "Failed to attach the build log"
+ print >> debug_file, "Failed to attach the build log for bug #%" % bug_number
else:
print >> debug_file, "Created an attachment for '%s' '%s' '%s'" % (product, component, bug_number)
else:
- print >> debug_file, "Not trying to create an attachment"
+ print >> debug_file, "Not trying to create an attachment for bug #%" % bug_number
return NotHandled
}
More information about the Openembedded-commits
mailing list