From 52b81fb8aabc1774ab7528e4750668976b446903 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 16 Feb 2009 16:03:01 +0100 Subject: dmai: move CE_INSTALL_DIR --- packages/dsplink/dmai_1.20.bb | 2 ++ packages/dsplink/ti-paths.inc | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/dsplink/dmai_1.20.bb b/packages/dsplink/dmai_1.20.bb index 12cbea4a12..9d5ea5fdf7 100644 --- a/packages/dsplink/dmai_1.20.bb +++ b/packages/dsplink/dmai_1.20.bb @@ -26,6 +26,8 @@ TARGET = "all" TARGET_neuros-osd2 = " dm6446_al dm6446_db" TARGET_beagleboard = " o3530_al" +export CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/cetools" + do_compile() { cd packages/ti/sdo/dmai oe_runmake clean diff --git a/packages/dsplink/ti-paths.inc b/packages/dsplink/ti-paths.inc index eec3602ba5..4d78c60f1a 100644 --- a/packages/dsplink/ti-paths.inc +++ b/packages/dsplink/ti-paths.inc @@ -22,7 +22,6 @@ export BIOS_INSTALL_DIR=${TITOOLSDIR}/${TIBIOSDIR} export CGTOOLS_V5T="${CROSS_DIR}" export CC_V5T="bin/${TARGET_PREFIX}gcc" export MVTOOL_PREFIX="${TARGET_PREFIX}" -export CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/cetools" export MVTOOL_DIR="${CROSS_DIR}" export CSTOOL_DIR="${CROSS_DIR}" export LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR} -- cgit v1.2.3 From 30ce4a38cad45871131d7242aa25c99447987a2a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 16 Feb 2009 16:48:46 +0100 Subject: distcc: update to 3.1 --- conf/checksums.ini | 4 ++++ packages/distcc/distcc_3.1.bb | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 packages/distcc/distcc_3.1.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 6f816079e9..b8c901dfc6 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -4314,6 +4314,10 @@ sha256=00ca6747501d1b6034398ba5482dcb1e7cf3aff8739fbff0c72e58602d68774c md5=0d6b80a1efc3a3d816c4f4175f63eaa2 sha256=6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434 +[http://distcc.googlecode.com/files/distcc-3.1.tar.bz2] +md5=a1a9d3853df7133669fffec2a9aab9f3 +sha256=f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89 + [http://0pointer.de/public/distcc-avahi.patch] md5=621dc7dc1e3b9b6770110117df45611a sha256=e6651e3de7fee6d953b6ee56732eafa7d4666cb4070db5a925ba071626067c9a diff --git a/packages/distcc/distcc_3.1.bb b/packages/distcc/distcc_3.1.bb new file mode 100644 index 0000000000..879f676519 --- /dev/null +++ b/packages/distcc/distcc_3.1.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "distcc is a parallel build system that distributes \ +compilation of C/C++/ObjC code across machines on a network." +SECTION = "devel" +LICENSE = "GPLv2" + +DEPENDS = "avahi gtk+" +RRECOMMENDS = "avahi-daemon" + +SRC_URI = "http://distcc.googlecode.com/files/distcc-${PV}.tar.bz2 \ + file://default \ + file://distccmon-gnome.desktop \ + file://distcc" + +inherit distutils-base autotools update-rc.d + +INITSCRIPT_NAME = "distcc" + +EXTRA_OECONF = " --with-gtk --with-avahi ac_cv_path_PYTHON=${STAGINGDIR_NATIVE}/python PYTHON_CFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}" + +do_install_append() { + install -d ${D}${sysconfdir}/init.d/ + install -d ${D}${sysconfdir}/default + install -d ${D}${sysconfdir}/distcc + install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc + install -m 0644 ${WORKDIR}/distccmon-gnome.desktop ${D}${datadir}/distcc/ + echo "+zeroconf" > ${D}${sysconfdir}/distcc/hosts +} + +PACKAGES += "distcc-distmon-gnome" + +FILES_${PN} = " ${sysconfdir} \ + ${bindir}/distcc \ + ${bindir}/lsdistcc \ + ${bindir}/distccd \ + ${bindir}/distccmon-text" + +FILES_${PN}-dbg += "${bindir}/.debug" + +CONFFILES_${PN} += "${sysconfdir}/default/distcc \ + ${sysconfdir}/distcc/hosts \ + ${sysconfdir}/init.d/distcc \ + " + +FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \ + ${datadir}/distcc" -- cgit v1.2.3 From 0faeb36abfb6024f4e248c547fe19e60c3ee298d Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Mon, 16 Feb 2009 17:18:11 +0100 Subject: preferred-om-2008-versions.inc: bump vala and libtiff --- conf/distro/include/preferred-om-2008-versions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 6cbd032259..f78c804203 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1840,7 +1840,7 @@ PREFERRED_VERSION_thunar ?= "0.8.0" PREFERRED_VERSION_thunderbird ?= "1.0.7" PREFERRED_VERSION_tickypip ?= "0.1.2" PREFERRED_VERSION_tickypip-levels ?= "1.1" -PREFERRED_VERSION_tiff ?= "3.7.2" +PREFERRED_VERSION_tiff ?= "3.8.2" PREFERRED_VERSION_tightvnc ?= "1.3dev7" PREFERRED_VERSION_tiinit ?= "3.2.26" PREFERRED_VERSION_time ?= "1.7" @@ -1932,7 +1932,7 @@ PREFERRED_VERSION_util-macros ?= "1.1.5" PREFERRED_VERSION_util-macros-native ?= "1.1.5" PREFERRED_VERSION_uucp ?= "1.07" PREFERRED_VERSION_v4l2apps ?= "20020317" -PREFERRED_VERSION_vala ?= "0.5.1" +PREFERRED_VERSION_vala ?= "0.5.6" PREFERRED_VERSION_vala-native ?= "0.5.6" PREFERRED_VERSION_vde ?= "2.0.2" PREFERRED_VERSION_vectoroids ?= "1.1.0" -- cgit v1.2.3 From 7a45ec8d68bd3767b4d737ecb64609ab9dfb9080 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Mon, 16 Feb 2009 18:41:05 +0100 Subject: tiff 3.8.2: use autotools_stage, make default --- packages/libtiff/tiff_3.8.2.bb | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/packages/libtiff/tiff_3.8.2.bb b/packages/libtiff/tiff_3.8.2.bb index 8c6e02c4a7..00edb40eb3 100644 --- a/packages/libtiff/tiff_3.8.2.bb +++ b/packages/libtiff/tiff_3.8.2.bb @@ -1,24 +1,13 @@ DESCRIPTION = "This software provides support for the Tag Image File Format (TIFF)" -LICENSE = "" +LICENSE = "${PN}" HOMEPAGE = "http://www.remotesensing.org/libtiff/" DEPENDS = "zlib jpeg lzo" - -DEFAULT_PREFERENCE = "-1" - PV = "3.8.2+4.0.0beta2" -SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.0beta2.tar.gz" +SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.0beta2.tar.gz" S = "${WORKDIR}/${PN}-4.0.0beta2" -inherit autotools - -do_stage() { - autotools_stage_includes - install -d ${STAGING_LIBDIR} - oe_libinstall -C libtiff -a -so libtiff ${STAGING_LIBDIR} - oe_libinstall -C libtiff -a -so libtiffxx ${STAGING_LIBDIR} - -} +inherit autotools_stage PACKAGES =+ "tiffxx tiffxx-dbg tiffxx-dev tiff-utils tiff-utils-dbg" FILES_tiffxx = "${libdir}/libtiffxx.so.*" -- cgit v1.2.3 From 2c476f827e2550ab08a5b7cd5378f2aa5698029d Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Mon, 16 Feb 2009 20:02:42 +0100 Subject: libgsm0710: 1.0.0 -> 1.1.0 --- conf/distro/include/sane-srcrevs.inc | 2 +- packages/freesmartphone/libgsm0710_git.bb | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 15baf2b144..1192462b5d 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -84,7 +84,7 @@ SRCREV_pn-libexalt-dbus ?= "76" SRCREV_pn-libfakekey ?= "1455" SRCREV_pn-libframeworkd-glib ?= "e90f7c208356b53c34e025585248ea0a7a2ea13c" SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f" -SRCREV_pn-libgsm0710 ?= "a05704a56003dc02dca784cef4176e97eaf9f688" +SRCREV_pn-libgsm0710 ?= "243ef1b0db523a1ff163803e8277dc02e7c7b0b8" SRCREV_pn-libgsmd ?= "4505" SRCREV_pn-libiac ?= "1590" SRCREV_pn-libjana ?= "713" diff --git a/packages/freesmartphone/libgsm0710_git.bb b/packages/freesmartphone/libgsm0710_git.bb index bc4e59ea34..b9d9b36010 100644 --- a/packages/freesmartphone/libgsm0710_git.bb +++ b/packages/freesmartphone/libgsm0710_git.bb @@ -1,14 +1,13 @@ DESCRIPTION = "A GSM 07.10 Protocol Engine" LICENSE = "GPL" SECTION = "devel" -PV = "1.0.0+gitr${SRCREV}" +PV = "1.1.0+gitr${SRCREV}" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/libgsm0710.git;protocol=git;branch=master" S = "${WORKDIR}/git" -inherit autotools autotools_stage pkgconfig +inherit autotools_stage pkgconfig # ship vapi file FILES_${PN}-dev += "${datadir}/vala" - -- cgit v1.2.3 From 2c54593ef91b22014c28e4b4075008cde40cf015 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Mon, 16 Feb 2009 20:07:00 +0100 Subject: sane-srcrevs.inc: bump fso-monitord --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 1192462b5d..e5d47de5cd 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -61,7 +61,7 @@ SRCREV_pn-fso-abyss ?= "09fd818470bb0da3b7614804f5141be52e0942c1" SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa" SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0" SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" -SRCREV_pn-fso-monitord ?= "6a7860dc09a18144e8e363e64b2eb881bba83728" +SRCREV_pn-fso-monitord ?= "5816762b9928a6bda261c71971071bc675f6b9fc" SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" -- cgit v1.2.3 From 8ee631d48d5529e1a122e66e5d3074f299d3ba88 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Mon, 16 Feb 2009 20:10:54 +0100 Subject: sane-srcrevs.inc: bump fso-abyss --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index e5d47de5cd..f4d3364950 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -57,7 +57,7 @@ SRCREV_pn-flashrom ?= "3682" SRCREV_pn-frameworkd ?= "700ab8250582767628165b7cf6f671ef756ba56d" SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}" SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136" -SRCREV_pn-fso-abyss ?= "09fd818470bb0da3b7614804f5141be52e0942c1" +SRCREV_pn-fso-abyss ?= "49af81918362739fbf2e72b7b703fdc78989875e" SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa" SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0" SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" -- cgit v1.2.3 From cfe81d5c2a1eee3eaca104d5a175d88d4270e391 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Mon, 16 Feb 2009 20:29:57 +0100 Subject: fso-monitord: bump for 0.2.0 --- conf/distro/include/sane-srcrevs.inc | 2 +- packages/freesmartphone/fso-monitord_git.bb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index f4d3364950..a701bac1c1 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -61,7 +61,7 @@ SRCREV_pn-fso-abyss ?= "49af81918362739fbf2e72b7b703fdc78989875e" SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa" SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0" SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" -SRCREV_pn-fso-monitord ?= "5816762b9928a6bda261c71971071bc675f6b9fc" +SRCREV_pn-fso-monitord ?= "0f64979a11d6263c7b7ed0e945a0889744f295f1" SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" diff --git a/packages/freesmartphone/fso-monitord_git.bb b/packages/freesmartphone/fso-monitord_git.bb index a13456dcfd..c7bbbe06c1 100644 --- a/packages/freesmartphone/fso-monitord_git.bb +++ b/packages/freesmartphone/fso-monitord_git.bb @@ -1,9 +1,8 @@ DESCRIPTION = "FSO monitor daemon" -AUTHOR = "M. Lauer et. al." SECTION = "console/network" DEPENDS = "vala-native dbus dbus-glib" LICENSE = "GPL" -PV = "0.0.0+gitr${SRCREV}" +PV = "0.2.0+gitr${SRCREV}" PR = "r0" SRC_URI = "${FREESMARTPHONE_GIT}/fso-monitord.git;protocol=git;branch=master" -- cgit v1.2.3 From 3448dfee0129d0d3574875ee7ba7a793857be1f3 Mon Sep 17 00:00:00 2001 From: John Willis Date: Mon, 16 Feb 2009 18:52:19 +0000 Subject: libgles-omap3: make /dev/pvrsrvkm accessible by non ROOT users. * Tested by running several OGLES apps on the Pandora as a normal user, should also be fine on the Beagle/Overo/OMAP3EVM etc. Signed-off-by: David-John Willis --- packages/powervr-drivers/libgles-omap3/rc.pvr | 1 + packages/powervr-drivers/libgles-omap3_3.00.00.06.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/powervr-drivers/libgles-omap3/rc.pvr b/packages/powervr-drivers/libgles-omap3/rc.pvr index 4476a9d7e9..1f63d4e17a 100755 --- a/packages/powervr-drivers/libgles-omap3/rc.pvr +++ b/packages/powervr-drivers/libgles-omap3/rc.pvr @@ -15,6 +15,7 @@ if [ -e /dev/pvrsrvkm ] ; then fi mknod /dev/pvrsrvkm c $pvr_maj 0 +chmod 666 /dev/pvrsrvkm /usr/bin/pvrsrvinit diff --git a/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb b/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb index aba613c14b..7af52a296c 100644 --- a/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb +++ b/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb @@ -2,7 +2,7 @@ require libgles-omap3.inc # Not released yet #DEFAULT_PREFERENCE = "-1" -PR = "r5" +PR = "r6" SGXPV = "3_00_00_06" IMGPV = "1.3.13.1397" -- cgit v1.2.3 From 9924d91be0e298c2267238cd638a10f328ab7f8a Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Mon, 16 Feb 2009 21:42:50 +0100 Subject: fso-images: add fso-paroli-image; refactor fso-image into .inc; add fso-zhone-image --- packages/images/fso-console-image.bb | 5 +- packages/images/fso-illume-image.bb | 2 +- packages/images/fso-image-light.bb | 2 +- packages/images/fso-image-nox.bb | 2 +- packages/images/fso-image.bb | 146 ----------------------------------- packages/images/fso-paroli-image.bb | 12 +++ packages/images/fso-zhone-image.bb | 13 ++++ 7 files changed, 32 insertions(+), 150 deletions(-) delete mode 100644 packages/images/fso-image.bb create mode 100644 packages/images/fso-paroli-image.bb create mode 100644 packages/images/fso-zhone-image.bb diff --git a/packages/images/fso-console-image.bb b/packages/images/fso-console-image.bb index 6bfab9dca9..8d985be01c 100644 --- a/packages/images/fso-console-image.bb +++ b/packages/images/fso-console-image.bb @@ -2,7 +2,10 @@ # FSO-compliant Console Image Recipe #------------------------------------------------------ -require fso-image.bb +require fso-image.inc + +PV = "1.1" +PR = "r1" IMAGE_INSTALL = "\ task-base \ diff --git a/packages/images/fso-illume-image.bb b/packages/images/fso-illume-image.bb index 577e738030..189c8cba69 100644 --- a/packages/images/fso-illume-image.bb +++ b/packages/images/fso-illume-image.bb @@ -2,7 +2,7 @@ # FSO-compliant Illume Image Recipe #------------------------------------------------------ -require fso-image.bb +require fso-image.inc PV = "1.1" PR = "r1" diff --git a/packages/images/fso-image-light.bb b/packages/images/fso-image-light.bb index a3bf1f7eb5..12fa2f7205 100644 --- a/packages/images/fso-image-light.bb +++ b/packages/images/fso-image-light.bb @@ -2,7 +2,7 @@ # freesmartphone.org Image Recipe, Light Edition #------------------------------------------------------ -require fso-image.bb +require fso-image.inc IMAGE_LINGUAS = "" diff --git a/packages/images/fso-image-nox.bb b/packages/images/fso-image-nox.bb index 056982e1b0..d241919367 100644 --- a/packages/images/fso-image-nox.bb +++ b/packages/images/fso-image-nox.bb @@ -4,7 +4,7 @@ PR = "r1.0" -require fso-image.bb +require fso-image.inc export IMAGE_BASENAME = "fso-image-nox" diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb deleted file mode 100644 index 4e3bfee64e..0000000000 --- a/packages/images/fso-image.bb +++ /dev/null @@ -1,146 +0,0 @@ -#------------------------------------------------------ -# freesmartphone.org Image Recipe -#------------------------------------------------------ - -PV = "1.1" -PR = "r4" - -# no languages for now -IMAGE_LINGUAS = "" - -BASE_INSTALL = "\ - task-base \ -" - -ILLUME_THEME = "illume-theme-freesmartphone" - -X_INSTALL = "\ - task-x11-illume \ - task-fonts-truetype-core \ -" - -X_INSTALL_append_om-gta02 = "\ - task-fonts-truetype-chinese \ - task-fonts-truetype-japanese \ -" - -# tools -TOOLS_INSTALL = "\ - task-cli-tools \ - task-cli-tools-python \ -" - -# audio -AUDIO_INSTALL = "\ - alsa-oss \ - alsa-state \ - alsa-utils-aplay \ - alsa-utils-amixer \ - gst-meta-audio \ - gst-plugin-modplug \ - gst-plugin-sid \ - ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)} \ - fso-sounds \ -" - -GTK_INSTALL = "\ - hicolor-icon-theme \ - tango-icon-theme \ - openmoko-calculator2 \ - vala-terminal \ - gpe-scap \ - tangogps \ -" - -GAMES_INSTALL = "\ - numptyphysics \ -" - -# FIXME these should rather be part of alsa-state, -# once Om stabilizes them... -AUDIO_INSTALL_append_om-gta01 = "\ - openmoko-alsa-scenarios \ -" -AUDIO_INSTALL_append_om-gta02 = "\ - openmoko-alsa-scenarios \ -" - -# python -PYTHON_INSTALL = "\ - task-python-efl \ - python-codecs \ - python-gst \ -" - -# fso+zhone -ZHONE_INSTALL = "\ - task-fso-compliance \ - zhone \ -" - -# additional apps -APPS_INSTALL = "\ - paroli \ - gpe-gallery \ - gpe-sketchbook \ - gpe-filemanager \ - ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'vagalume', d)} \ - starling \ -" - -IMAGE_INSTALL = "\ - ${BASE_INSTALL} \ - ${X_INSTALL} \ - ${GTK_INSTALL} \ - ${GAMES_INSTALL} \ - ${AUDIO_INSTALL} \ - ${TOOLS_INSTALL} \ - ${PYTHON_INSTALL} \ - ${ZHONE_INSTALL} \ - ${APPS_INSTALL} \ -" - -inherit image - -# perform some convenience tweaks to the rootfs to improve the out-of-the-box experience :M: -fso_rootfs_postprocess() { - curdir=$PWD - cd ${IMAGE_ROOTFS} - # date/time - date "+%m%d%H%M%Y" >./etc/timestamp - # alias foo - echo "alias pico=nano" >>./etc/profile - echo "alias fso='cd /local/pkg/fso'" >>./etc/profile - echo "alias ipkg='opkg'" >>./etc/profile - echo "alias vim=vi" >>./etc/profile - echo "alias ll='ls -al'" >>./etc/profile - # nfs - mkdir -p ./local/pkg - echo >>./etc/fstab - echo "# NFS Host" >>./etc/fstab - echo "192.168.0.200:/local/pkg /local/pkg nfs noauto,nolock,soft,rsize=32768,wsize=32768 0 0" >>./etc/fstab - # fix .desktop files for illume - desktop=`find ./usr/share/applications -name "*.desktop"` - for file in $desktop; do - echo "Categories=Office;" >>$file - done - # minimal gtk theme foo - mkdir -p ./etc/gtk-2.0/ - echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc - echo 'gtk-icon-theme-name = "Tango"' >> ./etc/gtk-2.0/gtkrc - # fix strange iconv/gconf bug - ln -s libc.so.6 ./lib/libc.so - # set sensible default DNS entries - echo "nameserver 208.67.222.222" > ./etc/resolv.conf - echo "nameserver 208.67.220.220" >> ./etc/resolv.conf - # remove autostart of gspd (if installed), we have fso-gpsd and this conflicts - rm -f ./etc/init.d/gpsd - # silence printk - mkdir -p ./etc/profile.d/ - echo "echo 0 0 0 0 >/proc/sys/kernel/printk" >./etc/profile.d/printk.sh - chmod a+rx ./etc/profile.d/printk.sh - # back on track - cd $curdir -} - -ROOTFS_POSTPROCESS_COMMAND += "fso_rootfs_postprocess" diff --git a/packages/images/fso-paroli-image.bb b/packages/images/fso-paroli-image.bb new file mode 100644 index 0000000000..1d4bdd5a30 --- /dev/null +++ b/packages/images/fso-paroli-image.bb @@ -0,0 +1,12 @@ +require fso-zhone-image.bb + +# no extra apps +GTK_INSTALL = "" +GAMES_INSTALL = "" +APP_INSTALL = "" + +# fso+zhone +ZHONE_INSTALL = "\ + task-fso-compliance \ + paroli \ +" diff --git a/packages/images/fso-zhone-image.bb b/packages/images/fso-zhone-image.bb new file mode 100644 index 0000000000..7a6cb4927a --- /dev/null +++ b/packages/images/fso-zhone-image.bb @@ -0,0 +1,13 @@ +#------------------------------------------------------ +# freesmartphone.org Image Recipe +#------------------------------------------------------ + +require fso-image.inc + +PV = "1.1" +PR = "r4" + +ZHONE_INSTALL = "\ + task-fso-compliance \ + zhone \ +" -- cgit v1.2.3 From 8e153638402df20f80361a55f527427abf0ac961 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Mon, 16 Feb 2009 21:43:38 +0100 Subject: python-native-2.5.1: remove forgotten dir --- .../python/python-native-2.5.1/bindir-libdir.patch | 18 ---------- .../python-native-2.5.1/catchup-with-swig.patch | 13 -------- .../python-native-2.5.1/cross-distutils.patch | 36 -------------------- .../python-native-2.5.1/default-is-optimized.patch | 13 -------- .../dont-modify-shebang-line.patch | 16 --------- .../python/python-native-2.5.1/fix-staging.patch | 38 ---------------------- 6 files changed, 134 deletions(-) delete mode 100644 packages/python/python-native-2.5.1/bindir-libdir.patch delete mode 100644 packages/python/python-native-2.5.1/catchup-with-swig.patch delete mode 100644 packages/python/python-native-2.5.1/cross-distutils.patch delete mode 100644 packages/python/python-native-2.5.1/default-is-optimized.patch delete mode 100644 packages/python/python-native-2.5.1/dont-modify-shebang-line.patch delete mode 100644 packages/python/python-native-2.5.1/fix-staging.patch diff --git a/packages/python/python-native-2.5.1/bindir-libdir.patch b/packages/python/python-native-2.5.1/bindir-libdir.patch deleted file mode 100644 index 999bddc449..0000000000 --- a/packages/python/python-native-2.5.1/bindir-libdir.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.1/Makefile.pre.in~bindir-libdir 2003-09-20 12:50:28.000000000 +0200 -+++ Python-2.3.1/Makefile.pre.in 2003-11-02 19:53:17.000000000 +0100 -@@ -78,8 +78,8 @@ - exec_prefix= @exec_prefix@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include diff --git a/packages/python/python-native-2.5.1/catchup-with-swig.patch b/packages/python/python-native-2.5.1/catchup-with-swig.patch deleted file mode 100644 index f049b759f4..0000000000 --- a/packages/python/python-native-2.5.1/catchup-with-swig.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Python-2.5.1/Lib/distutils/command/build_ext.py -=================================================================== ---- Python-2.5.1.orig/Lib/distutils/command/build_ext.py -+++ Python-2.5.1/Lib/distutils/command/build_ext.py -@@ -513,7 +513,7 @@ class build_ext (Command): - target_lang=language) - - -- def swig_sources (self, sources, extension): -+ def swig_sources (self, sources, extension=None): - - """Walk the list of source files in 'sources', looking for SWIG - interface (.i) files. Run SWIG on all that are found, and diff --git a/packages/python/python-native-2.5.1/cross-distutils.patch b/packages/python/python-native-2.5.1/cross-distutils.patch deleted file mode 100644 index 3356c1abbe..0000000000 --- a/packages/python/python-native-2.5.1/cross-distutils.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.3/Lib/distutils/sysconfig.py~cross-distutils 2003-02-10 15:02:33.000000000 +0100 -+++ Python-2.3.3/Lib/distutils/sysconfig.py 2004-03-02 20:15:05.000000000 +0100 -@@ -19,8 +19,8 @@ - from errors import DistutilsPlatformError - - # These are needed in a couple of spots, so just compute them once. --PREFIX = os.path.normpath(sys.prefix) --EXEC_PREFIX = os.path.normpath(sys.exec_prefix) -+PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) -+EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - # python_build: (Boolean) if true, we're either building Python or - # building an extension with an un-installed Python, so we use -@@ -192,7 +192,7 @@ - else: - # The name of the config.h file changed in 2.2 - config_h = 'pyconfig.h' -- return os.path.join(inc_dir, config_h) -+ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def get_makefile_filename(): -@@ -200,7 +200,7 @@ - if python_build: - return os.path.join(os.path.dirname(sys.executable), "Makefile") - lib_dir = get_python_lib(plat_specific=1, standard_lib=1) -- return os.path.join(lib_dir, "config", "Makefile") -+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def parse_config_h(fp, g=None): diff --git a/packages/python/python-native-2.5.1/default-is-optimized.patch b/packages/python/python-native-2.5.1/default-is-optimized.patch deleted file mode 100644 index 6beeb6e022..0000000000 --- a/packages/python/python-native-2.5.1/default-is-optimized.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Python-2.5.1/Python/compile.c -=================================================================== ---- Python-2.5.1.orig/Python/compile.c -+++ Python-2.5.1/Python/compile.c -@@ -30,7 +30,7 @@ - #include "symtable.h" - #include "opcode.h" - --int Py_OptimizeFlag = 0; -+int Py_OptimizeFlag = 1; - - /* - ISSUES: diff --git a/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch b/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch deleted file mode 100644 index 54109afd62..0000000000 --- a/packages/python/python-native-2.5.1/dont-modify-shebang-line.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Signed off by Michael 'Mickey' Lauer -# - ---- Python-2.4/Lib/distutils/command/build_scripts.py~dont-modify-shebang-line -+++ Python-2.4/Lib/distutils/command/build_scripts.py -@@ -87,7 +87,7 @@ - continue - - match = first_line_re.match(first_line) -- if match: -+ if False: #match: - adjust = 1 - post_interp = match.group(1) or '' - diff --git a/packages/python/python-native-2.5.1/fix-staging.patch b/packages/python/python-native-2.5.1/fix-staging.patch deleted file mode 100644 index 087c813fd4..0000000000 --- a/packages/python/python-native-2.5.1/fix-staging.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- - Lib/distutils/sysconfig.py | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - ---- Python-2.5.1.orig/Lib/distutils/sysconfig.py -+++ Python-2.5.1/Lib/distutils/sysconfig.py -@@ -52,11 +52,14 @@ def get_python_inc(plat_specific=0, pref - - If 'prefix' is supplied, use it instead of sys.prefix or - sys.exec_prefix -- i.e., ignore 'plat_specific'. - """ - if prefix is None: -- prefix = plat_specific and EXEC_PREFIX or PREFIX -+ if plat_specific: -+ prefix = plat_specific and os.environ['STAGING_INCDIR'].rstrip('include') -+ else: -+ prefix = plat_specific and EXEC_PREFIX or PREFIX - if os.name == "posix": - if python_build: - base = os.path.dirname(os.path.abspath(sys.executable)) - if plat_specific: - inc_dir = base -@@ -94,11 +97,14 @@ def get_python_lib(plat_specific=0, stan - - If 'prefix' is supplied, use it instead of sys.prefix or - sys.exec_prefix -- i.e., ignore 'plat_specific'. - """ - if prefix is None: -- prefix = plat_specific and EXEC_PREFIX or PREFIX -+ if plat_specific: -+ prefix = plat_specific and os.environ['STAGING_LIBDIR'].rstrip('lib') -+ else: -+ prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": - libpython = os.path.join(prefix, - "lib", "python" + get_python_version()) - if standard_lib: -- cgit v1.2.3 From 57ef038f496aac8b8c3a28e16f68fac2e3b2ff54 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 16 Feb 2009 22:55:27 +0100 Subject: boost 1.36: ARM_INSTRUCTION_SET = "arm" --- packages/boost/boost-36.inc | 3 ++- packages/boost/boost_1.36.0.bb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/boost/boost-36.inc b/packages/boost/boost-36.inc index 5ab187d89d..5a4faaf1d6 100644 --- a/packages/boost/boost-36.inc +++ b/packages/boost/boost-36.inc @@ -9,8 +9,9 @@ SECTION = "libs" DEPENDS = "boost-jam-native zlib" PRIORITY = "optional" LICENSE = "Boost Software License" -PR = "r2" +PR = "r3" +ARM_INSTRUCTION_SET = "arm" BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" BOOST_P = "boost_${BOOST_VER}" diff --git a/packages/boost/boost_1.36.0.bb b/packages/boost/boost_1.36.0.bb index 76c8322fb9..140ab290ba 100644 --- a/packages/boost/boost_1.36.0.bb +++ b/packages/boost/boost_1.36.0.bb @@ -1,6 +1,6 @@ include boost-36.inc -PR = "r5" +PR = "r6" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ file://arm-intrinsics.patch;patch=1 \ -- cgit v1.2.3 From b6771d35fa32f1b5a3f8a7f3e0b815d036e3798c Mon Sep 17 00:00:00 2001 From: Tim 'timtim' Ellis Date: Mon, 16 Feb 2009 22:09:18 +0000 Subject: amule: Fix linking issue and add checksums --- conf/checksums.ini | 8 ++++++++ packages/amule/amule_2.1.3.bb | 2 ++ 2 files changed, 10 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index b8c901dfc6..9abd9d972d 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1110,6 +1110,10 @@ sha256=f4d2ac6f09f44eeb82621530b1970afe88fd97cfe82da43b61069800d0c06d12 md5=caa9f5bc44232dc8aeea773fea56be80 sha256=a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33 +[http://downloads.sourceforge.net/amule/aMule-2.1.3.tar.bz2] +md5=0aafdd159edb8ad5f0064da87998b47d +sha256=6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244 + [http://heanet.dl.sourceforge.net/amule/aMule-2.1.3.tar.bz2] md5=0aafdd159edb8ad5f0064da87998b47d sha256=6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244 @@ -22230,6 +22234,10 @@ sha256=1e09f6ad9dd987403f9549c2640680cf932ba00df5afa20a4531e98544b413a5 md5=029ff5aac16ff5c42c89b9a7c7ac4029 sha256=7c03f8e02b023c8843bc959bf32d972cdca27d5f6601c6c2ce1c1174208966d4 +[http://downloads.sourceforge.net/wxwindows/wxBase-2.6.4.tar.bz2] +md5=6e55324d2a522d23fd8834ad8656e0b6 +sha256=1679c29f94983f3fb855f79dcffa2335eb638c6e159444185506e0ff50e6672a + [http://heanet.dl.sourceforge.net/wxwindows/wxBase-2.6.4.tar.bz2] md5=6e55324d2a522d23fd8834ad8656e0b6 sha256=1679c29f94983f3fb855f79dcffa2335eb638c6e159444185506e0ff50e6672a diff --git a/packages/amule/amule_2.1.3.bb b/packages/amule/amule_2.1.3.bb index b160203ffd..1fa4d3cfc9 100644 --- a/packages/amule/amule_2.1.3.bb +++ b/packages/amule/amule_2.1.3.bb @@ -23,3 +23,5 @@ EXTRA_OECONF = "--enable-amulecmd \ FILES_${PN} += " \ ${libdir}/xchat" + +LDFLAGS += "-ldl" -- cgit v1.2.3 From ab6ba812119aa2fbd9c14a5fd7dc0cca63ed5a12 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 16 Feb 2009 17:21:27 -0500 Subject: python-2.6.1: add back empty -O flag to fix weird host==target binary mixing --- .../python-2.6.1/99-ignore-optimization-flag.patch | 19 +++++++++++++++++++ packages/python/python_2.6.1.bb | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 packages/python/python-2.6.1/99-ignore-optimization-flag.patch diff --git a/packages/python/python-2.6.1/99-ignore-optimization-flag.patch b/packages/python/python-2.6.1/99-ignore-optimization-flag.patch new file mode 100644 index 0000000000..02dc44c847 --- /dev/null +++ b/packages/python/python-2.6.1/99-ignore-optimization-flag.patch @@ -0,0 +1,19 @@ +# Reinstate the empty -O option to fix weird mixing of native and target +# binaries and libraries with LD_LIBRARY_PATH when host==target +# +# Signed-off-by: Denys Dmytriyenko + +Index: Python-2.6.1/Modules/main.c +=================================================================== +--- Python-2.6.1-orig/Modules/main.c ++++ Python-2.6.1/Modules/main.c +@@ -352,6 +352,9 @@ Py_Main(int argc, char **argv) + + /* case 'J': reserved for Jython */ + ++ case 'O': /* ignore it */ ++ break; ++ + case 'N': + Py_OptimizeFlag=0; + break; diff --git a/packages/python/python_2.6.1.bb b/packages/python/python_2.6.1.bb index ae9f8ee725..57c64dfa55 100644 --- a/packages/python/python_2.6.1.bb +++ b/packages/python/python_2.6.1.bb @@ -1,7 +1,7 @@ require python.inc DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" -PR = "ml3" +PR = "ml4" SRC_URI = "\ http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ @@ -12,6 +12,7 @@ SRC_URI = "\ file://04-default-is-optimized.patch;patch=1 \ file://05-enable-ctypes-cross-build.patch;patch=1 \ file://06-libffi-enable-default-mips.patch;patch=1 \ + file://99-ignore-optimization-flag.patch;patch=1 \ \ # not yet pushed forward # sitecustomize, sitebranding -- cgit v1.2.3 From 957e3d34d286c9b1a38be03cda2f64f483d4cb82 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 16 Feb 2009 17:26:44 -0500 Subject: gcc-canadian-sdk: Fix a problem where we were passing the wrong headers and such as the target ones. We were accidentially using (and shipping) mingw headers instead of the target ones. --- packages/gcc/gcc-canadian-sdk_4.2.4.bb | 9 ++------- packages/gcc/gcc-configure-canadian-sdk.inc | 13 +++++-------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/packages/gcc/gcc-canadian-sdk_4.2.4.bb b/packages/gcc/gcc-canadian-sdk_4.2.4.bb index 03d9ae364a..ae3245bf7f 100644 --- a/packages/gcc/gcc-canadian-sdk_4.2.4.bb +++ b/packages/gcc/gcc-canadian-sdk_4.2.4.bb @@ -17,13 +17,8 @@ require gcc-package-canadian-sdk.inc SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1 \ file://pr22133-mingw-path-fixup.patch;patch=1 \ file://pr33281-mingw-host-fragment.patch;patch=1 \ - file://pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch;patch=1" - -ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}" - - -SRC_URI_append =+ "\ - file://canadian-build-modules-configure.patch;patch=1 \ + file://pr35916-mingw-__USE_MINGW_ACCESS-everywhere.patch;patch=1 \ + file://canadian-build-modules-configure.patch;patch=1 \ " EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ diff --git a/packages/gcc/gcc-configure-canadian-sdk.inc b/packages/gcc/gcc-configure-canadian-sdk.inc index 489cb46371..c95a6c41df 100644 --- a/packages/gcc/gcc-configure-canadian-sdk.inc +++ b/packages/gcc/gcc-configure-canadian-sdk.inc @@ -3,7 +3,10 @@ require gcc-configure-common.inc USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' -ARCH_FLAGS_FOR_TARGET="" +# +# We need to override this and make sure the compiler can find staging +# +export ARCH_FLAGS_FOR_TARGET = "--sysroot=${STAGING_DIR_TARGET}" # Tools for build export CC_FOR_BUILD="${BUILD_CC}" @@ -57,22 +60,16 @@ export WINDRES_FOR_TARGET="${TARGET_PREFIX}windres" EXTRA_OECONF_DEP ?= "" -SYSROOT = "${WORKDIR}/sysroot" EXTRA_OECONF += "" EXTRA_OECONF_PATHS = " \ --with-local-prefix=$dollar{prefix}/local \ --with-gxx-include-dir=$dollar{prefix}/${TARGET_SYS}/usr/include/c++/${BINV} \ - --with-build-sysroot=${SYSROOT} \ + --with-build-sysroot=${STAGING_DIR_TARGET} \ --with-sysroot=${SDK_REALPATH}/${TARGET_SYS} \ " do_configure () { # Work around Hardcoded path assumptions in gcc - mkdir -p ${SYSROOT}/usr - ln -sf ${STAGING_DIR_HOST}${layout_includedir} \ - ${SYSROOT}/usr/include - ln -sf ${STAGING_DIR_HOST}${layout_libdir} \ - ${SYSROOT}/usr/lib (cd ${S} && gnu-configize) || die "failure running gnu-configize" (cd ${S}/libstdc++-v3 && autoreconf) canadian_sdk_runconf -- cgit v1.2.3 From 60719a8b47fb1de80be3e666d07157133286a7f2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 16 Feb 2009 15:43:59 -0800 Subject: gnuchess_5.021: New recipe fltk-chess_0.51.bb: New recipe --- conf/checksums.ini | 8 ++++++++ packages/gnuchess/fltk-chess_0.51.bb | 29 +++++++++++++++++++++++++++++ packages/gnuchess/gnuchess_5.021.bb | 13 +++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 packages/gnuchess/fltk-chess_0.51.bb create mode 100644 packages/gnuchess/gnuchess_5.021.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 9abd9d972d..ebd6a6e8f5 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -5582,6 +5582,10 @@ sha256=facba5a97a20ca92b32504174474775c6b12fb67a6f646fa0de18db709c3edde md5=ee34788a2dc9fdc088a6dc66c31eba34 sha256=c789b355d0ba03b018513c3904bba6d6fab01b3a83a460fbe1b20a79052f46a4 +[http://members.cheese.at/woody/zaurus/src/fltk-chess-0.51.tgz] +md5=df1f73bdf32f30923d9a2a5717a70913 +sha256=3fffcaf0653c13b249931f76b12119dce8a5b01df056e4b5444f150fec1d5311 + [http://savannah.nongnu.org/download/fluid/fluidsynth-1.0.8.tar.gz] md5=e2abfd2e69fd8b28d965df968d7d44ee sha256=45e7c9967d0fb0344f4da539ab343fb979384b36a429a8594c94cf466dff4320 @@ -7570,6 +7574,10 @@ sha256=417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8 md5=008820142c414517512ab0ad3e036c8b sha256=d97ee0f1c45e1bfa880305a33e7e0ef695927094adce100cc76a76a0f57ef789 +[http://members.cheese.at/woody/fltk-chess/gnuchess_5.02.tar.gz] +md5=01a9e1dc12613543f10ca3bc09acc0af +sha256=64483bf3e98124e3490509a6054da0ff70b69ca0baa04f53444d7cf054deee06 + [http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.6/gnumeric-1.6.3.tar.bz2] md5=78ffd75ae6abc3bb20dd04407a082a26 sha256=badaa6899f71ef112515ce81aee02e559e18b5fa87c7f2262390764aaf9b1dc0 diff --git a/packages/gnuchess/fltk-chess_0.51.bb b/packages/gnuchess/fltk-chess_0.51.bb new file mode 100644 index 0000000000..512e260008 --- /dev/null +++ b/packages/gnuchess/fltk-chess_0.51.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "fltk-chess is a frontend for the Gnuchess chess playing engine." +AUTHOR = "Andreas Holzer " +SECTION = "x11/games" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "fltk" +RDEPENDS = "gnuchess" + + +SRC_URI = "http://members.cheese.at/woody/zaurus/src/fltk-chess-${PV}.tgz" +S = "${WORKDIR}/fltk-chess/" + + +do_compile() { + `fltk-config --cxx --cxxflags --ldflags --use-images` -o fltk-chess \ + fltk-chess.cxx +} + +do_install() { + install -d ${D}${bindir} + install -d ${D}${datadir}/pixmaps/fltk-chess/ + install -d ${D}${datadir}/applications/ + install -m 0755 ${S}/fltk-chess ${D}${bindir} + install -m 0644 ${S}/bitmaps/*.pnx ${D}${datadir}/pixmaps/fltk-chess/ + install -m 0644 ${S}/bitmaps/{user,computer}.png \ + ${D}${datadir}/pixmaps/fltk-chess/ + install -m 0644 ${S}/bitmaps/fltk-chess.png ${D}${datadir}/pixmaps/ + install -m 0644 ${S}/fltk-chess.desktop ${D}${datadir}/applications/ +} diff --git a/packages/gnuchess/gnuchess_5.021.bb b/packages/gnuchess/gnuchess_5.021.bb new file mode 100644 index 0000000000..18c94bdab0 --- /dev/null +++ b/packages/gnuchess/gnuchess_5.021.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Gnuchess is a chess playing engine." +SECTION = "console" +PRIORITY = "optional" +MAINTAINER = "Andreas Holzer " +LICENSE = "GPL" +SRC_URI = "http://members.cheese.at/woody/fltk-chess/gnuchess_5.02.tar.gz" +S = "${WORKDIR}/chess-5.02/src" + +inherit autotools + +do_install() { + install -D ${S}/gnuchess ${D}${bindir}/gnuchess +} -- cgit v1.2.3 From 759542d7c98a220db6ab4a76556237ef734a5129 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 16 Feb 2009 21:06:18 -0500 Subject: gcc-common.inc: Make my last change to fpu check catch all linux variants --- packages/gcc/gcc-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gcc/gcc-common.inc b/packages/gcc/gcc-common.inc index 9e70af71a5..6e777e6be2 100644 --- a/packages/gcc/gcc-common.inc +++ b/packages/gcc/gcc-common.inc @@ -11,7 +11,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # for building for the new host part. So only obey TARGET_FPU for the # real target. def get_gcc_fpu_setting(bb, d): - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ] and bb.data.getVar('TARGET_OS', d, 1) in [ 'linux' ]: + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ] and bb.data.getVar('TARGET_OS', d, 1).find('linux') >= 0 : return "--with-float=soft" return "" -- cgit v1.2.3 From faa823642b911ac367af38cc5625360987b61a98 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 16 Feb 2009 21:33:28 -0500 Subject: fso-images.inc: add an empty file to allow bitbake to parse the entire tree --- packages/images/fso-image.inc | 1 + 1 file changed, 1 insertion(+) create mode 100644 packages/images/fso-image.inc diff --git a/packages/images/fso-image.inc b/packages/images/fso-image.inc new file mode 100644 index 0000000000..4533f359fd --- /dev/null +++ b/packages/images/fso-image.inc @@ -0,0 +1 @@ +# @Mickey: please replace it with the actual file, otherwise tree parsing is broken... -- cgit v1.2.3 From 2ebf454e8133c02e6ca8ea169d86e4496573f739 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Tue, 17 Feb 2009 07:31:02 +0100 Subject: fso-image.inc: add contents --- packages/images/fso-image.inc | 144 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 1 deletion(-) diff --git a/packages/images/fso-image.inc b/packages/images/fso-image.inc index 4533f359fd..6c381a054b 100644 --- a/packages/images/fso-image.inc +++ b/packages/images/fso-image.inc @@ -1 +1,143 @@ -# @Mickey: please replace it with the actual file, otherwise tree parsing is broken... +#------------------------------------------------------ +# freesmartphone.org Image Recipe Include +#------------------------------------------------------ + +# no languages for now +IMAGE_LINGUAS = "" + +BASE_INSTALL = "\ + task-base \ +" + +ILLUME_THEME = "illume-theme-freesmartphone" + +X_INSTALL = "\ + task-x11-illume \ + task-fonts-truetype-core \ +" + +X_INSTALL_append_om-gta02 = "\ + task-fonts-truetype-chinese \ + task-fonts-truetype-japanese \ +" + +# tools +TOOLS_INSTALL = "\ + task-cli-tools \ + task-cli-tools-python \ +" + +# audio +AUDIO_INSTALL = "\ + alsa-oss \ + alsa-state \ + alsa-utils-aplay \ + alsa-utils-amixer \ + gst-meta-audio \ + gst-plugin-modplug \ + gst-plugin-sid \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)} \ + fso-sounds \ +" + +GTK_INSTALL = "\ + hicolor-icon-theme \ + tango-icon-theme \ + openmoko-calculator2 \ + vala-terminal \ + gpe-scap \ + tangogps \ +" + +GAMES_INSTALL = "\ + numptyphysics \ +" + +# FIXME these should rather be part of alsa-state, +# once Om stabilizes them... +AUDIO_INSTALL_append_om-gta01 = "\ + openmoko-alsa-scenarios \ +" +AUDIO_INSTALL_append_om-gta02 = "\ + openmoko-alsa-scenarios \ +" + +# python +PYTHON_INSTALL = "\ + task-python-efl \ + python-codecs \ + python-gst \ +" + +# fso+zhone +ZHONE_INSTALL = "\ + task-fso-compliance \ + zhone \ +" + +# additional apps +APPS_INSTALL = "\ + paroli \ + gpe-gallery \ + gpe-sketchbook \ + gpe-filemanager \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'vagalume', d)} \ + starling \ +" + +IMAGE_INSTALL = "\ + ${BASE_INSTALL} \ + ${X_INSTALL} \ + ${GTK_INSTALL} \ + ${GAMES_INSTALL} \ + ${AUDIO_INSTALL} \ + ${TOOLS_INSTALL} \ + ${PYTHON_INSTALL} \ + ${ZHONE_INSTALL} \ + ${APPS_INSTALL} \ +" + +inherit image + +# perform some convenience tweaks to the rootfs to improve the out-of-the-box experience :M: +fso_rootfs_postprocess() { + curdir=$PWD + cd ${IMAGE_ROOTFS} + # date/time + date "+%m%d%H%M%Y" >./etc/timestamp + # alias foo + echo "alias pico=nano" >>./etc/profile + echo "alias fso='cd /local/pkg/fso'" >>./etc/profile + echo "alias ipkg='opkg'" >>./etc/profile + echo "alias vim=vi" >>./etc/profile + echo "alias ll='ls -al'" >>./etc/profile + # nfs + mkdir -p ./local/pkg + echo >>./etc/fstab + echo "# NFS Host" >>./etc/fstab + echo "192.168.0.200:/local/pkg /local/pkg nfs noauto,nolock,soft,rsize=32768,wsize=32768 0 0" >>./etc/fstab + # fix .desktop files for illume + desktop=`find ./usr/share/applications -name "*.desktop"` + for file in $desktop; do + echo "Categories=Office;" >>$file + done + # minimal gtk theme foo + mkdir -p ./etc/gtk-2.0/ + echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc + echo 'gtk-icon-theme-name = "Tango"' >> ./etc/gtk-2.0/gtkrc + # fix strange iconv/gconf bug + ln -s libc.so.6 ./lib/libc.so + # set sensible default DNS entries + echo "nameserver 208.67.222.222" > ./etc/resolv.conf + echo "nameserver 208.67.220.220" >> ./etc/resolv.conf + # remove autostart of gspd (if installed), we have fso-gpsd and this conflicts + rm -f ./etc/init.d/gpsd + # silence printk + mkdir -p ./etc/profile.d/ + echo "echo 0 0 0 0 >/proc/sys/kernel/printk" >./etc/profile.d/printk.sh + chmod a+rx ./etc/profile.d/printk.sh + # back on track + cd $curdir +} + +ROOTFS_POSTPROCESS_COMMAND += "fso_rootfs_postprocess" -- cgit v1.2.3 From 81a8895ad3c8893b6c6293106b52e14df43f7f68 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Tue, 17 Feb 2009 07:40:12 +0100 Subject: linux-openmoko[devel]: use $CONFIG_NAME for upstream defconfig --- packages/linux/linux-openmoko-2.6.28_git.bb | 2 +- packages/linux/linux-openmoko-devel_git.bb | 15 ++++++--------- packages/linux/linux-openmoko.inc | 11 ++++++++--- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/linux/linux-openmoko-2.6.28_git.bb b/packages/linux/linux-openmoko-2.6.28_git.bb index 8774721308..de38b9d173 100644 --- a/packages/linux/linux-openmoko-2.6.28_git.bb +++ b/packages/linux/linux-openmoko-2.6.28_git.bb @@ -26,7 +26,7 @@ SRC_URI = "\ S = "${WORKDIR}/git" do_configure_prepend() { - install -m 644 ./arch/arm/configs/gta02-packaging-defconfig ${WORKDIR}/defconfig-oe + install -m 644 ${CONFIG_NAME} ${WORKDIR}/defconfig-oe cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR} } diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb index 56c57b395a..912d482413 100644 --- a/packages/linux/linux-openmoko-devel_git.bb +++ b/packages/linux/linux-openmoko-devel_git.bb @@ -1,26 +1,23 @@ require linux.inc require linux-openmoko.inc -DESCRIPTION_${PN} = "Linux ${KERNEL_RELEASE} kernel for the Openmoko Neo GSM Smartphones" - DEFAULT_PREFERENCE = "-1" -KERNEL_RELEASE = "2.6.28" +KERNEL_RELEASE = "2.6.29" KERNEL_VERSION = "${KERNEL_RELEASE}" -OEV = "oe1" +OEV = "oe0" PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" -PR = "r3" +PR = "r0" SRC_URI = "\ git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \ - file://openwrt-ledtrig-netdev.patch;patch=1 \ - file://defconfig-oe.patch \ +# file://openwrt-ledtrig-netdev.patch;patch=1 \ +# file://defconfig-oe.patch \ " S = "${WORKDIR}/git" do_configure_prepend() { - install -m 644 ./arch/arm/configs/gta02_packaging_defconfig ${WORKDIR}/defconfig-oe + install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR} } - diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc index 278a01d5ee..7bb6cd76c3 100644 --- a/packages/linux/linux-openmoko.inc +++ b/packages/linux/linux-openmoko.inc @@ -5,10 +5,13 @@ KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "30008000" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'om-gta01|om-gta02' +COMPATIBLE_MACHINE = "om-gta01|om-gta02|om-gta03" -CONFIG_NAME_om-gta01 = "gta01" -CONFIG_NAME_om-gta02 = "gta02" +CONFIG_NAME_om-gta01 = "gta01-moredrivers-defconfig" +CONFIG_NAME_om-gta02 = "gta02-packaging-defconfig" + +CONFIG_NAME_om-gta03 = "gta03_defconfig" +KERNEL_IMAGETYPE_om-gta03 = "zImage" CMDLINE = "unused -- bootloader passes ATAG list" @@ -24,6 +27,8 @@ module_autoload_g_ether = "g_ether" module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" # audio (GTA02) module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753" +# audio (GTA03) +module_autoload_snd-soc-neo1973-gta02-wm8753 = "" # sd/mmc module_autoload_s3cmci = "s3cmci" -- cgit v1.2.3 From 2975e105f9abf0daf87e08250ffa1ebe67302b6a Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Feb 2009 02:01:06 -0500 Subject: gcc-package-sdk.inc: fix packaging of include-fixed in sdk while issues around include-fixed were fixed 5 months ago, packaging in sdk was missed the issue was reported on #oe by user beagle-dev-543 --- packages/gcc/gcc-cross-sdk_4.3.1.bb | 2 +- packages/gcc/gcc-cross-sdk_4.3.2.bb | 2 +- packages/gcc/gcc-cross-sdk_4.3.3.bb | 2 +- packages/gcc/gcc-package-sdk.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/gcc/gcc-cross-sdk_4.3.1.bb b/packages/gcc/gcc-cross-sdk_4.3.1.bb index 99777dfe00..13d395833e 100644 --- a/packages/gcc/gcc-cross-sdk_4.3.1.bb +++ b/packages/gcc/gcc-cross-sdk_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r12" +PR = "r13" inherit sdk diff --git a/packages/gcc/gcc-cross-sdk_4.3.2.bb b/packages/gcc/gcc-cross-sdk_4.3.2.bb index 54e7453e69..8057608e0d 100644 --- a/packages/gcc/gcc-cross-sdk_4.3.2.bb +++ b/packages/gcc/gcc-cross-sdk_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" inherit sdk diff --git a/packages/gcc/gcc-cross-sdk_4.3.3.bb b/packages/gcc/gcc-cross-sdk_4.3.3.bb index e4a1e41138..29ee187785 100644 --- a/packages/gcc/gcc-cross-sdk_4.3.3.bb +++ b/packages/gcc/gcc-cross-sdk_4.3.3.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" inherit sdk diff --git a/packages/gcc/gcc-package-sdk.inc b/packages/gcc/gcc-package-sdk.inc index 767895bb07..0dc19c70b4 100644 --- a/packages/gcc/gcc-package-sdk.inc +++ b/packages/gcc/gcc-package-sdk.inc @@ -16,7 +16,7 @@ FILES_${PN} = "\ ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \ ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \ ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \ - ${gcclibdir}/${TARGET_SYS}/${BINV}/include \ + ${gcclibdir}/${TARGET_SYS}/${BINV}/include* \ ${includedir}/c++/${BINV} \ ${prefix}/${TARGET_SYS}/bin/* \ ${prefix}/${TARGET_SYS}/lib/* \ -- cgit v1.2.3 From 2cfc560391c1ce0a7737f17952c22e96839f7b83 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Tue, 17 Feb 2009 08:17:38 +0100 Subject: forte: new package 4DIAC-RTE (FORTE) is a small portable implementation of an IEC 61499 runtime environment, see http://www.fordiac.org/8.0.html --- MAINTAINERS | 1 + conf/checksums.ini | 8 ++ .../forte-0.3.5/forte-0.3.5_socket_reuse.patch | 20 ++++ .../forte-0.3.5/forte-0.3.5_stdlib_inc_fix.patch | 22 +++++ packages/forte/forte-0.3.5/forte-0.3.5_timer.patch | 48 +++++++++ .../forte/forte-0.3/forte-0.3-patch_20081008.diff | 109 +++++++++++++++++++++ packages/forte/forte.inc | 15 +++ packages/forte/forte_0.3.5.bb | 10 ++ packages/forte/forte_0.3.bb | 10 ++ 9 files changed, 243 insertions(+) create mode 100644 packages/forte/forte-0.3.5/forte-0.3.5_socket_reuse.patch create mode 100644 packages/forte/forte-0.3.5/forte-0.3.5_stdlib_inc_fix.patch create mode 100644 packages/forte/forte-0.3.5/forte-0.3.5_timer.patch create mode 100644 packages/forte/forte-0.3/forte-0.3-patch_20081008.diff create mode 100644 packages/forte/forte.inc create mode 100644 packages/forte/forte_0.3.5.bb create mode 100644 packages/forte/forte_0.3.bb diff --git a/MAINTAINERS b/MAINTAINERS index 2a0cd1e6e4..211e40c992 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -246,6 +246,7 @@ Recipes: directfb, php Person: Steffen Sledz Mail: sledz@dresearch.de Machines: oxnas +Recipes: forte Person: Stelios Koroneos Mail: skoroneos@digital-opsis.com diff --git a/conf/checksums.ini b/conf/checksums.ini index ebd6a6e8f5..d578009978 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -258,6 +258,10 @@ sha256=1f8504c7f08d2d59c71a70915fc834a285b99587444ee33e23ee3f135c071da0 md5=a8cf945d09c6458cb27228218e9a2f45 sha256=8416e162d6fc921f14a61c8905e9f9a28dc25e67e1c71b75574360a13f0c28c7 +[http://downloads.sourceforge.net/fordiac/FORTE-0.3.5.zip] +md5=d207d3b389ee9f2702df095681459f99 +sha256=2b87b331e931db2db07408c1b07bdb557227e0c16f8fe37f72e40b08fca0a09c + [http://downloads.sourceforge.net/fnorb/Fnorb-1.3.tar.gz] md5=7de1500c7ef6592a603890b45e23261b sha256=d4380ab7fa8b8a9f564592b4e07c96117abd2d3f677b8a73c824cf4f904aa294 @@ -5986,6 +5990,10 @@ sha256=3feaaab499b3f9c7e9b8bdc725dd40fde65b2fbb73794845d7f682746470f594 md5=89b65e010acaa3c5d370e1cc0ea9fce9 sha256=77fb4d23dfa8c12d69ccfda71f482af9804132fab800610970cd5fe9944a3016 +[http://kent.dl.sourceforge.net/sourceforge/fordiac/forte-0.3.zip] +md5=2d01a3d3b9b16bf646e6bb89cb9b0faf +sha256=c3a61174f6a69252983a9b26ea87005bcab6a72b0bd34ea693e3de89e70eaea6 + [ftp://ftp.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1-2.diff.gz] md5=5f059f7c997adbc0a260f27947605be1 sha256=d68c7c8ff6fe94341a3a73d22ab976da42921e3bec9bed628a428518c2c5f67a diff --git a/packages/forte/forte-0.3.5/forte-0.3.5_socket_reuse.patch b/packages/forte/forte-0.3.5/forte-0.3.5_socket_reuse.patch new file mode 100644 index 0000000000..a3dcd10917 --- /dev/null +++ b/packages/forte/forte-0.3.5/forte-0.3.5_socket_reuse.patch @@ -0,0 +1,20 @@ +diff -Naur FORTE-0.3.5.orig/src/arch/pc/pcsochan.cpp FORTE-0.3.5/src/arch/pc/pcsochan.cpp +--- FORTE-0.3.5.orig/src/arch/pc/pcsochan.cpp 2009-01-13 16:17:18.000000000 +0000 ++++ FORTE-0.3.5/src/arch/pc/pcsochan.cpp 2009-02-16 10:08:53.000000000 +0000 +@@ -128,6 +128,16 @@ + } + // switch between client/server: + if (pa_stConnectionInformation.m_enServiceType == e_Server) { ++ unsigned int opt = 1; ++ ++ if (setsockopt(sock_id, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) != 0) ++ { ++ char acError[80] = { "TCP-Socket setsockopt() failed: " }; ++ strcat(acError, strerror(errno)); ++ DEVLOG_ERROR(cg_nID_CSocketHandler, 0x10, acError); ++ return -1; ++ } ++ + sock_addr.sin_addr.s_addr = htonl(INADDR_ANY); + if (bind(sock_id, (struct sockaddr *)&sock_addr, sizeof(struct sockaddr)) != 0) { + DEVLOG_ERROR_2(cg_nID_CSocketHandler, 0x02, "TCP-Socket bind() failed: %s", strerror(errno) ); diff --git a/packages/forte/forte-0.3.5/forte-0.3.5_stdlib_inc_fix.patch b/packages/forte/forte-0.3.5/forte-0.3.5_stdlib_inc_fix.patch new file mode 100644 index 0000000000..3ebd47325a --- /dev/null +++ b/packages/forte/forte-0.3.5/forte-0.3.5_stdlib_inc_fix.patch @@ -0,0 +1,22 @@ +diff -Naur FORTE-0.3.5.orig/src/core/datatypes/forte_lreal.cpp FORTE-0.3.5/src/core/datatypes/forte_lreal.cpp +--- FORTE-0.3.5.orig/src/core/datatypes/forte_lreal.cpp 2008-12-11 16:05:26.000000000 +0000 ++++ FORTE-0.3.5/src/core/datatypes/forte_lreal.cpp 2009-02-16 11:01:44.000000000 +0000 +@@ -8,6 +8,7 @@ + * Contributors: + * : , - changes + *******************************************************************************/ ++#include + #include + #include "forte_lreal.h" + +diff -Naur FORTE-0.3.5.orig/src/core/datatypes/forte_real.cpp FORTE-0.3.5/src/core/datatypes/forte_real.cpp +--- FORTE-0.3.5.orig/src/core/datatypes/forte_real.cpp 2008-12-11 16:05:40.000000000 +0000 ++++ FORTE-0.3.5/src/core/datatypes/forte_real.cpp 2009-02-16 11:12:16.000000000 +0000 +@@ -8,6 +8,7 @@ + * Contributors: + * : , - changes + *******************************************************************************/ ++#include + #include + #include "forte_real.h" + diff --git a/packages/forte/forte-0.3.5/forte-0.3.5_timer.patch b/packages/forte/forte-0.3.5/forte-0.3.5_timer.patch new file mode 100644 index 0000000000..2064cda581 --- /dev/null +++ b/packages/forte/forte-0.3.5/forte-0.3.5_timer.patch @@ -0,0 +1,48 @@ +diff -Naur FORTE-0.3.5.orig/src/arch/pc/pctimeha.cpp FORTE-0.3.5/src/arch/pc/pctimeha.cpp +--- FORTE-0.3.5.orig/src/arch/pc/pctimeha.cpp 2009-01-13 16:17:18.000000000 +0000 ++++ FORTE-0.3.5/src/arch/pc/pctimeha.cpp 2009-02-16 10:16:37.000000000 +0000 +@@ -11,6 +11,7 @@ + #include "pctimeha.h" + #include "../../core/devexec.h" + #include ++#include + + const TINT32 CPCTimerHandler::csm_nTicksPerSecond = 1000; + +@@ -28,14 +29,34 @@ + disableHandler(); + } + ++static inline unsigned long long GetTicks(struct timeval* stTmVal, TINT32 ticksPerSecond) ++{ ++ unsigned long long ret = stTmVal->tv_sec * 1000LL;// sec -> ms ++ ret += stTmVal->tv_usec/1000;// + us -> ms ++ ret /= 1000/ticksPerSecond; // ms -> ticks ++ return ret; ++} ++ + bool CPCTimerHandler::run(){ + struct timespec stReq; ++ struct timeval stTmNow; ++ unsigned long long tickStart; ++ unsigned long long tickNow; ++ unsigned long long tickCalled = 0; + stReq.tv_sec = 0; +- stReq.tv_nsec = 1000000 / (csm_nTicksPerSecond / 1000); ++ stReq.tv_nsec = 1000000000 / (csm_nTicksPerSecond); ++ ++ gettimeofday(&stTmNow, NULL); ++ tickNow = tickStart = GetTicks(&stTmNow, csm_nTicksPerSecond); + + while(m_bAlive){ +- nanosleep(&stReq, NULL); ++ if( (tickNow-tickStart) <= (tickCalled+1) ) { ++ nanosleep(&stReq, NULL); ++ } + nextTick(); ++ ++tickCalled; ++ gettimeofday(&stTmNow, NULL); ++ tickNow = GetTicks(&stTmNow, csm_nTicksPerSecond); + } + return true; + } diff --git a/packages/forte/forte-0.3/forte-0.3-patch_20081008.diff b/packages/forte/forte-0.3/forte-0.3-patch_20081008.diff new file mode 100644 index 0000000000..8478e5f531 --- /dev/null +++ b/packages/forte/forte-0.3/forte-0.3-patch_20081008.diff @@ -0,0 +1,109 @@ +diff -Naur forte-0.3.orig/src/arch/netos/txsocha.cpp forte-0.3/src/arch/netos/txsocha.cpp +--- forte-0.3.orig/src/arch/netos/txsocha.cpp 2008-07-10 07:33:44.000000000 +0000 ++++ forte-0.3/src/arch/netos/txsocha.cpp 2008-09-24 13:29:32.000000000 +0000 +@@ -167,7 +167,7 @@ + strcpy(ip, pa_stConnectionInformation.m_pcConnectionID); + sock_addr.sin_family = AF_INET; + sock_addr.sin_port = htons(atoi(splitString(ip))); +- memset(&(sock_addr.sin_zero), '\0', 8); ++ memset(&(sock_addr.sin_zero), '\0', sizeof(sock_addr.sin_zero)); + fprintf(stderr,"CTXSocketHandler:: Opening TCP-Connection at IP: %s\n",pa_stConnectionInformation.m_pcConnectionID); + + if ((sock_id = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) { +diff -Naur forte-0.3.orig/src/arch/pc/pcsochan.cpp forte-0.3/src/arch/pc/pcsochan.cpp +--- forte-0.3.orig/src/arch/pc/pcsochan.cpp 2008-07-10 07:33:44.000000000 +0000 ++++ forte-0.3/src/arch/pc/pcsochan.cpp 2008-09-30 10:23:36.000000000 +0000 +@@ -116,9 +116,9 @@ + strcpy(ip, pa_stConnectionInformation.m_pcConnectionID); + sock_addr.sin_family = AF_INET; + sock_addr.sin_port = htons(atoi(splitString(ip))); +- memset(&(sock_addr.sin_zero), '\0', 8); ++ memset(&(sock_addr.sin_zero), '\0', sizeof(sock_addr.sin_zero)); + +- char acInfo[64] = { "CPCSocketHandler:: Opening TCP-Connection at IP: " }; ++ char acInfo[128] = { "CPCSocketHandler:: Opening TCP-Connection at IP: " }; + strcat(acInfo, pa_stConnectionInformation.m_pcConnectionID); + DEVLOG_INFO(cg_nID_CSocketHandler, 0x10, acInfo); + +@@ -130,6 +130,16 @@ + } + // switch between client/server: + if (pa_stConnectionInformation.m_enServiceType == e_Server) { ++ unsigned int opt = 1; ++ ++ if (setsockopt(sock_id, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) != 0) ++ { ++ char acError[80] = { "TCP-Socket setsockopt() failed: " }; ++ strcat(acError, strerror(errno)); ++ DEVLOG_ERROR(cg_nID_CSocketHandler, 0x10, acError); ++ return -1; ++ } ++ + sock_addr.sin_addr.s_addr = htonl(INADDR_ANY); + if (bind(sock_id, (struct sockaddr *)&sock_addr, sizeof(struct sockaddr)) + != 0) { +@@ -191,8 +201,15 @@ + int CPCSocketHandler::receiveDataOnTCP(SSocketHandlerListEntry &pa_stData) { + DEVLOG_INFO(cg_nID_CSocketHandler, 0x10, "CPCSocketHandler:: Entering ReceiveDataOnTCP\n"); + ++ int sock_id; ++ ++ if (pa_stData.m_bAcceptedConnection) ++ sock_id = pa_stData.m_nAcceptID; ++ else ++ sock_id = pa_stData.m_nSocketID; ++ + receveagain: pa_stData.m_stConnectionInformation.m_pstRecvBuffer->m_nFilledSize +- =recv(pa_stData.m_nAcceptID, pa_stData.m_stConnectionInformation.m_pstRecvBuffer->m_pcData, pa_stData.m_stConnectionInformation.m_pstRecvBuffer->m_nMaxSize, 0); ++ =recv(sock_id, pa_stData.m_stConnectionInformation.m_pstRecvBuffer->m_pcData, pa_stData.m_stConnectionInformation.m_pstRecvBuffer->m_nMaxSize, 0); + + if (pa_stData.m_stConnectionInformation.m_pstRecvBuffer->m_nFilledSize == -1) { + if (errno == EINTR) { +diff -Naur forte-0.3.orig/src/arch/pc/pctimeha.cpp forte-0.3/src/arch/pc/pctimeha.cpp +--- forte-0.3.orig/src/arch/pc/pctimeha.cpp 2008-04-22 13:31:52.000000000 +0000 ++++ forte-0.3/src/arch/pc/pctimeha.cpp 2008-10-08 12:27:09.000000000 +0000 +@@ -11,6 +11,7 @@ + #include "pctimeha.h" + #include "../../core/devexec.h" + #include ++#include + + const TINT32 CPCTimerHandler::csm_nTicksPerSecond = 1000; + +@@ -28,14 +29,34 @@ + disableHandler(); + } + ++static inline unsigned long long GetTicks(struct timeval* stTmVal, TINT32 ticksPerSecond) ++{ ++ unsigned long long ret = stTmVal->tv_sec * 1000LL;// sec -> ms ++ ret += stTmVal->tv_usec/1000;// + us -> ms ++ ret /= 1000/ticksPerSecond; // ms -> ticks ++ return ret; ++} ++ + bool CPCTimerHandler::run(){ + struct timespec stReq; ++ struct timeval stTmNow; ++ unsigned long long tickStart; ++ unsigned long long tickNow; ++ unsigned long long tickCalled = 0; + stReq.tv_sec = 0; +- stReq.tv_nsec = 1000000 / (csm_nTicksPerSecond / 1000); ++ stReq.tv_nsec = 1000000000 / (csm_nTicksPerSecond); ++ ++ gettimeofday(&stTmNow, NULL); ++ tickNow = tickStart = GetTicks(&stTmNow, csm_nTicksPerSecond); + + while(m_bAlive){ +- nanosleep(&stReq, NULL); ++ if( (tickNow-tickStart) <= (tickCalled+1) ) { ++ nanosleep(&stReq, NULL); ++ } + nextTick(); ++ ++tickCalled; ++ gettimeofday(&stTmNow, NULL); ++ tickNow = GetTicks(&stTmNow, csm_nTicksPerSecond); + } + return true; + } diff --git a/packages/forte/forte.inc b/packages/forte/forte.inc new file mode 100644 index 0000000000..fa97055729 --- /dev/null +++ b/packages/forte/forte.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "4DIAC-RTE (FORTE) is a small portable implementation of an IEC 61499 runtime environment" +HOMEPAGE = "http://www.fordiac.org/8.0.html" +SECTION = "console/network" +DEPENDS = "" +RDEPENDS = "" +LICENSE = "EPL" + +inherit autotools + +EXTRA_OEMAKE = 'LIBS+="-lpthread" CXXFLAGS+="-O0 -g" CPPFLAGS+="-DLOGDEBUG -I${S}/src/core -I${S}/src/core/datatypes -I${S}/src/fblib/events -I${S}/src/fblib/ita -I${S}/src/fblib/math -I${S}/src/fblib/net"' + +do_configure_prepend() { + chmod +x ${S}/configure + ln -s -f ${S}/src/arch/pc ${S}/src/arch/active_arch +} diff --git a/packages/forte/forte_0.3.5.bb b/packages/forte/forte_0.3.5.bb new file mode 100644 index 0000000000..7aeeb8e42e --- /dev/null +++ b/packages/forte/forte_0.3.5.bb @@ -0,0 +1,10 @@ +require forte.inc + +PR = "r0" + +SRC_URI = "http://downloads.sourceforge.net/fordiac/FORTE-0.3.5.zip \ + file://forte-0.3.5_socket_reuse.patch;patch=1 \ + file://forte-0.3.5_timer.patch;patch=1 \ + file://forte-0.3.5_stdlib_inc_fix.patch;patch=1" + +S="${WORKDIR}/FORTE-${PV}" diff --git a/packages/forte/forte_0.3.bb b/packages/forte/forte_0.3.bb new file mode 100644 index 0000000000..c434fb39b8 --- /dev/null +++ b/packages/forte/forte_0.3.bb @@ -0,0 +1,10 @@ +require forte.inc + +PR = "r0" + +DEFAULT_PRE