[oe-commits] org.oe.dev merge of '3f5863be74aaf18d9f78fd1e075d3203cc282bdc'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sat Jan 12 16:05:54 UTC 2008
merge of '3f5863be74aaf18d9f78fd1e075d3203cc282bdc'
and 'eaee5612742a446def8bdaaa5b89c3cc8047332e'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 6f59ffce5f3264eb8cb953fab0da8f82277aabfa
ViewMTN: http://monotone.openembedded.org/revision/info/6f59ffce5f3264eb8cb953fab0da8f82277aabfa
Files:
1
packages/xerces-c/xerces-c_2.6.0.bb
packages/xerces-c/xerces-c_2.7.0.bb
packages/dtnrg
packages/dtnrg/dtn_2.5.0.bb
packages/xerces-c/xerces-c_2.8.0.bb
classes/insane.bbclass
conf/machine/include/tune-strongarm.inc
conf/machine/include/tune-strongarm1100.inc
conf/machine/collie.conf
conf/machine/h3600.conf
conf/machine/htcwallaby.conf
conf/machine/jornada56x.conf
conf/machine/jornada7xx.conf
conf/machine/shark.conf
conf/machine/simpad.conf
Diffs:
#
# mt diff -r3f5863be74aaf18d9f78fd1e075d3203cc282bdc -r6f59ffce5f3264eb8cb953fab0da8f82277aabfa
#
#
#
# delete "packages/xerces-c/xerces-c_2.6.0.bb"
#
# delete "packages/xerces-c/xerces-c_2.7.0.bb"
#
# add_dir "packages/dtnrg"
#
# add_file "packages/dtnrg/dtn_2.5.0.bb"
# content [3234e08b19073c6fcc4c69cb16c48bec0ce78bdd]
#
# add_file "packages/xerces-c/xerces-c_2.8.0.bb"
# content [1bd7bf05dbfb2569fe7ca72425698a484c6741fa]
#
# patch "classes/insane.bbclass"
# from [f17809480bc525b37862480d1e30ae135d59385f]
# to [00d6311affb65ec365a80a9b833de2945df35660]
#
============================================================
--- packages/dtnrg/dtn_2.5.0.bb 3234e08b19073c6fcc4c69cb16c48bec0ce78bdd
+++ packages/dtnrg/dtn_2.5.0.bb 3234e08b19073c6fcc4c69cb16c48bec0ce78bdd
@@ -0,0 +1,58 @@
+DESCRIPTION = "Delay Tolerant Networking Package"
+HOMEPAGE = "http://www.dtnrg.org/wiki"
+SECTION = "libs"
+DEPENDS = "db openssl python-native xerces-c"
+LICENSE = "Apache"
+SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz"
+
+inherit autotools
+
+EXTRA_OECONF = "\
+ --with-python=${STAGING_BINDIR_NATIVE}/python \
+ --with-db=${STAGING_DIR} \
+ --with-tcl=${STAGING_DIR} \
+ --without-google-perftools \
+ --without-bluez \
+ --without-bonjour \
+ --with-expat=${STAGING_DIR} \
+ --with-xerces-c=${STAGING_DIR} \
+ --without-tclreadline \
+ --with-zlib=${STAGING_DIR} \
+ --without-xsd-tool \
+ --with-db=${STAGING_DIR} \
+ --enable-ecl \
+ --enable-edp \
+ --without-mysql \
+ --without-postgres \
+ --with-openssl=${STAGING_DIR} \
+"
+
+def 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 ?"
+
+PYTHON_DIR = "${@python_dir(d)}"
+
+export BUILD_SYS
+export HOST_SYS
+
+do_configure_prepend() {
+ for i in aclocal/*.ac oasys/aclocal/*.ac; do
+ install -m 0644 $i ${STAGING_DATADIR}/aclocal/`basename $i`.m4
+ done
+ autotools_do_configure
+}
+
+do_install_append() {
+ cd applib/python
+ INCDIR=../.. LIBDIR=.. VERSION=${PV} python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir}
+}
+
+PACKAGES += "${PN}-python"
+FILES_${PN}-python = "${libdir}/${PYTHON_DIR}"
+RDEPENDS_${PN}-python = "python-core"
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug"
============================================================
--- packages/xerces-c/xerces-c_2.8.0.bb 1bd7bf05dbfb2569fe7ca72425698a484c6741fa
+++ packages/xerces-c/xerces-c_2.8.0.bb 1bd7bf05dbfb2569fe7ca72425698a484c6741fa
@@ -0,0 +1,36 @@
+DESCRIPTION = "Xerces-c is a validating xml parser written in C++"
+HOMEPAGE = "http://xerces.apache.org/xerces-c/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "MIT"
+PR = "r1"
+
+SRC_URI = "http://mirror.serversupportforum.de/apache/xerces/c/sources/xerces-c-src_2_8_0.tar.gz"
+S = "${WORKDIR}/xerces-c-src_2_8_0/src/xercesc"
+
+inherit autotools pkgconfig
+
+CCACHE = ""
+export XERCESCROOT="${WORKDIR}/xerces-c-src_2_8_0"
+export cross_compiling = "yes"
+
+do_configure() {
+ ./runConfigure -plinux -c"${CC}" -x"${CXX}" -minmem -nsocket -tnative -rpthread -P${D}${prefix} \
+ -C--build=${BUILD_SYS} \
+ -C--host=${HOST_SYS} \
+ -C--target=${TARGET_SYS} \
+}
+
+do_compile() {
+ ${MAKE}
+}
+
+do_stage () {
+ oe_libinstall -C ${XERCESCROOT}/lib libxerces-c ${STAGING_LIBDIR}
+ oe_libinstall -C ${XERCESCROOT}/lib libxerces-depdom ${STAGING_LIBDIR}
+ cp -pPR ${XERCESCROOT}/include/xercesc ${STAGING_INCDIR}
+}
+
+do_install () {
+ ${MAKE} install
+}
============================================================
--- classes/insane.bbclass f17809480bc525b37862480d1e30ae135d59385f
+++ classes/insane.bbclass 00d6311affb65ec365a80a9b833de2945df35660
@@ -464,7 +464,6 @@ python do_qa_configure() {
os.path.join(root,"config.log")
if "config.log" in files:
if os.system(statement) == 0:
- bb.fatal("This autoconf log indicates errors, it looked at \
- host includes. Rerun configure task after fixing this. \
- Path was '%s'" % root)
+ bb.fatal("""This autoconf log indicates errors, it looked at host includes.
+Rerun configure task after fixing this. The path was '%s'""" % root)
}
#
# mt diff -reaee5612742a446def8bdaaa5b89c3cc8047332e -r6f59ffce5f3264eb8cb953fab0da8f82277aabfa
#
#
#
# rename "conf/machine/include/tune-strongarm.inc"
# to "conf/machine/include/tune-strongarm1100.inc"
#
# patch "conf/machine/collie.conf"
# from [8ec2568fe9cb9c9b5580adf5e26eb873400e040c]
# to [a0553e914a9461a2f8f27c4cf8972dcebb056d0d]
#
# patch "conf/machine/h3600.conf"
# from [baccbbb3fd46dea023ff7dc49ac173b169688428]
# to [946b47e617dd5bb30df3ee547902b05861e89f5b]
#
# patch "conf/machine/htcwallaby.conf"
# from [f536aa7626c709ec12492ce50cec7af6c4062a8c]
# to [d6588b12e47e4671574a6a9f611ca56ed3e54a66]
#
# patch "conf/machine/include/tune-strongarm1100.inc"
# from [4bb1dc721e55061bb98b49bae4f57bd4ff088f02]
# to [6b646008e17bfa06b0b28e48fd811701e7f4ea78]
#
# patch "conf/machine/jornada56x.conf"
# from [feef2730324948026b5302d47b01bae79fa6bc39]
# to [6e67e41a8cb53163822499066dcf76e2ed17c3eb]
#
# patch "conf/machine/jornada7xx.conf"
# from [931f12408f78e84eaafc92103fd2590493bcd246]
# to [b8d6ade022066bbe05995a96ff6dc4c32bb0c5ac]
#
# patch "conf/machine/shark.conf"
# from [8a744b9daf9db02c05297d317225e9f6d6cb012e]
# to [45f471879704cfba13dd30daae06942e7bdd6716]
#
# patch "conf/machine/simpad.conf"
# from [9987d298771d159fd85308e85bdb5a82fd16832d]
# to [b9316853a8b1c9a28a1c4df96b4166a416335cc3]
#
============================================================
--- conf/machine/collie.conf 8ec2568fe9cb9c9b5580adf5e26eb873400e040c
+++ conf/machine/collie.conf a0553e914a9461a2f8f27c4cf8972dcebb056d0d
@@ -1,8 +1,9 @@ TARGET_ARCH = "arm"
#@TYPE: Machine
#@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500
#@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
TARGET_ARCH = "arm"
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110"
MACHINE_KERNEL_VERSION ?= "2.6"
require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc
@@ -13,13 +14,9 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 -
MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
IMAGE_LINGUAS = ""
-
IMAGE_FSTYPES ?= "jffs2 tar.gz"
-require conf/machine/include/tune-strongarm.inc
-
ROOT_FLASH_SIZE = "14"
# actually 14680064, see EXTRA_IMAGECMD above
============================================================
--- conf/machine/h3600.conf baccbbb3fd46dea023ff7dc49ac173b169688428
+++ conf/machine/h3600.conf 946b47e617dd5bb30df3ee547902b05861e89f5b
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 "
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 "
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
# h3700, h3800 have 32, but let that be the bonus
ROOT_FLASH_SIZE = "16"
============================================================
--- conf/machine/htcwallaby.conf f536aa7626c709ec12492ce50cec7af6c4062a8c
+++ conf/machine/htcwallaby.conf d6588b12e47e4671574a6a9f611ca56ed3e54a66
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 "
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 "
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
ROOT_FLASH_SIZE = "16"
VOLATILE_STORAGE_SIZE = "32"
============================================================
--- conf/machine/include/tune-strongarm.inc 4bb1dc721e55061bb98b49bae4f57bd4ff088f02
+++ conf/machine/include/tune-strongarm1100.inc 6b646008e17bfa06b0b28e48fd811701e7f4ea78
@@ -1,2 +1,5 @@
-TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
+# This machine lists common configuration options for Strongarm 1100 devices
+# NOTE: The Zaurus Collie also has a Strongarm processor, but uses the 1110 type
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1100"
+
============================================================
--- conf/machine/jornada56x.conf feef2730324948026b5302d47b01bae79fa6bc39
+++ conf/machine/jornada56x.conf 6e67e41a8cb53163822499066dcf76e2ed17c3eb
@@ -12,4 +12,4 @@ SERIAL_CONSOLE = "115200 ttySA0"
SERIAL_CONSOLE = "115200 ttySA0"
+require conf/machine/include/tune-strongarm1100.inc
-require conf/machine/include/tune-strongarm.inc
============================================================
--- conf/machine/jornada7xx.conf 931f12408f78e84eaafc92103fd2590493bcd246
+++ conf/machine/jornada7xx.conf b8d6ade022066bbe05995a96ff6dc4c32bb0c5ac
@@ -1,10 +1,10 @@ TARGET_ARCH = "arm"
#@TYPE: Machine
#@NAME: HP Jornada 7xx
#@DESCRIPTION: Machine configuration for the SA1100 based HP Jornada 7xx palmtop computer
TARGET_ARCH = "arm"
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
PCMCIA_MANAGER = "pcmciautils"
============================================================
--- conf/machine/shark.conf 8a744b9daf9db02c05297d317225e9f6d6cb012e
+++ conf/machine/shark.conf 45f471879704cfba13dd30daae06942e7bdd6716
@@ -15,7 +15,7 @@ USE_VT = "0"
ROOT_FLASH_SIZE = "16"
USE_VT = "0"
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2"
MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay "
============================================================
--- conf/machine/simpad.conf 9987d298771d159fd85308e85bdb5a82fd16832d
+++ conf/machine/simpad.conf b9316853a8b1c9a28a1c4df96b4166a416335cc3
@@ -9,7 +9,7 @@ include conf/machine/include/simpad-${MA
MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat"
include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
ROOT_FLASH_SIZE = "16"
More information about the Openembedded-commits
mailing list