[oe-commits] org.oe.dev merge of '33469de643b1cad4022de73b7ce97d808320e465'

[rwhitby commit]

merge of '33469de643b1cad4022de73b7ce97d808320e465'
     and 'f012bf85fd4c2065b5824f7a0b63bb0a53cccb06'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: ec01e0c78ffcdc76ef82237a3a6b83669857d863
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ec01e0c78ffcdc76ef82237a3a6b83669857d863
Files:
1
packages/apex/apex-env_1.5.8.bb
classes/nslu2-image.bbclass
packages/libxml/libxml2-native_2.6.10.bb
packages/libxml/libxml2-native_2.6.26.bb
packages/libxml/libxml2-native_2.6.9.bb
packages/libxml/libxml2_2.6.22.bb
packages/libxml/libxml2_2.6.26.bb
packages/clamav/clamav_0.91.1.bb
packages/libxml/libxml2-native_2.6.29.bb
packages/tasks/task-python-everything.bb
Diffs:

#
# mt diff -r33469de643b1cad4022de73b7ce97d808320e465 -rec01e0c78ffcdc76ef82237a3a6b83669857d863
#
# 
# 
# add_file "packages/apex/apex-env_1.5.8.bb"
#  content [fdbc0b6132572b780b950c96db6cdd6c7f609f7d]
# 
# patch "classes/nslu2-image.bbclass"
#  from [71b86c06661e4410945f4c6b9f042c09710e689b]
#    to [a75b47c6e523125efc0f292c13f24e2059a58125]
# 
============================================================
--- packages/apex/apex-env_1.5.8.bb	fdbc0b6132572b780b950c96db6cdd6c7f609f7d
+++ packages/apex/apex-env_1.5.8.bb	fdbc0b6132572b780b950c96db6cdd6c7f609f7d
@@ -0,0 +1,22 @@
+DESCRIPTION = "APEX Boot Loader Environment User Modification Tool"
+SECTION = "util"
+PRIORITY = "optional"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+# PR = "r1"
+
+SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz"
+S = ${WORKDIR}/apex-${PV}/usr
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
+
+oe_runmake() {
+	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@"
+	make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
+}
+
+do_install() {
+	${STRIP} ${S}/apex-env
+	install -d ${D}/${sbindir}
+	install -m 755 ${S}/apex-env ${D}/${sbindir}
+}
============================================================
--- classes/nslu2-image.bbclass	71b86c06661e4410945f4c6b9f042c09710e689b
+++ classes/nslu2-image.bbclass	a75b47c6e523125efc0f292c13f24e2059a58125
@@ -6,7 +6,7 @@ nslu2_pack_image () {
 			${STAGING_LOADER_DIR}/apex-nslu2.bin \
 			${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin \
 			${DEPLOY_DIR_IMAGE}/slug/
-	install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${SITEINFO_ENDIANESS} \
+	install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-ixp4xx${SITEINFO_ENDIANESS} \
 		${DEPLOY_DIR_IMAGE}/slug/vmlinuz
 	install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 		${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2


#
# mt diff -rf012bf85fd4c2065b5824f7a0b63bb0a53cccb06 -rec01e0c78ffcdc76ef82237a3a6b83669857d863
#
# 
# 
# delete "packages/libxml/libxml2-native_2.6.10.bb"
# 
# delete "packages/libxml/libxml2-native_2.6.26.bb"
# 
# delete "packages/libxml/libxml2-native_2.6.9.bb"
# 
# delete "packages/libxml/libxml2_2.6.22.bb"
# 
# delete "packages/libxml/libxml2_2.6.26.bb"
# 
# patch "packages/clamav/clamav_0.91.1.bb"
#  from [7c3791a3534fbc04fac0dbd2e2bee620df48358f]
#    to [8b79a2eecd9cb5b4ec025d27710997610b1ac8c9]
# 
# patch "packages/libxml/libxml2-native_2.6.29.bb"
#  from [a076be1d91dc524628f265be229c0bd8108a0a6a]
#    to [0b126ddc4ebc9a5029e2d23e95faa5baa2c4b05b]
# 
# patch "packages/tasks/task-python-everything.bb"
#  from [3e98f2dd27cca9f4768b4faf85221eb01df5b725]
#    to [3da11e0123ff22657bf159c34f7cc113db67db51]
# 
============================================================
--- packages/clamav/clamav_0.91.1.bb	7c3791a3534fbc04fac0dbd2e2bee620df48358f
+++ packages/clamav/clamav_0.91.1.bb	8b79a2eecd9cb5b4ec025d27710997610b1ac8c9
@@ -1,5 +1,3 @@
-DEFAULT_PREFERENCE = "-1"
-
 require clamav.inc
 
 PR = "r0"
============================================================
--- packages/libxml/libxml2-native_2.6.29.bb	a076be1d91dc524628f265be229c0bd8108a0a6a
+++ packages/libxml/libxml2-native_2.6.29.bb	0b126ddc4ebc9a5029e2d23e95faa5baa2c4b05b
@@ -1,17 +1,24 @@ DESCRIPTION = "GNOME XML library"
 DESCRIPTION = "GNOME XML library"
-PR = "r1"
-
-SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
-
 DEPENDS = "python-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
+PR = "r3"
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}"
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz"
 S = "${WORKDIR}/libxml2-${PV}"
 
 inherit autotools native pkgconfig
 
-EXTRA_OECONF = "--with-python=${STAGING_INCDIR}/python2.4 --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
+def libxml2_native_python_dir(d):
+        import os, bb
+        staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
+        if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5"
+        if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4"
+        if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3"
+        raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
 
+EXTRA_OECONF = "--with-python=${STAGING_INCDIR}/${@libxml2_native_python_dir(d)} \
+                --without-debug --without-legacy --without-catalog --without-docbook --with-c14n"
+
 do_stage () {
 	oe_runmake install
 }
============================================================
--- packages/tasks/task-python-everything.bb	3e98f2dd27cca9f4768b4faf85221eb01df5b725
+++ packages/tasks/task-python-everything.bb	3da11e0123ff22657bf159c34f7cc113db67db51
@@ -1,12 +1,10 @@ LICENSE = "MIT"
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml15"
+PR = "ml17"
 
 RDEPENDS = "\
 		python-ao 		\
-		python-pybluez		\
-		python-cairo		\
 		python-cheetah		\
 		python-constraint	\
 		python-crypto		\
@@ -40,6 +38,7 @@ RDEPENDS = "\
 		python-ogg		\
 		python-pexpect		\
 		python-pybluez		\
+		python-pycairo		\
 		python-pychecker	\
 		python-pycodes		\
 		python-pyephem		\
@@ -54,6 +53,7 @@ RDEPENDS = "\
 		python-pyiw		\
 		python-pylinda		\
 		python-pylint		\
+		python-pyode		\
 		python-pyraf		\
 		python-pyreverse	\
 		python-pyrex		\