diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-03 10:51:42 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-03 10:51:42 +0200 |
| commit | d25647f18dbc1b71ffc8d76c2d8437856351d894 (patch) | |
| tree | c8d0a47a8629fdf492f16764864e79f1348345fb | |
| parent | 87e71a8da123ca7af82ad467fa8038b9a157c2b2 (diff) | |
| parent | 6db30a40ce4e47ae176ec251aec62cb6c03f7ca2 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
82 files changed, 562 insertions, 152 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 9c51c0a08e..ef6c0abf8f 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -216,6 +216,9 @@ def base_package_name(d): pn = pn[0:-8] elif pn.endswith("-intermediate"): pn = pn[0:-13] + elif pn.endswith("-sdk"): + pn = pn[0:-4] + return pn diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index ef16669c3d..b4987608ed 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -485,6 +485,29 @@ do_sizecheck() { addtask sizecheck before do_install after do_compile +do_uboot_mkimage() { + if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then + ENTRYPOINT=${UBOOT_ENTRYPOINT} + if test -n "${UBOOT_ENTRYSYMBOL}"; then + ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \ + awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'` + fi + if test -e arch/${ARCH}/boot/compressed/vmlinux ; then + ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin + uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage + rm -f linux.bin + else + ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin + rm -f linux.bin.gz + gzip -9 linux.bin + uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage + rm -f linux.bin.gz + fi + fi +} + +addtask uboot_mkimage before do_install after do_compile + KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}" KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}" @@ -497,21 +520,6 @@ do_deploy() { tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib fi - if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then - if test -e arch/${ARCH}/boot/compressed/vmlinux ; then - ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin - uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin - rm -f linux.bin - else - ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin - rm -f linux.bin.gz - gzip -9 linux.bin - uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin - rm -f linux.bin.gz - fi - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin - fi - cd ${DEPLOY_DIR_IMAGE} rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin diff --git a/conf/checksums.ini b/conf/checksums.ini index 4bb80c147f..12f0c99f4c 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -13054,9 +13054,9 @@ sha256=bd518b930f76c976bf693c247f0742d88808c776a2aeb51ab7830dedb0eb692d md5=308e5746a2d0804be1d638319ad7b9c0 sha256=bd518b930f76c976bf693c247f0742d88808c776a2aeb51ab7830dedb0eb692d -[http://downloads.sourceforge.net/libdbi/libdbi-0.8.2.tar.gz] -md5=e5b5aa098ac35e7cb921edcf8b77a865 -sha256=8d3cc69f8afc0386afdaeaab2b3558b2a4fe9a54c440dac34e3b9206d376f407 +[http://downloads.sourceforge.net/libdbi/libdbi-0.8.3.tar.gz] +md5=ca66db78d479cbfa727cf3245b5864ae +sha256=72e41856bebb1da7b1fd1e6369358c294913f329c5e594e338b3983e6369a5e3 [http://downloads.sourceforge.net/libdbi-drivers/libdbi-drivers-0.7.1.tar.gz] md5=f11020119ceb7a6dee3969cb0589d4bc @@ -13066,6 +13066,10 @@ sha256=5ae76aff042249750437ab7e490ae7d9e19a10f0005cd9bb525106365998aca8 md5=f11020119ceb7a6dee3969cb0589d4bc sha256=5ae76aff042249750437ab7e490ae7d9e19a10f0005cd9bb525106365998aca8 +[http://downloads.sourceforge.net/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz] +md5=4de79b323162a5a7652b65b608eca6cd +sha256=4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72 + [http://nchipin.kos.to/libddmpeg/libddmpeg_1.5.orig.tar.gz] md5=89e59638d31384987d912741986398b6 sha256=9422e73c55aa921fbbce06e5e01bba0b98bb7a0f1640c27cfd307c290dba792c @@ -14070,10 +14074,14 @@ sha256=4bd54929a80850754f27b568d7891e1e3e1b8d2f208d371f27d1fda09e6f12a8 md5=dfbe478c4d4e9bf8e450c7349e104e2a sha256=f7e11c6137a1628d63985799ebcb78577832fca3ca4aeb2fc53d0e667cf699c0 -[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.2.tar.gz] +[http://www.autistici.org/bakunin/libmrss/libmrss-0.17.2.tar.gz] md5=54935c6cff42df2f1daada267b701392 sha256=18f0e2df191219c29b47dc12b4b06b5be7eaeef34b3436156547e5a9f4eb51c1 +[http://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz] +md5=a6f66b72898d27270e3a68007f90d62b +sha256=071416adcae5c1a9317a4a313f2deb34667e3cc2be4487fb3076528ce45b210b + [http://gpephone.linuxtogo.org/download/gpephone/libmsgenabler-1.0/libmsgenabler-1.0.tar.bz2] md5=32f04482d3905f05a4f36ac946e7f95d sha256=c8568dbd5d3ffa200bf81ffbc7baf94902b41998d5c65455a1fbadce15db9953 @@ -14186,10 +14194,14 @@ sha256=424d12aae7a6ea8c90438cf4ccff486dc01a3a2a7b68eb602ee2b8c28178b6d1 md5=a547da766fccacd00fd05190baf644da sha256=54f316f530caaacd55dc23f546537759382a45ac6378ead249b5a5d51cf4db52 -[http://www2.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz] +[http://www.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz] md5=85b6a42a9e17a23c01b2f2ed0ece0563 sha256=6154872089834b0ffd34e92612d07e2d1ccec572698bd861da752eeeaab7ca78 +[http://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz] +md5=857f43970e7f0724d28f4ddc87085daf +sha256=0f9460e3ba16b347001caf6843f0050f5482e36ebcb307f709259fd6575aa547 + [http://www.vorbis.com/files/1.0/unix/libogg-1.0.tar.gz] md5=382a7089f42e6f82e7d658c1cb8ee236 sha256=920fa2a0924d66884825d36a2e843de069cfdf1af01945d05da25999bbd6396c @@ -17154,6 +17166,10 @@ sha256=44fc0eddf56c0abe861190051fceec6e223122c5835967459c69fbf98ee52067 md5=a311545a0003f1a599297d57e4e27916 sha256=4cf6094f64f3446e83b968cbee3f0ed5d579b635644dd8cbd51bbbe184446600 +[http://ftp.novell.com/pub/mono/sources/mono/mono-2.4.2.3.tar.bz2] +md5=696f25afc8453cd0d1c78de6e905dcf2 +sha256=1bab0d4e2906c88736ff5e242f2905f4c3535ccfc05bb5c427b72adf0e9236ae + [http://venge.net/monotone/downloads/monotone-0.20.tar.gz] md5=3bdf4da35ff576a401483815952f4045 sha256=56a5c5afd838f90146205ee4769b83988c6bafc85826c0fbcad982f1e0333d93 @@ -21418,6 +21434,10 @@ sha256=a98cb1d9903192c4fcf40d82c705e091a5c193f87327703217749a5f4cc6197d md5=4e855372c4a533b9ed605503156e6e04 sha256=3dbd653b27fc855bf86dfe0ac06ed9bf59c8b85c9bcb4b5488528b30c59970f4 +[http://www.vanheusden.com/rsstail/rsstail-1.5.tgz] +md5=1558fc8b0c9a8cb79e421f783f1ffc40 +sha256=242b3d5807e7bd753531fb836395afe18efe948174ea1ae54a4b7baba7a058fe + [http://www.claws-mail.org/downloads/plugins/rssyl-0.10.tar.gz] md5=01a123319f2a32ecff7e560b95c2e4df sha256=d6bfdee4fd31c0e0089c6edab594eefaa5b7b95f0b783f1156dffadf1a90d820 @@ -23534,6 +23554,10 @@ sha256=0da9424503faad972860682107157d7348872f00f932ec270c78f17ee495dc97 md5=5396e8d279b5140e86113c80abc041ad sha256=2e6a535ba29d06337daf22ae12e17cbe10e70de95134ebd7b6e8a6838e3ca5a0 +[http://limpens.net/trac/at91-kit-trac/export/4/trunk/sources/tinylogin-1.4.tar.bz2] +md5=44da0ff2b727455669890b24305e351d +sha256=5e542e4b7825305a3678bf73136c392feb0d44b8bbf926e8eda5453eea7ddd6b + [http://tinylogin.busybox.net/downloads/tinylogin-1.4.tar.bz2] md5=44da0ff2b727455669890b24305e351d sha256=5e542e4b7825305a3678bf73136c392feb0d44b8bbf926e8eda5453eea7ddd6b @@ -24166,6 +24190,10 @@ sha256=4605f3f0001afd3af91ffb554dfd65c5cd313b6b9ada52ae8b2efdccf894cfa2 md5=06966791546a7b40a2b0139fba552cb0 sha256=f53533b44a9c17972aff6ac7047c6ac1e2e5e2930254eccdb1239678a6dd1793 +[http://downloads.sourceforge.net/project/infozip/UnZip%205.x%20and%20earlier/5.52/unzip552.tar.gz] +md5=9d23919999d6eac9217d1f41472034a9 +sha256=145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9 + [http://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz] md5=9d23919999d6eac9217d1f41472034a9 sha256=145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9 diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index b6da1cc1e8..586bbc172a 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -249,8 +249,6 @@ SRCREV_pn-toscoterm ?= "f02add76f365a2fecd2dbefc230ceaab20244f96" SRCREV_pn-u-boot-bug ?= "8674" SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" -SRCREV_pn-uclibc ?= "25712" -SRCREV_pn-uclibc-initial ?= "25712" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8" @@ -268,7 +266,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "41038" +EFL_SRCREV ?= "41533" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 8b834d0f4a..9212aa1d12 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -93,6 +93,7 @@ PREFERRED_PROVIDER_virtual/db = "db3" PREFERRED_PROVIDER_virtual/db-native = "db3-native" PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" ############################################################################# # PREFERRED VERSIONS diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc index 1e639fc342..facd7a231a 100644 --- a/recipes/efl1/ecore.inc +++ b/recipes/efl1/ecore.inc @@ -27,6 +27,27 @@ PACKAGES =+ "\ ${PN}-x \ ${PN}-input \ " +# Some upgrade path tweaking +AUTO_LIBNAME_PKGS = "" + +RREPLACES_${PN} = "libecore-ver-pre-svn-00-0 libecore-ver-pre-svn-01-0" +REPLACES_${PN}-tests = "libecore-ver-pre-svn-01-tests" +RREPLACES_${PN}-con = "libecore-ver-pre-svn-01-con libecore-con-ver-pre-svn-01-0" +RREPLACES_${PN}-config = "libecore-config-ver-pre-svn-01-0" +RREPLACES_${PN}-desktop = "libecore-desktop-ver-pre-svn-01-0" +RREPLACES_${PN}-directfb = "libecore-directfb-ver-pre-svn-01-0" +RREPLACES_${PN}-sdl = "libecore-sdl-ver-pre-svn-01-0" +RREPLACES_${PN}-evas = "libecore-evas-ver-pre-svn-01-0" +RREPLACES_${PN}-fb = "libecore-fb-ver-pre-svn-01-0" +RREPLACES_${PN}-file = "libecore-file-ver-pre-svn-01-0" +RREPLACES_${PN}-imf-evas = "libecore-imf-evas-ver-pre-svn-01-0" +RREPLACES_${PN}-imf = "libecore-imf-ver-pre-svn-01-0" +RREPLACES_${PN}-ipc = "libecore-ipc-ver-pre-svn-01-0" +RREPLACES_${PN}-job = "libecore-job-ver-pre-svn-01-0" +RREPLACES_${PN}-txt = "libecore-txt-ver-pre-svn-01-0" +RREPLACES_${PN}-x = "libecore-x-ver-pre-svn-01-0" +RREPLACES_${PN}-input = "libecore-input-ver-pre-svn-01-0" + FILES_${PN} = "${libdir}/libecore*.so.*" FILES_${PN}-con = "${libdir}/libecore_con*.so.*" FILES_${PN}-config = "${libdir}/libecore_config*.so.*" @@ -43,3 +64,6 @@ FILES_${PN}-job = "${libdir}/libecore_job*.so.*" FILES_${PN}-txt = "${libdir}/libecore_txt*.so.*" FILES_${PN}-x = "${libdir}/libecore_x*.so.*" FILES_${PN}-input = "${libdir}/libecore_input*.so.*" + + + diff --git a/recipes/efl1/edje_svn.bb b/recipes/efl1/edje_svn.bb index 2509c859c7..7f94b08256 100644 --- a/recipes/efl1/edje_svn.bb +++ b/recipes/efl1/edje_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" DEPENDS = "eet evas ecore embryo edje-native" LICENSE = "MIT BSD" PV = "0.9.92.060+svnr${SRCREV}" -PR = "r3" +PR = "r4" inherit efl @@ -20,6 +20,11 @@ RRECOMMENDS_${PN}-utils = "\ " DEBIAN_NOAUTONAME_${PN}-utils = "1" +# Some upgrade path tweaking +AUTO_LIBNAME_PKGS = "" + +RREPLACES_${PN} = "libedje-ver-pre-svn-00-0 libedje-ver-pre-svn-01-0" + FILES_${PN}-utils = "\ ${bindir}/edje_* \ ${datadir}/edje/include/edje.inc \ diff --git a/recipes/efl1/embryo_svn.bb b/recipes/efl1/embryo_svn.bb index aeceb5abe4..222d85a7cb 100644 --- a/recipes/efl1/embryo_svn.bb +++ b/recipes/efl1/embryo_svn.bb @@ -1,9 +1,14 @@ DESCRIPTION = "The Enlightenment C-like scripting language for Edje" LICENSE = "MIT BSD" PV = "0.9.9.060+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit efl -# HACK alert: When compiling for VFP embryo emits bugs -- maybe gcc bug -#FULL_OPTIMIZATION_arm =+ "-O0" +# Some upgrade path tweaking +AUTO_LIBNAME_PKGS = "" + +RREPLACES_${PN} = "libembryo-ver-pre-svn-00-0 libembryo-ver-pre-svn-01-0" + +RREPLACES_${PN}-tests = "libembryo-ver-pre-svn-00-tests libembryo-ver-pre-svn-01-tests" + diff --git a/recipes/efl1/emotion_svn.bb b/recipes/efl1/emotion_svn.bb index 455bc82b18..0f31e667cc 100644 --- a/recipes/efl1/emotion_svn.bb +++ b/recipes/efl1/emotion_svn.bb @@ -3,11 +3,11 @@ LICENSE = "MIT BSD" # we no longer build the libxine backend, since the gstreamer backend seems more promising DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base" PV = "0.1.0.042+svnr${SRCREV}" -PR = "r1" +PR = "r2" inherit efl -EXTRA_OECONF = "--disable-xine --enable-gstreamer" +EXTRA_OECONF = "--disable-xine --enable-gstreamer --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" PACKAGES =+ "emotion-backend-gstreamer" FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so" diff --git a/recipes/gdb/gdb-6.8/gdb-6.8-fix-compile-karmic.patch b/recipes/gdb/gdb-6.8/gdb-6.8-fix-compile-karmic.patch new file mode 100644 index 0000000000..1080b162aa --- /dev/null +++ b/recipes/gdb/gdb-6.8/gdb-6.8-fix-compile-karmic.patch @@ -0,0 +1,22 @@ +fix this on karmic + +cc1: warnings being treated as errors +/home/ich/build/arm/armv5t/tmp/work/i686-armv5te-sdk-oe-linux-gnueabi/gdb-cross-sdk-6.8-r2/gdb-6.8/gdb/eval.c: In function 'evaluate_subexp_standard': +/home/ich/build/arm/armv5t/tmp/work/i686-armv5te-sdk-oe-linux-gnueabi/gdb-cross-sdk-6.8-r2/gdb-6.8/gdb/eval.c:1705: error: 'subscript_array' may be used uninitialized in this function +/home/ich/build/arm/armv5t/tmp/work/i686-armv5te-sdk-oe-linux-gnueabi/gdb-cross-sdk-6.8-r2/gdb-6.8/gdb/eval.c:1644: note: 'subscript_array' was declared here + + + +Index: gdb-6.8/gdb/eval.c +=================================================================== +--- gdb-6.8.orig/gdb/eval.c 2009-08-02 03:25:20.000000000 +0200 ++++ gdb-6.8/gdb/eval.c 2009-08-02 03:53:39.000000000 +0200 +@@ -1656,6 +1656,8 @@ + if (nargs != ndimensions) + error (_("Wrong number of subscripts")); + ++ memset(&subscript_array, 0, sizeof(subscript_array)); ++ + /* Now that we know we have a legal array subscript expression + let us actually find out where this element exists in the array. */ + diff --git a/recipes/gdb/gdb-cross-sdk_6.8.bb b/recipes/gdb/gdb-cross-sdk_6.8.bb index 6aed03d639..66e1454779 100644 --- a/recipes/gdb/gdb-cross-sdk_6.8.bb +++ b/recipes/gdb/gdb-cross-sdk_6.8.bb @@ -1,6 +1,7 @@ require gdb-cross.inc -SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0" +SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \ + file://gdb-6.8-fix-compile-karmic.patch;patch=1" DEPENDS = "ncurses-sdk" diff --git a/recipes/gdb/gdb_6.8.bb b/recipes/gdb/gdb_6.8.bb index afa4286c2e..ff14c0f31f 100644 --- a/recipes/gdb/gdb_6.8.bb +++ b/recipes/gdb/gdb_6.8.bb @@ -1,6 +1,7 @@ require gdb.inc LICENSE = "GPLv3" -SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0" +SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \ + file://gdb-6.8-fix-compile-karmic.patch;patch=1" PR = "r3" diff --git a/recipes/libdbi/libdbi-drivers.inc b/recipes/libdbi/libdbi-drivers.inc new file mode 100644 index 0000000000..b5875eb893 --- /dev/null +++ b/recipes/libdbi/libdbi-drivers.inc @@ -0,0 +1,47 @@ +# libdbi-drivers OE build file +# Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION = "Database Drivers for libdbi" +HOMEPAGE = "http://libdbi-drivers.sourceforge.net/" +LICENSE = "LGPL" +SECTION = "libs" + +PROVIDES = "libdbd-sqlite" +DEPENDS = "libdbi sqlite sqlite3 mysql postgresql" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libdbi-drivers/libdbi-drivers-${PV}.tar.gz" + +inherit autotools + +PACKAGES += "libdbd-sqlite3 libdbd-sqlite libdbd-pgsql libdbd-mysql" + +EXTRA_OECONF = "--with-dbi-incdir=${STAGING_INCDIR} \ + --with-sqlite \ + --with-sqlite3 \ + --with-pgsql \ + --with-mysql \ + --with-sqlite-libdir=${STAGING_LIBDIR} \ + --with-sqlite-incdir=${STAGING_INCDIR} \ + --with-sqlite3-incdir=${STAGING_INCDIR} \ + --with-sqlite3-libdir=${STAGING_LIBDIR} \ + --with-mysql-incdir=${STAGING_INCDIR} \ + --with-mysql-libdir=${STAGING_LIBDIR} \ + --with-pgsql-incdir=${STAGING_INCDIR} \ + --with-pgsql-libdir=${STAGING_LIBDIR}" + +FILES_${PN}-dbg += " ${libdir}/dbd/.debug/*.so" +FILES_${PN}-dev += " ${libdir}/dbd/*.la ${libdir}/dbd/*.a" + +DESCRIPTION_libdbd-sqlite = "SQLite database driver for libdbi" +FILES_libdbd-sqlite = "${libdir}/dbd/libdbdsqlite.so" + +DESCRIPTION_libdbd-sqlite3 = "SQLite3 database driver for libdbi" +FILES_libdbd-sqlite3 = "${libdir}/dbd/libdbdsqlite3.so" + +DESCRIPTION_libdbd-mysql = "MySQL4 database driver for libdbi" +FILES_libdbd-mysql = "${libdir}/dbd/libdbdmysql.so" + +DESCRIPTION_libdbd-psql = "Postgres SQL database driver for libdbi" +FILES_libdbd-pgsql = "${libdir}/dbd/libdbdpgsql.so" + diff --git a/recipes/libdbi/libdbi-drivers_0.7.1.bb b/recipes/libdbi/libdbi-drivers_0.7.1.bb deleted file mode 100644 index eea45ca4bb..0000000000 --- a/recipes/libdbi/libdbi-drivers_0.7.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -# libdbi-drivers OE build file -# Copyright (C) 2005, Koninklijke Philips Electronics NV. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION = "Database Drivers for libdbi" -HOMEPAGE = "http://libdbi-drivers.sourceforge.net/" -LICENSE = "GPLv2" -SECTION = "libs" - -PROVIDES = "libdbd-sqlite" -DEPENDS = "libdbi sqlite" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libdbi-drivers/libdbi-drivers-${PV}.tar.gz" - -inherit autotools - -PACKAGES = "${PN}-dbg libdbd-sqlite ${PN}" - -EXTRA_OECONF = "--with-dbi-incdir=${STAGING_INCDIR} \ - --with-sqlite \ - --with-sqlite-libdir=${STAGING_LIBDIR} \ - --with-sqlite-incdir=${STAGING_INCDIR}" - -FILES_libdbd-sqlite = "/usr/lib/dbd/libsqlite.so \ - /usr/lib/dbd/libsqlite.la \ - /usr/lib/dbd/libsqlite.a" - -DESCRIPTION_libdbd-sqlite = "SQLite database driver for libdbi" - -do_configure_old () { - ./configure \ - --build=${BUILD_SYS} \ - --host=${HOST_SYS} \ - --target=${TARGET_SYS} \ - --prefix=${prefix} \ - --with-sqlite \ - --with-sqlite-libdir=${STAGING_LIBDIR} \ - --with-sqlite-incdir=${STAGING_INCDIR} -} - diff --git a/recipes/libdbi/libdbi-drivers_0.8.3-1.bb b/recipes/libdbi/libdbi-drivers_0.8.3-1.bb new file mode 100644 index 0000000000..efbc61f5c0 --- /dev/null +++ b/recipes/libdbi/libdbi-drivers_0.8.3-1.bb @@ -0,0 +1,2 @@ +require ${PN}.inc +LICENSE = "LGPL" diff --git a/recipes/libdbi/libdbi_0.8.2.bb b/recipes/libdbi/libdbi_0.8.3.bb index bd54419686..bd54419686 100644 --- a/recipes/libdbi/libdbi_0.8.2.bb +++ b/recipes/libdbi/libdbi_0.8.3.bb diff --git a/recipes/libmrss/libmrss.inc b/recipes/libmrss/libmrss.inc new file mode 100644 index 0000000000..de4b705502 --- /dev/null +++ b/recipes/libmrss/libmrss.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "mRSS is a C library for parsing, writing and creating RSS (0.91, 0.92, 1.0, 2.0) files or streams" +LICENSE = "LGPL" +HOMEPAGE = "http://www.autistici.org/bakunin/libmrss/" + +DEPENDS = "libnxml curl" +INC_PR = "r1" + +inherit autotools pkgconfig + +SRC_URI = "http://www.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz \ + " + +do_stage() { + autotools_stage_all +} diff --git a/recipes/libmrss/libmrss_0.17.2.bb b/recipes/libmrss/libmrss_0.17.2.bb index f536468479..38fb2997b0 100644 --- a/recipes/libmrss/libmrss_0.17.2.bb +++ b/recipes/libmrss/libmrss_0.17.2.bb @@ -1,15 +1,6 @@ -DESCRIPTION = "mRSS is a C library for parsing, writing and creating RSS (0.91, 0.92, 1.0, 2.0) files or streams" -LICENSE = "LGPL" -HOMEPAGE = "http://www2.autistici.org/bakunin/codes.php" +require libmrss.inc -DEPENDS = "libnxml curl" -PR = "r1" +PR = "${INC_PR}.2" -inherit autotools pkgconfig +SRC_URI += "file://better-parse-url-r0.patch;patch=1" -SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz \ - file://better-parse-url-r0.patch;patch=1 " - -do_stage() { - autotools_stage_all -} diff --git a/recipes/libmrss/libmrss_0.19.2.bb b/recipes/libmrss/libmrss_0.19.2.bb new file mode 100644 index 0000000000..ce978432b6 --- /dev/null +++ b/recipes/libmrss/libmrss_0.19.2.bb @@ -0,0 +1,7 @@ +require libmrss.inc + +# this version misses the patch applied to 0.17.2 - needs patch rebase +DEFAULT_PREFERENCE = "-1" + +PR = "${INC_PR}.1" + diff --git a/recipes/libnxml/libnxml.inc b/recipes/libnxml/libnxml.inc new file mode 100644 index 0000000000..7a777dab1a --- /dev/null +++ b/recipes/libnxml/libnxml.inc @@ -0,0 +1,15 @@ +HOMEPAGE = "http://www2.autistici.org/bakunin/codes.php" +DESCRIPTION = "nXML is a C library for parsing, writing and creating XML 1.0 and 1.1 files or streams. It supports utf-8, utf-16be and utf-16le, ucs-4 (1234, 4321, 2143, 2312)" +LICENSE = "LGPL" + +DEPENDS = "curl" + +INC_PR = "r0" + +inherit autotools pkgconfig + +SRC_URI = "http://www.autistici.org/bakunin/libnxml/libnxml-${PV}.tar.gz" + +do_stage() { + autotools_stage_all +} diff --git a/recipes/libnxml/libnxml_0.16.bb b/recipes/libnxml/libnxml_0.16.bb index 6f836d226d..b233795023 100644 --- a/recipes/libnxml/libnxml_0.16.bb +++ b/recipes/libnxml/libnxml_0.16.bb @@ -1,14 +1,4 @@ -HOMEPAGE = "http://www2.autistici.org/bakunin/codes.php" -DESCRIPTION = "nXML is a C library for parsing, writing and creating XML 1.0 and 1.1 files or streams. It supports utf-8, utf-16be and utf-16le, ucs-4 (1234, 4321, 2143, 2312)" -LICENSE = "LGPL" +require libnxml.inc -DEPENDS = "curl" +PR = "${INC_PR}.0" -inherit autotools pkgconfig - -SRC_URI = "http://www2.autistici.org/bakunin/libnxml/libnxml-${PV}.tar.gz" - - -do_stage() { - autotools_stage_all -} diff --git a/recipes/libnxml/libnxml_0.18.3.bb b/recipes/libnxml/libnxml_0.18.3.bb new file mode 100644 index 0000000000..b233795023 --- /dev/null +++ b/recipes/libnxml/libnxml_0.18.3.bb @@ -0,0 +1,4 @@ +require libnxml.inc + +PR = "${INC_PR}.0" + diff --git a/recipes/libtool/libtool_2.2.6a.bb b/recipes/libtool/libtool_2.2.6a.bb index 6c8766002a..3eb2080f2f 100644 --- a/recipes/libtool/libtool_2.2.6a.bb +++ b/recipes/libtool/libtool_2.2.6a.bb @@ -1,5 +1,7 @@ require libtool.inc -PR = "r1" +PR = "r2" + +DEFAULT_PREFERENCE = "-1" SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz" S = "${WORKDIR}/${BPN}-2.2.6" @@ -17,7 +19,7 @@ EXTRA_AUTORECONF = "--exclude=libtoolize" do_configure_prepend () { # Skip this for native build: if test -n "$CONFIG_SITE" ; then - export ac_cv_path_SED="${ac_cv_path_GREP=/bin/sed}" + export ac_cv_path_SED="${ac_cv_path_SED=/bin/sed}" export ac_cv_path_GREP="${ac_cv_path_GREP=/bin/grep}" export ac_cv_path_EGREP="${ac_cv_path_EGREP=/bin/grep -E}" export ac_cv_path_FGREP="${ac_cv_path_FGREP=/bin/grep -F}" diff --git a/recipes/linux/linux.inc b/recipes/linux/linux.inc index 96feba642f..3dbb1ecb40 100644 --- a/recipes/linux/linux.inc +++ b/recipes/linux/linux.inc @@ -158,22 +158,6 @@ do_configure_append() { fi } -do_compile_append() { - if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then - if test -e arch/${ARCH}/boot/compressed/vmlinux ; then - ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin - uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage - rm -f linux.bin - else - ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin - rm -f linux.bin.gz - gzip -9 linux.bin - uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage - rm -f linux.bin.gz - fi - fi -} - do_devicetree_image() { if test -n "${KERNEL_DEVICETREE}" ; then dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree ${KERNEL_DEVICETREE} diff --git a/recipes/meta/meta-toolchain-qte.bb b/recipes/meta/meta-toolchain-qte.bb index 49ed35ee0f..70c4087211 100644 --- a/recipes/meta/meta-toolchain-qte.bb +++ b/recipes/meta/meta-toolchain-qte.bb @@ -1,11 +1,12 @@ # Qt Embedded toolchain - -require meta-toolchain.bb - +PR = "r1" TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host" TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target" +require meta-toolchain.bb SDK_SUFFIX = "toolchain-qte" + + QT_DIR_NAME = "qtopia" do_populate_sdk_append() { diff --git a/recipes/mono/mono-2.4.2.3/0001-remove-docs-dir-from-build.patch b/recipes/mono/mono-2.4.2.3/0001-remove-docs-dir-from-build.patch new file mode 100644 index 0000000000..4e276e3f0c --- /dev/null +++ b/recipes/mono/mono-2.4.2.3/0001-remove-docs-dir-from-build.patch @@ -0,0 +1,30 @@ +From 2ca04d7b2af1f1d690d918da047b03de768f1a8b Mon Sep 17 00:00:00 2001 +From: Cliff Brake <cbrake@bec-systems.com> +Date: Fri, 31 Jul 2009 17:48:47 -0400 +Subject: [PATCH] remove docs dir from build + +--- + Makefile.am | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 083bb82..386ed91 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,11 +1,11 @@ + AUTOMAKE_OPTIONS = foreign + ACLOCAL_AMFLAGS = -I . + +-SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc docs ++SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc + + # Keep in sync with SUBDIRS + ## 'tools' is not normally built +-DIST_SUBDIRS = po libgc $(eglib_dir) mono ikvm-native support data runtime scripts man samples web tools msvc docs ++DIST_SUBDIRS = po libgc $(eglib_dir) mono ikvm-native support data runtime scripts man samples web tools msvc + + EXTRA_DIST= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in build-mingw32.sh LICENSE mkinstalldirs + +-- +1.6.0.4 + diff --git a/recipes/mono/mono-2.4.2.3/configure.patch b/recipes/mono/mono-2.4.2.3/configure.patch new file mode 100644 index 0000000000..7ca874ab07 --- /dev/null +++ b/recipes/mono/mono-2.4.2.3/configure.patch @@ -0,0 +1,44 @@ +Index: mono-2.4.2.1/configure.in +=================================================================== +--- mono-2.4.2.1.orig/configure.in 2008-11-13 18:22:29.000000000 -0500 ++++ mono-2.4.2.1/configure.in 2008-12-10 16:03:11.000000000 -0500 +@@ -1155,6 +1155,8 @@ + ], [ + AC_MSG_RESULT(no) + with_tls=pthread ++ ], [ ++ AC_MSG_RESULT(yes) + ]) + fi + +@@ -1257,6 +1259,9 @@ + ], [ + with_sigaltstack=no + AC_MSG_RESULT(no) ++ ], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_WORKING_SIGALTSTACK) + ]) + fi + +@@ -1746,6 +1751,7 @@ + + jit_wanted=false + interp_wanted=false ++echo "CLIFF: checking host = $host" + case "$host" in + # mips-sgi-irix5.* | mips-sgi-irix6.*) + # TARGET=MIPS; +@@ -1882,10 +1888,12 @@ + jit_wanted=true + ;; + arm*-linux*) ++ echo "CLIFF: found arm linux" + TARGET=ARM; + arch_target=arm; + ACCESS_UNALIGNED="no" + JIT_SUPPORTED=yes ++ CPPFLAGS="$CPPFLAGS -DARM_FPU_VFP=1" + jit_wanted=true + ;; + s390-*-linux*) diff --git a/recipes/mono/mono-2.4.2.3/mini-arm.patch b/recipes/mono/mono-2.4.2.3/mini-arm.patch new file mode 100644 index 0000000000..d517a5a276 --- /dev/null +++ b/recipes/mono/mono-2.4.2.3/mini-arm.patch @@ -0,0 +1,11 @@ +--- mono-2.4.2.1/mono/mini/mini-arm.h 2009-06-23 09:41:00.000000000 -0600 ++++ mono-2.4.2.1/mono/mini/mini-arm.h 2009-06-23 09:40:27.000000000 -0600 +@@ -9,7 +9,7 @@ + #endif + + #ifdef ARM_FPU_VFP +-#error "VFP support is not complete, try mono SVN for that." ++//#error "VFP support is not complete, try mono SVN for that." + #endif + + #if defined(__ARM_EABI__) diff --git a/recipes/mono/mono-mcs-intermediate_2.4.2.3.bb b/recipes/mono/mono-mcs-intermediate_2.4.2.3.bb new file mode 100644 index 0000000000..258f812602 --- /dev/null +++ b/recipes/mono/mono-mcs-intermediate_2.4.2.3.bb @@ -0,0 +1,17 @@ +# This is a straw-man recipe for step 1 in the two-step build of +# mono. Because it's impossible to build the mcs directory +# in cross-compile mode, this recipe will do a native build, +# then tar the resulting install tree for usage by the mono +# package in step 2. +# See http://www.mono-project.com/Mono:ARM + +require mono_2.4.2.3.inc +require mono-mcs-intermediate.inc + +DEFAULT_PREFERENCE = "-1" + +SRC_URI += "" + +PR = "${INC_PR}.1" + + diff --git a/recipes/mono/mono-native_2.4.2.3.bb b/recipes/mono/mono-native_2.4.2.3.bb new file mode 100644 index 0000000000..44ac053e99 --- /dev/null +++ b/recipes/mono/mono-native_2.4.2.3.bb @@ -0,0 +1,20 @@ +require mono_2.4.2.3.inc +DEPENDS = "glib-2.0-native perl-native" + +PR = "${INC_PR}.1" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI += "" + +inherit native + +do_fix_libtool_name() { + # inherit native will make that all native tools that are being + # built are prefixed with something like "i686-linux-", + # including libtool. Fix up some hardcoded libtool names: + for i in "${S}"/runtime/*-wrapper.in; do + sed -e "s/libtool/${BUILD_SYS}-libtool/" -i "${i}" + done +} +addtask fix_libtool_name after do_patch before do_configure diff --git a/recipes/mono/mono_2.4.2.3.bb b/recipes/mono/mono_2.4.2.3.bb new file mode 100644 index 0000000000..e1f1968cdb --- /dev/null +++ b/recipes/mono/mono_2.4.2.3.bb @@ -0,0 +1,85 @@ +require mono_2.4.2.3.inc + +DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" + +DEFAULT_PREFERENCE = "-1" + +PR = "${INC_PR}.1" + +# mono makes use of non-thumb-compatible inline asm. +ARM_INSTRUCTION_SET = "arm" + +SRC_URI += "file://configure.patch;patch=1\ + file://mini-arm.patch;patch=1\ + file://0001-remove-docs-dir-from-build.patch;patch=1" + +# Per http://www.mono-project.com/Mono:ARM +EXTRA_OECONF += " --disable-mcs-build " +# Instead, get the mcs tree from a different build (see mono-mcs-intermediate) + +do_install_prepend() { + install -d ${D} + pushd ${D} + tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz + popd +} + +do_install_append() { + # mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#), + # however, jay is not being cross-compiled and thus only + # available for the buildhost architecture, so remove it + # entirely + pushd ${D} + rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \ + ./usr/share/jay/README.jay \ + ./usr/bin/jay + popd + + # Not packaged with the default rules and apparently + # not used for anything + rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml +} + +inherit mono + +# Import file definitions from Debian +require mono_2.x-files.inc + +# Add some packages +PACKAGES_append = "mono-doc mono mono-runtime" + +#FILES_mono-doc_append = " /usr/share/libgc-mono/ " + +FILES_mono = "" +ALLOW_EMPTY_mono = "1" +RDEPENDS_mono = "mono-common mono-jit" + +FILES_mono-runtime = "" +ALLOW_EMPTY_mono-runtime = "1" +RDEPENDS_mono-runtime = "mono-jit mono-gac" + +RDEPENDS_mono-jit = "mono-common" + +FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \ + /usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la" +FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \ + /usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so" + +# Packages not included in Debian +PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \ + libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \ + libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil" + +FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll" +FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc" +FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb" + +FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*" +FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb" + +FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll" +FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb" + +# Move .pc files +FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc" +PACKAGES =+ " libmono-cairo1.0-cil-dev " diff --git a/recipes/mono/mono_2.4.2.3.inc b/recipes/mono/mono_2.4.2.3.inc new file mode 100644 index 0000000000..21e596090c --- /dev/null +++ b/recipes/mono/mono_2.4.2.3.inc @@ -0,0 +1,21 @@ +DESCRIPTION = "Mono Programming Language" +SECTION = "devel/mono" +LICENSE = "GPL LGPL X11" + +SRC_URI = "http://ftp.novell.com/pub/mono/sources/mono/mono-2.4.2.3.tar.bz2" + +INC_PR = "r3" + +S = "${WORKDIR}/mono-2.4.2.3" + +do_fix_dolt_libtool() { + # look for libtool prefixed with HOST_SYS + sed -e "s/slash\}libtool/slash\}${HOST_SYS}-libtool/" -i acinclude.m4 + echo No acinclude! +} + +inherit autotools +EXTRA_OECONF_arm = "--without-tls" +EXTRA_OECONF_mipsel = "--without-tls" + +addtask fix_dolt_libtool after do_patch before do_configure diff --git a/recipes/mono/mono_svn.bb b/recipes/mono/mono_svn.bb index a5ba966796..311d2a38dd 100644 --- a/recipes/mono/mono_svn.bb +++ b/recipes/mono/mono_svn.bb @@ -5,7 +5,7 @@ DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" PR = "r0" DEFAULT_PREFERENCE = "-1" -SRC_URI += "file://configure-svnr87352.patch;patch=1" +SRC_URI += "" # Per http://www.mono-project.com/Mono:ARM EXTRA_OECONF += " --disable-mcs-build " @@ -37,7 +37,7 @@ do_install_append() { inherit mono # Import file definitions from Debian -require mono_1.2.5.1-files.inc +require mono_2.x-files.inc # Add some packages PACKAGES_append = " mono-doc mono mono-runtime" diff --git a/recipes/qt4/files/fix-config-tests.patch b/recipes/qt4/files/fix-config-tests.patch new file mode 100644 index 0000000000..1e5101d8ad --- /dev/null +++ b/recipes/qt4/files/fix-config-tests.patch @@ -0,0 +1,34 @@ +Fix invocation in case of "ccache some-compiler-gcc". As the command "ccache some-compiler-gcc" will not exist but "ccache" will. + +both visibility and relocs were affected. + +Index: qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test +=================================================================== +--- qt-x11-opensource-src-4.5.2.orig/config.tests/unix/bsymbolic_functions.test 2009-08-01 08:01:11.000000000 +0200 ++++ qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test 2009-08-01 08:01:16.000000000 +0200 +@@ -8,7 +8,7 @@ + int main() { return 0; } + EOF + +-"$COMPILER" -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes ++$COMPILER -o libtest.so -shared -Wl,-Bsymbolic-functions -fPIC bsymbolic_functions.c >/dev/null 2>&1 && BSYMBOLIC_FUNCTIONS_SUPPORT=yes + rm -f bsymbolic_functions.c libtest.so + + # done +Index: qt-x11-opensource-src-4.5.2/config.tests/unix/fvisibility.test +=================================================================== +--- qt-x11-opensource-src-4.5.2.orig/config.tests/unix/fvisibility.test 2009-06-20 06:57:50.000000000 +0200 ++++ qt-x11-opensource-src-4.5.2/config.tests/unix/fvisibility.test 2009-08-01 07:59:05.000000000 +0200 +@@ -15,9 +15,9 @@ + EOF + + if [ "$VERBOSE" = "yes" ] ; then +- "$COMPILER" -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes ++ $COMPILER -c -fvisibility=hidden fvisibility.c && FVISIBILITY_SUPPORT=yes + else +- "$COMPILER" -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes ++ $COMPILER -c -fvisibility=hidden fvisibility.c >/dev/null 2>&1 && FVISIBILITY_SUPPORT=yes + fi + rm -f fvisibility.c fvisibility.o + } + diff --git a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled index 31bfe0fee2..5aa07c2ebb 100644 --- a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled +++ b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled @@ -6,6 +6,8 @@ QT_CONFIG_FLAGS += "-D QT_QWS_CLIENTBLIT -depths 16,24,32 -opengl es1 -plugin-gf require qt4-embedded_${PV}.bb +LICENSE = "LGPLv2.1 GPLv3" + DEPENDS += "virtual/egl" SRC_URI += "file://sgx-hack.patch;patch=1" diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc index 392ddc30bf..962233efb1 100644 --- a/recipes/qt4/qt4-embedded.inc +++ b/recipes/qt4/qt4-embedded.inc @@ -20,6 +20,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${ file://0007-openssl-host-includes.patch;patch=1 \ file://0008-qt-lib-infix.patch;patch=1 \ file://0009-support-2bpp.patch;patch=1 \ + file://fix-config-tests.patch;patch=1 \ file://g++.conf \ file://linux.conf \ " diff --git a/recipes/qt4/qt4-embedded_4.4.3.bb b/recipes/qt4/qt4-embedded_4.4.3.bb index f5358a069e..fce2e657ee 100644 --- a/recipes/qt4/qt4-embedded_4.4.3.bb +++ b/recipes/qt4/qt4-embedded_4.4.3.bb @@ -1,3 +1,3 @@ -include qt4-embedded.inc +require qt4-embedded.inc PR = "${INC_PR}.1" diff --git a/recipes/qt4/qt4-embedded_4.5.2.bb b/recipes/qt4/qt4-embedded_4.5.2.bb index dff754c68c..d94bc4862d 100644 --- a/recipes/qt4/qt4-embedded_4.5.2.bb +++ b/recipes/qt4/qt4-embedded_4.5.2.bb @@ -1,6 +1,6 @@ -include qt4-embedded.inc +require qt4-embedded.inc PR = "${INC_PR}.1" -LICENSE += "LGPL" +LICENSE = "LGPLv2.1 GPLv3" SRC_URI += "file://0010-no-simpledecoration-example.patch;patch=1" diff --git a/recipes/qt4/qt4-tools-native_4.5.2.bb b/recipes/qt4/qt4-tools-native_4.5.2.bb index d1962bf98f..8eed0034db 100644 --- a/recipes/qt4/qt4-tools-native_4.5.2.bb +++ b/recipes/qt4/qt4-tools-native_4.5.2.bb @@ -1,4 +1,5 @@ require qt4-tools-native.inc +LICENSE = "LGPLv2.1 GPLv3" PR = "${INC_PR}.1" TOBUILD := "src/tools/bootstrap ${TOBUILD}" diff --git a/recipes/qt4/qt4-tools-sdk_4.5.2.bb b/recipes/qt4/qt4-tools-sdk_4.5.2.bb index db919fd6df..fafb7710c9 100644 --- a/recipes/qt4/qt4-tools-sdk_4.5.2.bb +++ b/recipes/qt4/qt4-tools-sdk_4.5.2.bb @@ -3,7 +3,7 @@ DEPENDS = "zlib-native dbus-native" SECTION = "libs" HOMEPAGE = "http://www.trolltech.com" PRIORITY = "optional" -LICENSE = "GPL" +LICENSE = "LGPLv2.1 GPLv3" inherit sdk diff --git a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled index 2e2364414d..22db2dfa8d 100644 --- a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled +++ b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled @@ -4,8 +4,8 @@ FILESPATHPKG =. "qt4-x11-free-${PV}:qt4-x11-free:" QT_GLFLAGS = "-opengl es1 -openvg" -include qt4-x11-free.inc -LICENSE += "LGPL" +require qt4-x11-free.inc +LICENSE = "LGPLv2.1 GPLv3" PR = "${INC_PR}.0+gitr${SRCREV}" DEPENDS += "virtual/egl" diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc index 52db1872ef..6ca20561cd 100644 --- a/recipes/qt4/qt4-x11-free.inc +++ b/recipes/qt4/qt4-x11-free.inc @@ -16,6 +16,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz file://0006-freetype-host-includes.patch;patch=1 \ file://0007-openssl-host-includes.patch;patch=1 \ file://0008-qt-lib-infix.patch;patch=1 \ + file://fix-config-tests.patch;patch=1 \ file://g++.conf \ file://linux.conf \ " diff --git a/recipes/qt4/qt4-x11-free_4.4.3.bb b/recipes/qt4/qt4-x11-free_4.4.3.bb index a3538c9199..4a52083cbd 100644 --- a/recipes/qt4/qt4-x11-free_4.4.3.bb +++ b/recipes/qt4/qt4-x11-free_4.4.3.bb @@ -1,3 +1,3 @@ -include qt4-x11-free.inc +require qt4-x11-free.inc PR = "${INC_PR}.1" QT_CONFIG_FLAGS += "-no-tablet" diff --git a/recipes/qt4/qt4-x11-free_4.5.2.bb b/recipes/qt4/qt4-x11-free_4.5.2.bb index 14d635c04f..0289f211b4 100644 --- a/recipes/qt4/qt4-x11-free_4.5.2.bb +++ b/recipes/qt4/qt4-x11-free_4.5.2.bb @@ -1,4 +1,4 @@ -include qt4-x11-free.inc -LICENSE += "LGPL" +require qt4-x11-free.inc +LICENSE = "LGPLv2.1 GPLv3" PR = "${INC_PR}.2" diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index b4f53c14b7..50dd1d8760 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -122,8 +122,15 @@ FILES_${QT_BASE_NAME}-mkspecs = "${datadir}/${QT_DIR_NAME}/mkspecs/ do_configure() { unset QMAKESPEC unset QTDIR - ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake - ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ + + if [ ! -e bin/qmake ]; then + ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake + fi + + if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then + ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++ + fi + cp -f ${WORKDIR}/g++.conf ${WORKDIR}/linux.conf mkspecs/common/ echo "[Paths]" > $QT_CONF_PATH diff --git a/recipes/rsstail/rsstail_1.5.bb b/recipes/rsstail/rsstail_1.5.bb new file mode 100644 index 0000000000..02a2d999a6 --- /dev/null +++ b/recipes/rsstail/rsstail_1.5.bb @@ -0,0 +1,19 @@ +HOMEPAGE = "http://www.vanheusden.com/rsstail/" +DESCRIPTION = "RSSTail is a tail-like RSS reader: it monitors an RSS feed and if it detects a new entry it will emit only that new entry." +LICENSE = "GPLv2" + +DEPENDS = "libmrss" + +PR = "r0" + +inherit autotools + +SRC_URI = "http://www.vanheusden.com/rsstail/rsstail-${PV}.tgz" + +do_install_prepend() { + install -d ${D}${bindir} ${D}${mandir}/man1 +} + +do_stage() { + : +} diff --git a/recipes/tasks/task-beagleboard-demo.bb b/recipes/tasks/task-beagleboard-demo.bb index 0f24dc9a23..95b42ae34b 100644 --- a/recipes/tasks/task-beagleboard-demo.bb +++ b/recipes/tasks/task-beagleboard-demo.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Task for Beagleboard-demo-image" -PR = "r10" +PR = "r12" inherit task @@ -15,10 +15,10 @@ RDEPENDS_${PN} = "\ angstrom-zeroconf-audio \ angstrom-led-config \ gpe-scap \ - mime-support e-wm ${ECONFIG} exhibit \ + mime-support e-wm ${ECONFIG} \ xterm xmms \ firefox midori \ - swfdec-mozilla \ + gnash gnash-browser-plugin \ hicolor-icon-theme gnome-icon-theme \ jaaa nmap iperf gnuplot \ abiword \ diff --git a/recipes/tinylogin/tinylogin_1.4.bb b/recipes/tinylogin/tinylogin_1.4.bb index 54708b2d4b..23ee694b1c 100644 --- a/recipes/tinylogin/tinylogin_1.4.bb +++ b/recipes/tinylogin/tinylogin_1.4.bb @@ -7,7 +7,8 @@ SECTION = "base" LICENSE = "GPL" PR = "r6" -SRC_URI = "http://tinylogin.busybox.net/downloads/tinylogin-${PV}.tar.bz2 \ +#SRC_URI = "http://tinylogin.busybox.net/downloads/tinylogin-${PV}.tar.bz2 \ +SRC_URI = "http://limpens.net/trac/at91-kit-trac/export/4/trunk/sources/tinylogin-${PV}.tar.bz2 \ file://cvs-20040608.patch;patch=1;pnum=1 \ file://add-system.patch;patch=1;pnum=1 \ file://adduser-empty_pwd.patch;patch=1 \ diff --git a/recipes/uclibc/uclibc-svn/arm-linuxthreads.patch b/recipes/uclibc/uclibc-git/arm-linuxthreads.patch index e222668a66..e222668a66 100644 --- a/recipes/uclibc/uclibc-svn/arm-linuxthreads.patch +++ b/recipes/uclibc/uclibc-git/arm-linuxthreads.patch diff --git a/recipes/uclibc/uclibc-svn/arm/uClibc.config b/recipes/uclibc/uclibc-git/arm/uClibc.config index 34b0f2137e..34b0f2137e 100644 --- a/recipes/uclibc/uclibc-svn/arm/uClibc.config +++ b/recipes/uclibc/uclibc-git/arm/uClibc.config diff --git a/recipes/uclibc/uclibc-svn/arm_fix_alignment.patch b/recipes/uclibc/uclibc-git/arm_fix_alignment.patch index 982afe9a6e..982afe9a6e 100644 --- a/recipes/uclibc/uclibc-svn/arm_fix_alignment.patch +++ b/recipes/uclibc/uclibc-git/arm_fix_alignment.patch diff --git a/recipes/uclibc/uclibc-svn/armeb/uClibc.config b/recipes/uclibc/uclibc-git/armeb/uClibc.config index 5f9fe16afb..5f9fe16afb 100644 --- a/recipes/uclibc/uclibc-svn/armeb/uClibc.config +++ b/recipes/uclibc/uclibc-git/armeb/uClibc.config diff --git a/recipes/uclibc/uclibc-svn/dht-walnut/uClibc.config b/recipes/uclibc/uclibc-git/dht-walnut/uClibc.config index 6e606f6be3..6e606f6be3 100644 --- a/recipes/uclibc/uclibc-svn/dht-walnut/uClibc.config +++ b/recipes/uclibc/uclibc-git/dht-walnut/uClibc.config diff --git a/recipes/uclibc/uclibc-svn/efika/uClibc.config b/recipes/uclibc/uclibc-git/efika/uClibc.config index 23b221d662..23b221d662 100644 --- a/recipes/uclibc/uclibc-svn/efika/uClibc.config +++ b/recipes/uclibc/uclibc-git/efika/uClibc.config diff --git a/recipes/uclibc/uclibc-svn/errno_values.h.patch b/recipes/uclibc/uclibc-git/errno_values.h.patch index a1e39c181b..a1e39c181b 100644 --- a/recipes/uclibc/uclibc-svn/errno_values.h.patch +++ b/recipes/uclibc/uclibc-git/errno_values.h.patch diff --git a/recipes/uclibc/uclibc-svn/error_print_progname.patch b/recipes/uclibc/uclibc-git/error_print_progname.patch index 6c10ec6b3c..6c10ec6b3c 100644 --- a/recipes/uclibc/uclibc-svn/error_print_progname.patch +++ b/recipes/uclibc/uclibc-git/error_print_progname.patch diff --git a/recipes/uclibc/uclibc-svn/i386/uClibc.config b/recipes/uclibc/uclibc-git/i386/uClibc.config index bc6e72debf..bc6e72debf 100644 --- a/recipes/uclibc/uclibc-svn/i386/uClibc.config +++ b/recipes/uclibc/uclibc-git/i386/uClibc.config diff --git a/recipes/uclibc/uclibc-svn/i486/uClibc.config b/recipes/uclibc/uclibc-git/i486/uClibc.config index 896d65ab20..896d65ab20 100644 --- a/recipes/uclibc/uclibc-svn/i486/uClibc.config +++ b/recipes/uclibc/uclibc-git/i486/uClibc.config diff --git a/recipes/uclibc/uclibc-svn/i586/uClibc.config b/recipes/uclibc/uclibc-git/i586/uClibc.config index d1bf538902..d1bf538902 100644 --- a/recipes/uclibc/uclibc-svn/i586/uClibc.config +++ b/recipes/uclibc/uclibc-git/i586/uClibc.config diff --git a/recipes/uclibc/uclibc-svn/i686/uClibc.config b/recipes/uclibc/uclibc-git/i686/uClibc.config index bc6e72debf..bc6e72debf 100644 --- a/recipes/uclibc/uclibc-svn/i686/uClibc.config +++ b/recipes/uclibc/uclibc-git/i686/uClibc.config diff --git a/recipes/uclibc/uclibc-svn/ixp4xx/uClibc.distro b/recipes/uclibc/uclibc-git/ixp4xx/uClibc.distro index 7d54119f39..7d54119f39 100644 --- a/recipes/uclibc/uclibc-svn/ixp4xx/uClibc.distro +++ b/recipes/uclibc/uclibc-git/ixp4xx/uClibc.distro diff --git a/recipes/uclibc/uclibc-svn/ixp4xx/uClibc.machine b/recipes/uclibc/uclibc-git/ixp4xx/uClibc.machine index 77e53bc1a8..77e53bc1a8 100644 --- a/recipes/uclibc/uclibc-svn/ixp4xx/uClibc.machine +++ b/recipes/uclibc/uclibc-git/ixp4xx/uClibc.machine diff --git a/recipes/uclibc/uclibc-svn/ldso_hash.patch b/recipes/uclibc/uclibc-git/ldso_hash.patch index 974f564396..974f564396 100644 --- a/recipes/uclibc/uclibc-svn/ldso_hash.patch +++ b/recipes/uclibc/uclibc-git/ldso_hash.patch diff --git a/recipes/uclibc/uclibc-svn/linuxthreads-changes.patch b/recipes/uclibc/uclibc-git/linuxthreads-changes.patch index f6f32cdd29..f6f32cdd29 100644 --- a/recipes/uclibc/uclibc-svn/linuxthreads-changes.patch +++ b/recipes/uclibc/uclibc-git/linuxthreads-changes.patch diff --git a/recipes/uclibc/uclibc-svn/magicbox/uClibc.config b/recipes/uclibc/uclibc-git/magicbox/uClibc.config index 6542d49fd0..6542d49fd0 100644 --- a/recipes/uclibc/uclibc-svn/magicbox/uClibc.config +++ b/recipes/uclibc/uclibc-git/magicbox/uClibc.config diff --git a/recipes/uclibc/uclibc-svn/mipsel/uClibc.config b/recipes/uclibc/uclibc-git/mipsel/uClibc.config index 4389c9b8c2..4389c9b8c2 100644 --- a/recipes/uclibc/uclibc-svn/mipsel/uClibc.config +++ b/recipes/uclibc/uclibc-git/mipsel/uClibc.config diff --git a/recipes/uclibc/uclibc-svn/powerpc/uClibc.config b/recipes/uclibc/uclibc-git/powerpc/uClibc.config index 8a12c10961..8a12c10961 100644 --- a/recipes/uclibc/uclibc-svn/powerpc/uClibc.config +++ b/recipes/uclibc/uclibc-git/powerpc/uClibc.config diff --git a/recipes/uclibc/uclibc-svn/sh3/uClibc.config b/recipes/uclibc/uclibc-git/sh3/uClibc.config index 1e2710715f..1e2710715f 100644 --- a/recipes/uclibc/uclibc-svn/sh3/uClibc.config +++ b/recipes/uclibc/uclibc-git/sh3/uClibc.config diff --git a/recipes/uclibc/uclibc-svn/sh4/uClibc.config b/recipes/uclibc/uclibc-git/sh4/uClibc.config index 0b9a3c48b2..0b9a3c48b2 100644 --- a/recipes/uclibc/uclibc-svn/sh4/uClibc.config +++ b/recipes/uclibc/uclibc-git/sh4/uClibc.config diff --git a/recipes/uclibc/uclibc-svn/thumb-asm-swi.patch b/recipes/uclibc/uclibc-git/thumb-asm-swi.patch index d09e40b7a3..d09e40b7a3 100644 --- a/recipes/uclibc/uclibc-svn/thumb-asm-swi.patch +++ b/recipes/uclibc/uclibc-git/thumb-asm-swi.patch diff --git a/recipes/uclibc/uclibc-svn/thumb-defined-arm-or-thumb.patch b/recipes/uclibc/uclibc-git/thumb-defined-arm-or-thumb.patch index 6b73301bf7..6b73301bf7 100644 --- a/recipes/uclibc/uclibc-svn/thumb-defined-arm-or-thumb.patch +++ b/recipes/uclibc/uclibc-git/thumb-defined-arm-or-thumb.patch diff --git a/recipes/uclibc/uclibc-svn/thumb-mov-pc-bx.patch b/recipes/uclibc/uclibc-git/thumb-mov-pc-bx.patch index 3d493514f8..3d493514f8 100644 --- a/recipes/uclibc/uclibc-svn/thumb-mov-pc-bx.patch +++ b/recipes/uclibc/uclibc-git/thumb-mov-pc-bx.patch diff --git a/recipes/uclibc/uclibc-svn/uClibc.config b/recipes/uclibc/uclibc-git/uClibc.config index e69de29bb2..e69de29bb2 100644 --- a/recipes/uclibc/uclibc-svn/uClibc.config +++ b/recipes/uclibc/uclibc-git/uClibc.config diff --git a/recipes/uclibc/uclibc-svn/uClibc.distro b/recipes/uclibc/uclibc-git/uClibc.distro index 2f5e073ec1..2f5e073ec1 100644 --- a/recipes/uclibc/uclibc-svn/uClibc.distro +++ b/recipes/uclibc/uclibc-git/uClibc.distro diff --git a/recipes/uclibc/uclibc-svn/uclibc_enable_log2_test.patch b/recipes/uclibc/uclibc-git/uclibc_enable_log2_test.patch index f8f3a7d1aa..f8f3a7d1aa 100644 --- a/recipes/uclibc/uclibc-svn/uclibc_enable_log2_test.patch +++ b/recipes/uclibc/uclibc-git/uclibc_enable_log2_test.patch diff --git a/recipes/uclibc/uclibc-svn/uclibc_mathc99.patch b/recipes/uclibc/uclibc-git/uclibc_mathc99.patch index 6fbb11af6b..6fbb11af6b 100644 --- a/recipes/uclibc/uclibc-svn/uclibc_mathc99.patch +++ b/recipes/uclibc/uclibc-git/uclibc_mathc99.patch diff --git a/recipes/uclibc/uclibc-initial_svn.bb b/recipes/uclibc/uclibc-initial_git.bb index e742fd55fd..38b85ef36f 100644 --- a/recipes/uclibc/uclibc-initial_svn.bb +++ b/recipes/uclibc/uclibc-initial_git.bb @@ -1,5 +1,5 @@ SECTION = "base" -require uclibc_svn.bb +require uclibc_git.bb DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" diff --git a/recipes/uclibc/uclibc_0.9.30.1.bb b/recipes/uclibc/uclibc_0.9.30.1.bb index 3ddaad4ab6..39d7f52504 100644 --- a/recipes/uclibc/uclibc_0.9.30.1.bb +++ b/recipes/uclibc/uclibc_0.9.30.1.bb @@ -8,7 +8,6 @@ # UCLIBC_BASE ?= "0.9.30.1" PR = "r3" -DEFAULT_PREFERENCE = "1" require uclibc.inc diff --git a/recipes/uclibc/uclibc_0.9.30.bb b/recipes/uclibc/uclibc_0.9.30.bb index 1337da9b94..4d58b8904e 100644 --- a/recipes/uclibc/uclibc_0.9.30.bb +++ b/recipes/uclibc/uclibc_0.9.30.bb @@ -8,7 +8,6 @@ # UCLIBC_BASE ?= "0.9.30" PR = "r7" -DEFAULT_PREFERENCE = "1" require uclibc.inc diff --git a/recipes/uclibc/uclibc_svn.bb b/recipes/uclibc/uclibc_git.bb index d3f09737c8..0660341786 100644 --- a/recipes/uclibc/uclibc_svn.bb +++ b/recipes/uclibc/uclibc_git.bb @@ -7,9 +7,9 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.30" -PV = "${UCLIBC_BASE}+svnr${SRCREV}" +SRCREV="b1913a876059949e6c309bafade55e9425ef33fb" +PV = "${UCLIBC_BASE}+gitr${SRCREV}" PR = "r1" -#DEFAULT_PREFERENCE = "2" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. @@ -19,13 +19,15 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" #recent versions uclibc require real kernel headers PACKAGE_ARCH = "${MACHINE_ARCH}" -FILESPATHPKG =. "uclibc-svn:uclibc-${UCLIBC_BASE}:" +FILESPATHPKG =. "uclibc-git:uclibc-${UCLIBC_BASE}:" #as stated above, uclibc needs real kernel-headers #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking .... KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}" -SRC_URI += "svn://uclibc.org/trunk;module=uClibc \ +SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \ + ${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \ + file://uClibc.config \ file://uClibc.machine \ file://uClibc.distro \ file://uclibc-arm-ftruncate64.patch;patch=1 \ @@ -33,4 +35,4 @@ SRC_URI += "svn://uclibc.org/trunk;module=uClibc \ file://uclibc_ldso_use_O0.patch;patch=1 \ file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \ " -S = "${WORKDIR}/uClibc" +S = "${WORKDIR}/git" diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb index ba46a50933..aae486ae91 100644 --- a/recipes/uclibc/uclibc_nptl.bb +++ b/recipes/uclibc/uclibc_nptl.bb @@ -7,7 +7,8 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.30" -PV = "${UCLIBC_BASE}+svnr${SRCREV}" +SRCREV="10373d3ca64c1ec9c519933454a94b459b8fb4e7" +PV = "${UCLIBC_BASE}+gitr${SRCREV}" PR = "r1" #DEFAULT_PREFERENCE = "2" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take @@ -25,12 +26,14 @@ FILESPATHPKG =. "uclibc-nptl:uclibc-${UCLIBC_BASE}:" #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking .... KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}" -SRC_URI += "svn://uclibc.org/branches/;module=uClibc-nptl;rev=${SRCREV} \ - file://uClibc.machine \ - file://uClibc.distro \ - file://uclibc-arm-ftruncate64.patch;patch=1 \ - file://uclibc_ldso_use_O0.patch;patch=1 \ - file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \ - " +SRC_URI = "git://uclibc.org/uClibc.git;protocol=git;branch=nptl \ + ${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \ + file://uClibc.config \ + file://uClibc.machine \ + file://uClibc.distro \ + file://uclibc-arm-ftruncate64.patch;patch=1 \ + file://uclibc_ldso_use_O0.patch;patch=1 \ + file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \ + " -S = "${WORKDIR}/uClibc-nptl" +S = "${WORKDIR}/git" diff --git a/recipes/unzip/unzip_552.bb b/recipes/unzip/unzip_552.bb index d8809196d8..16b63de2dd 100644 --- a/recipes/unzip/unzip_552.bb +++ b/recipes/unzip/unzip_552.bb @@ -2,8 +2,7 @@ DESCRIPTION = "A (de)compression library for the ZIP format" SECTION = "console/utils" LICENSE = "Info-ZIP" PR = "r1" - -SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/unzip${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/infozip/UnZip%205.x%20and%20earlier/5.52/unzip${PV}.tar.gz" S = "${WORKDIR}/unzip-5.52" export LD = "${CC} ${LDFLAGS}" |