[oe-commits] org.oe.dev merge of '3ee21fd3d6d6a0cddf83ef3711c24b4d6d7d7451'
oe commit
openembedded-commits at lists.openembedded.org
Sat Jan 5 04:10:37 UTC 2008
merge of '3ee21fd3d6d6a0cddf83ef3711c24b4d6d7d7451'
and 'fa0e8dd852860da362d27938db78954d4c8791ae'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: fcfb658bc0012d559f131ce8495a388677380d94
ViewMTN: http://monotone.openembedded.org/revision/info/fcfb658bc0012d559f131ce8495a388677380d94
Files:
1
packages/linux/linux-omap2-git/defconfig
packages/linux/linux-omap2-git/omap2430sdp/defconfig
packages/linux/linux-omap2-git/defconfig.eabi
packages/linux/linux-omap2-git/omap2430sdp/defconfig.eabi
packages/linux/linux-omap2-git/omap2430sdp
packages/gpsd/files/fic-gta01/gpsd
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom-2007-for-openmoko.inc
packages/dotconf
packages/libdotconf
packages/dotconf/dotconf_1.0.13.bb
packages/libdotconf/libdotconf_1.0.13.bb
packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb
packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb
packages/espeak
packages/espeak/espeak_1.30.bb
packages/gpsd/files/fic-gta01/gps-hardware
packages/gpsd/files/gps-hardware
packages/portaudio/portaudio-v19_20071207.bb
packages/speech-dispatcher/files/confSpeechd.conf_00.patch
conf/distro/amsdelta-oe.conf
conf/distro/angstrom-2007.1-legacy.conf
conf/distro/angstrom-2008.1.conf
conf/distro/foonas.conf
conf/distro/mokoslug.conf
conf/distro/openmoko.conf
contrib/angstrom/build-release.sh
contrib/feed-browser/includes/config.inc
contrib/feed-browser/update.php
packages/avahi/avahi.inc
packages/e2fsprogs/e2fsprogs_1.38.bb
packages/gettext/gettext_0.14.1.bb
packages/gpsd/files/gpsd
packages/gpsd/gpsd.inc
packages/gpsd/gpsd_2.28.bb
packages/gpsd/gpsd_2.34.bb
packages/gpsd/gpsd_2.36.bb
packages/images/initramfs-minimal-image.bb
packages/openmoko-apps/files/openmoko-gps.desktop
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
packages/util-linux-ng/util-linux-ng.inc
Diffs:
#
# mt diff -r3ee21fd3d6d6a0cddf83ef3711c24b4d6d7d7451 -rfcfb658bc0012d559f131ce8495a388677380d94
#
#
#
# rename "packages/linux/linux-omap2-git/defconfig"
# to "packages/linux/linux-omap2-git/omap2430sdp/defconfig"
#
# rename "packages/linux/linux-omap2-git/defconfig.eabi"
# to "packages/linux/linux-omap2-git/omap2430sdp/defconfig.eabi"
#
# add_dir "packages/linux/linux-omap2-git/omap2430sdp"
#
#
# mt diff -rfa0e8dd852860da362d27938db78954d4c8791ae -rfcfb658bc0012d559f131ce8495a388677380d94
#
#
#
# delete "packages/gpsd/files/fic-gta01/gpsd"
#
# rename "conf/distro/angstrom-2007.1.conf"
# to "conf/distro/include/angstrom-2007-for-openmoko.inc"
#
# rename "packages/dotconf"
# to "packages/libdotconf"
#
# rename "packages/dotconf/dotconf_1.0.13.bb"
# to "packages/libdotconf/libdotconf_1.0.13.bb"
#
# rename "packages/openmoko-apps/openmoko-gps_0.0.1+svnr4.bb"
# to "packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb"
#
# add_dir "packages/espeak"
#
# add_file "packages/espeak/espeak_1.30.bb"
# content [81d52cdf97440599166ddf3cf05b7e750c5bc59d]
#
# add_file "packages/gpsd/files/fic-gta01/gps-hardware"
# content [34ec43f27b84b7fd298431b678952fe476a19a9f]
#
# add_file "packages/gpsd/files/gps-hardware"
# content [f13135a0d5c59d0ccfa9e06d65f63d5e9bdbadf3]
#
# add_file "packages/portaudio/portaudio-v19_20071207.bb"
# content [ca03af6ddd74b10b2908db9ff329c38c657cfe18]
#
# add_file "packages/speech-dispatcher/files/confSpeechd.conf_00.patch"
# content [5bed98a093c466a9bdc46c9b0e8c257398e39c24]
#
# patch "conf/distro/amsdelta-oe.conf"
# from [d56457812cfc8c1d61da700585d4c8fc7fe28fe3]
# to [2444b09294bbede8664e4a7ed9234c099ea438c8]
#
# patch "conf/distro/angstrom-2007.1-legacy.conf"
# from [c5b38dbf99bb41080ad1856aeae6bb5359c8d578]
# to [78eff07f8d7a4b8d2c3ad4dceb524cfe3d187de8]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [13f3d678fe8a5316bdf4bf2448984ad0f7fbc69e]
# to [e9d69ef671e762d41a8626f692a75ada0753c7d4]
#
# patch "conf/distro/foonas.conf"
# from [008c2abad6f0c3924a944809da95521a477d3ebe]
# to [798d1fa5c36020aa53c1313d2a9f58c32108afae]
#
# patch "conf/distro/mokoslug.conf"
# from [ab158b7aa234beaf461d5531e01375c26743c472]
# to [66f7b238488b8415f9c78e9e344f98a74e83edcf]
#
# patch "conf/distro/openmoko.conf"
# from [bedbe8dd945eb5ace788da554ab20d12a1ab3e6d]
# to [4b51bb9e73520431693069807b3e114a6c43f2c6]
#
# patch "contrib/angstrom/build-release.sh"
# from [4b487748d08b4825735633a40285fee332e77b98]
# to [b708ec70fd4e4e0c2756d122aa95b1d653019a9e]
#
# patch "contrib/feed-browser/includes/config.inc"
# from [c83ad830b6705b298699f4bad3d61b6ea860b1d2]
# to [39327f92e74d13d82921aae4b3e00a118513abd4]
#
# patch "contrib/feed-browser/update.php"
# from [9b418cf2e8cefddae617ffd8e121293445ea1ee1]
# to [21317f05572334abdbc6bf631ac3fed98456bd2d]
#
# patch "packages/avahi/avahi.inc"
# from [301235b5768fb7ab4d745a6a87896f738baadc10]
# to [3e4dfba2b48cd49083cfa3aa95d9a06656feebda]
#
# patch "packages/e2fsprogs/e2fsprogs_1.38.bb"
# from [4cef25c35903aa641d2b356d6bdc6311c9fc90e4]
# to [4a9215b927629a12d9aa3f026971197474ede066]
#
# patch "packages/gettext/gettext_0.14.1.bb"
# from [ae084090fcdd110056d5ce81e5ee0a81bd15fffa]
# to [7293581921c029392be4691314f4f9b6d79c1d09]
#
# patch "packages/gpsd/files/gpsd"
# from [46761ebb43a976a2d7df3d1f0f1c0c4ea805fb7a]
# to [2e08211a015d5617516112a6c4bb0f0bcd2a5a4f]
#
# patch "packages/gpsd/gpsd.inc"
# from [91e167633095484f711ff118e87bf2839f7105b2]
# to [650373a23ddc8159bfc209e03a8bb60a2f5c46e4]
#
# patch "packages/gpsd/gpsd_2.28.bb"
# from [afa8f306a4567c0d18884e4089b424ac63c0955a]
# to [19dc03378642fa1ee106c4bf1ba4f49118860903]
#
# patch "packages/gpsd/gpsd_2.34.bb"
# from [8e241bbd828101019cda7b30a6725fd6759f50f4]
# to [d07d745ca471b1b1cfe875690c9278e223ca2c9c]
#
# patch "packages/gpsd/gpsd_2.36.bb"
# from [fcf9fa136398ac80a6cb1c8408ac6df26d0ddeaf]
# to [9cabcd04b6334d04f5b20d7585ad5d051f19a06f]
#
# patch "packages/images/initramfs-minimal-image.bb"
# from [06a49c2ea305fe2ab0ea3fd38e08c81dcd675500]
# to [dbd98cff25cbaf41dce93c25db637d21705ffa51]
#
# patch "packages/libdotconf/libdotconf_1.0.13.bb"
# from [e67a233b6b36af1e1166969497a8065fc964af7b]
# to [245a00b2859c9b2e151d7d41515c2888a4561d3d]
#
# patch "packages/openmoko-apps/files/openmoko-gps.desktop"
# from [8de00334237a36840fa9f10a8ed4a3ff34429d4a]
# to [27bf14fef64ac997da0176c6227ef495fbd23ddc]
#
# patch "packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb"
# from [78238c49f66f342914243c0044a1286225d9955a]
# to [4274e6a3673edc5493b4f3227e02987d79cb0426]
#
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
# from [990e0945a62343c1db6ea8b85b8b82ce5e35151c]
# to [4c119ef83390203d6cbc5962db26ac4ec8ed6733]
#
# patch "packages/util-linux-ng/util-linux-ng.inc"
# from [5cc612853b6855e2f4df6b91f5f06801c6b029aa]
# to [3289f2865db0b2e423541c2ebf65db5ac8d5529e]
#
============================================================
--- packages/espeak/espeak_1.30.bb 81d52cdf97440599166ddf3cf05b7e750c5bc59d
+++ packages/espeak/espeak_1.30.bb 81d52cdf97440599166ddf3cf05b7e750c5bc59d
@@ -0,0 +1,46 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at hentges.net> (c) 2008
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php
+# for a copy of the license)
+#
+# Filename: espeak_1.30.bb
+# Date: 20080104 (YMD)
+
+DESCRIPTION = "eSpeak is a compact open source software speech synthesizer"
+SECTION = "base"
+LICENSE = "GPL"
+
+DEPENDS = "portaudio-v19"
+
+######################################################################################
+
+PR = "r0"
+
+SRC_URI = "http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-${PV}-source.zip"
+
+S = "${WORKDIR}/${PN}-${PV}-source"
+
+FILES_${PN} += " /usr/share/espeak-data/ "
+
+do_configure() {
+ # espeak supports portaudio in APIs V18 and V19
+ cp ${S}/src/portaudio19.h ${S}/src/portaudio.h
+}
+
+do_compile() {
+ cd src
+ oe_runmake
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -d ${D}${libdir}
+ install -d ${D}${includedir}
+ install -d ${D}/usr/share/espeak-data
+
+ install -m 0755 ${S}/src/espeak ${D}${bindir}
+ oe_libinstall -so -C src libespeak ${D}${libdir}
+
+ cp -prf ${S}/espeak-data/* ${D}/usr/share/espeak-data
+}
============================================================
--- packages/gpsd/files/fic-gta01/gps-hardware 34ec43f27b84b7fd298431b678952fe476a19a9f
+++ packages/gpsd/files/fic-gta01/gps-hardware 34ec43f27b84b7fd298431b678952fe476a19a9f
@@ -0,0 +1,41 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at hentges.net> (c) 2008
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: gps-hardware
+# Date: 20080103 (YMD)
+#
+#################################################################################
+#
+# 20080103 - v0.0.1 - Initial release
+
+if ! test -e /home/root/gllin/gllin
+then
+ echo -e "\n\ngllin GPS driver for Neo1973 not found,"
+ echo "please install the gllin package from"
+ echo "http://3rdparty.downloads.openmoko.org/gllin/"
+ echo ""
+ exit 1
+fi
+
+
+do_start() {
+ /home/root/gllin/gllin >/var/log/gllin.log 2>&1 &
+ sleep 1
+}
+
+do_stop() {
+ gllin_PIDs="`ps ax | grep "/home/root/gllin" | grep -v grep | awk '{print $1}'`"
+ test -n "$gllin_PIDs" && kill $gllin_PIDs
+}
+
+do_status() {
+ ps ax | grep -v grep | grep -q gllin && echo "ready" || echo "unknown"
+}
+
+case "$1" in
+ start) do_start ;;
+ stop) do_stop ;;
+ status) do_status ;;
+esac
============================================================
--- packages/gpsd/files/gps-hardware f13135a0d5c59d0ccfa9e06d65f63d5e9bdbadf3
+++ packages/gpsd/files/gps-hardware f13135a0d5c59d0ccfa9e06d65f63d5e9bdbadf3
@@ -0,0 +1,2 @@
+# This is a dummy file. Some machines use it to bring up integrated GPS
+# devices on demand.
============================================================
--- packages/portaudio/portaudio-v19_20071207.bb ca03af6ddd74b10b2908db9ff329c38c657cfe18
+++ packages/portaudio/portaudio-v19_20071207.bb ca03af6ddd74b10b2908db9ff329c38c657cfe18
@@ -0,0 +1,27 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at hentges.net> (c) 2008
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php
+# for a copy of the license)
+#
+# Filename: portaudio-v19_20071207.bb
+# Date: 20080104 (YMD)
+
+DESCRIPTION = "portaudio is a portable cross-platform Audio API"
+SECTION = "base"
+LICENSE = "GPL"
+
+PR = "r0"
+
+######################################################################################
+
+SRC_URI = "http://www.portaudio.com/archives/pa_stable_v19_${PV}.tar.gz"
+
+S = "${WORKDIR}/portaudio"
+
+inherit autotools
+
+do_stage() {
+ install -m 0644 ${S}/include/portaudio.h ${STAGING_INCDIR}/
+ oe_libinstall -C lib -so libportaudio ${STAGING_LIBDIR}/
+}
============================================================
--- packages/speech-dispatcher/files/confSpeechd.conf_00.patch 5bed98a093c466a9bdc46c9b0e8c257398e39c24
+++ packages/speech-dispatcher/files/confSpeechd.conf_00.patch 5bed98a093c466a9bdc46c9b0e8c257398e39c24
@@ -0,0 +1,26 @@
+--- speech-dispatcher-0.6.5/config/speechd.conf.in.orig 2008-01-04 13:45:43.000000000 +0000
++++ speech-dispatcher-0.6.5/config/speechd.conf.in 2008-01-04 13:47:31.000000000 +0000
+@@ -129,10 +129,10 @@
+ # - configuration is the path to the config file of this module,
+ # either relative (to etc/speechd/modules/) or absolute
+
+-AddModule "espeak" "sd_espeak" "espeak.conf"
+-AddModule "festival" "sd_festival" "festival.conf"
+-AddModule "flite" "sd_flite" "flite.conf"
+-#AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
++#AddModule "espeak" "sd_espeak" "espeak.conf"
++#AddModule "festival" "sd_festival" "festival.conf"
++#AddModule "flite" "sd_flite" "flite.conf"
++AddModule "espeak-generic" "sd_generic" "espeak-generic.conf"
+ #AddModule "epos-generic" "sd_generic" "epos-generic.conf"
+ #AddModule "dtk-generic" "sd_generic" "dtk-generic.conf"
+ #AddModule "ibmtts" "sd_ibmtts" "ibmtts.conf"
+@@ -172,6 +172,6 @@
+
+ # There are some sample client settings
+
+-Include "clients/emacs.conf"
+-Include "clients/gnome-speech.conf"
++#Include "clients/emacs.conf"
++#Include "clients/gnome-speech.conf"
+
============================================================
--- conf/distro/amsdelta-oe.conf d56457812cfc8c1d61da700585d4c8fc7fe28fe3
+++ conf/distro/amsdelta-oe.conf 2444b09294bbede8664e4a7ed9234c099ea438c8
@@ -1,8 +1,8 @@ DISTRO_VERSION = "unstable-${DATE}"
DISTRO = "amsdelta-oe"
DISTRO_NAME = "AmsDelta Linux"
DISTRO_VERSION = "unstable-${DATE}"
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
DISTRO_TYPE = "debug"
============================================================
--- conf/distro/angstrom-2007.1-legacy.conf c5b38dbf99bb41080ad1856aeae6bb5359c8d578
+++ conf/distro/angstrom-2007.1-legacy.conf 78eff07f8d7a4b8d2c3ad4dceb524cfe3d187de8
@@ -1,9 +1,9 @@
#this is a special version of angstrom for legacy (e.g. kernel 2.4) software
# that means:
# * no udev
# * no sysfs
# * no EABI for ARM
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
# We'll have to fill this in as we go.
============================================================
--- conf/distro/angstrom-2008.1.conf 13f3d678fe8a5316bdf4bf2448984ad0f7fbc69e
+++ conf/distro/angstrom-2008.1.conf e9d69ef671e762d41a8626f692a75ada0753c7d4
@@ -6,11 +6,15 @@
#@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille-media.de>
#@--------------------------------------------------------------------
-# This is a testbed for unstable and/or untested things, while angstrom-2007.1
-# is aiming for stability and a release.
+# This is a aimed to be the next stable angstrom release.
+# If you want something stable *right now*, use angstrom-2007.1
+# with the org.openembedded.angstrom-2007.12-stable branch
+#
# Use this at your own risk, we welcome bugreports filed at
# http://bugs.openembedded.org
-# In doubt, use DISTRO="angstrom-2007.1"
+#
+# Again, in doubt, use DISTRO="angstrom-2007.1" with the
+# org.openembedded.angstrom-2007.12-stable branch
#DISTRO_VERSION = "2008.1"
DISTRO_VERSION = "2008.1-test-${DATE}"
============================================================
--- conf/distro/foonas.conf 008c2abad6f0c3924a944809da95521a477d3ebe
+++ conf/distro/foonas.conf 798d1fa5c36020aa53c1313d2a9f58c32108afae
@@ -8,7 +8,7 @@ ANGSTROM_MODE = ${FOONAS_MODE}
FOONAS_MODE ?= "glibc"
ANGSTROM_MODE = ${FOONAS_MODE}
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
DISTRO = "foonas"
DISTRO_NAME = "foonas"
============================================================
--- conf/distro/mokoslug.conf ab158b7aa234beaf461d5531e01375c26743c472
+++ conf/distro/mokoslug.conf 66f7b238488b8415f9c78e9e344f98a74e83edcf
@@ -6,7 +6,7 @@
#@--------------------------------------------------------------------
# MokoSlug is based on Angstrom, and would hopefully just be done by features one day ...
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/angstrom-2008.1.conf
DISTRO = "mokoslug"
DISTRO_NAME = "MokoSlug"
============================================================
--- conf/distro/openmoko.conf bedbe8dd945eb5ace788da554ab20d12a1ab3e6d
+++ conf/distro/openmoko.conf 4b51bb9e73520431693069807b3e114a6c43f2c6
@@ -1,10 +1,10 @@
#-----------------------------------------------------------------------------
#@TYPE: Distribution
#@NAME: OpenMoko
#@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform
#-----------------------------------------------------------------------------
-require conf/distro/angstrom-2007.1.conf
+require conf/distro/include/angstrom-2007-for-openmoko.inc
#
# Header
============================================================
--- contrib/angstrom/build-release.sh 4b487748d08b4825735633a40285fee332e77b98
+++ contrib/angstrom/build-release.sh b708ec70fd4e4e0c2756d122aa95b1d653019a9e
@@ -1,6 +1,6 @@
#!/bin/bash
-DO_UCLIBC=0
+DO_UCLIBC=1
do_build() {
echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
@@ -20,6 +20,12 @@ do_build() {
then
BUILD_MODE="uclibc"
echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+
+ if [ "$BUILD_CLEAN" != "" ]
+ then
+ bitbake -c clean $BUILD_CLEAN
+ fi
+
for target in $BUILD_TARGETS
do
bitbake $target && do_report_success
@@ -43,7 +49,7 @@ do_report_success() {
# No graphics
-for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk
+for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk
do
BUILD_MACHINE=$machine
BUILD_CLEAN="libtool-cross base-files"
============================================================
--- contrib/feed-browser/includes/config.inc c83ad830b6705b298699f4bad3d61b6ea860b1d2
+++ contrib/feed-browser/includes/config.inc 39327f92e74d13d82921aae4b3e00a118513abd4
@@ -1,301 +1,746 @@
<?php
-define('DB_FILENAME', './feeds.db');
+define('DB_FILENAME', '/home/angstrom/website/repo/feeds.db');
+$feed_base_url = "http://www.angstrom-distribution.org/unstable/feed/";
$feeds = array(
- array(
- 'distro_name'=>'OpenZaurus',
- 'distro_version'=>'3.5.4',
- 'feed_base_url'=>'http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/feed/',
- 'feeds'=>array(
+ array(
+ 'distro_name'=>'Ångström',
+ 'distro_version'=>'unstable',
+ 'feed_base_url'=>'http://www.angstrom-distribution.org/unstable/feed/',
+ 'feeds'=>
array(
- 'name'=>'base',
- 'url'=>'base',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'opie',
- 'url'=>'opie',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'x11',
- 'url'=>'x11',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'upgrades',
- 'url'=>'upgrades',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'perl',
- 'url'=>'perl',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'python',
- 'url'=>'python',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Collie upgrades',
- 'url'=>'upgrades/machine/collie',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'Tosa upgrades',
- 'url'=>'upgrades/machine/tosa',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'Poodle upgrades',
- 'url'=>'upgrades/machine/poodle',
- 'type'=>'upgrades',
- ),
- array(
- 'name'=>'Poodle',
- 'url'=>'machine/poodle',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Collie',
- 'url'=>'machine/collie',
- 'type'=>'normal',
- ),
- array(
- 'name'=>'Tosa',
- 'url'=>'machine/tosa',
- 'type'=>'normal',
- )
- )
- ),
- array(
- 'distr%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list