[oe-commits] org.oe.dev merge of '339249f7db7afee978eb07ba05490a35e8bbca0c'
jeremy_laine commit
oe at amethyst.openembedded.net
Wed Mar 26 14:32:47 UTC 2008
merge of '339249f7db7afee978eb07ba05490a35e8bbca0c'
and '4724e3c77b1dd0458ee0546ec9a8b88a8e779e01'
Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 6dc85a26667fb57194c8f87ef7dcbeec305bf6ba
ViewMTN: http://monotone.openembedded.org/revision/info/6dc85a26667fb57194c8f87ef7dcbeec305bf6ba
Files:
1
packages/squid/squid
packages/squid/squid/fix_epoll_check.patch
packages/squid/squid/squid.init
MAINTAINERS
packages/squid/squid_2.6.STABLE14.bb
packages/alsa/alsa-state/fic-gta01
packages/alsa/alsa-state/fic-gta01/asound.state
packages/alsa/alsa-state/fic-gta01/capturehandset.state
packages/alsa/alsa-state/fic-gta01/captureheadset.state
packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
packages/alsa/alsa-state/fic-gta01/gsmhandset.state
packages/alsa/alsa-state/fic-gta01/gsmheadset.state
packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state
packages/alsa/alsa-state/fic-gta01/stereoout.state
packages/alsa/alsa-state/fic-gta01/voip-handset.state
packages/alsa/alsa-state/fic-gta01/voip-headset.state
packages/alsa/alsa-state/fic-gta02
packages/alsa/alsa-state/fic-gta02/asound.state
packages/alsa/alsa-state/fic-gta02/gsmhandset.state
packages/alsa/alsa-state/fic-gta02/stereoout.state
packages/base-files/base-files/fic-gta01
packages/base-files/base-files/fic-gta01/fstab
packages/base-files/base-files/fic-gta02
packages/base-files/base-files/fic-gta02/fstab
packages/fbset/fbset-modes/fic-gta01
packages/fbset/fbset-modes/fic-gta01/fb.modes
packages/gpephone/gpe-applauncher/fic-gta01
packages/gpephone/gpe-applauncher/fic-gta01/hotkeys.conf
packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf
packages/gpsd/files/fic-gta01
packages/gpsd/files/fic-gta01/gps-hardware
packages/gpsd/files/fic-gta01/gpsd-default
packages/gpsd/files/fic-gta01/restart_gllin.sh
packages/initscripts/initscripts-1.0/fic-gta01
packages/initscripts/initscripts-1.0/fic-gta01/inittab
packages/netbase/netbase/fic-gta01
packages/netbase/netbase/fic-gta01/interfaces
packages/netbase/netbase/fic-gta02
packages/netbase/netbase/fic-gta02/interfaces
packages/openmoko2/openmoko-dialer2/fic-gta01
packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch
packages/openmoko2/openmoko-dialer2/fic-gta02
packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch
packages/pointercal/files/fic-gta01
packages/pointercal/files/fic-gta01/pointercal
packages/pointercal/files/fic-gta02
packages/pointercal/files/fic-gta02/pointercal
packages/scummvm/files/fic-gta01
packages/scummvm/files/fic-gta01/openmoko-scummvm
packages/tslib/tslib/fic-gta01
packages/tslib/tslib/fic-gta01/ts.conf
packages/u-boot/u-boot-1.2.0/fic-gta01
packages/u-boot/u-boot-1.2.0/fic-gta01/fw_env.config
packages/uclibc/uclibc-0.9.29/fic-gta01
packages/uclibc/uclibc-0.9.29/fic-gta01/uClibc.machine
conf/machine/fic-gta01.conf
conf/machine/om-gta01.conf
conf/machine/fic-gta02.conf
conf/machine/om-gta02.conf
packages/alsa/alsa-state/om-gta01
packages/alsa/alsa-state/om-gta02
packages/base-files/base-files/om-gta01
packages/base-files/base-files/om-gta02
packages/fbset/fbset-modes/om-gta01
packages/gpephone/gpe-applauncher/om-gta01
packages/gpsd/files/om-gta01
packages/initscripts/initscripts-1.0/om-gta01
packages/netbase/netbase/om-gta01
packages/netbase/netbase/om-gta02
packages/openmoko2/openmoko-dialer2/om-gta01
packages/openmoko2/openmoko-dialer2/om-gta02
packages/pointercal/files/om-gta01
packages/pointercal/files/om-gta02
packages/scummvm/files/om-gta01
packages/tslib/tslib/om-gta01
packages/u-boot/u-boot-1.2.0/om-gta01
packages/uclibc/uclibc-0.9.29/om-gta01
packages/alsa/alsa-state/om-gta01/asound.state
packages/alsa/alsa-state/om-gta01/capturehandset.state
packages/alsa/alsa-state/om-gta01/captureheadset.state
packages/alsa/alsa-state/om-gta01/gsmbluetooth.state
packages/alsa/alsa-state/om-gta01/gsmhandset.state
packages/alsa/alsa-state/om-gta01/gsmheadset.state
packages/alsa/alsa-state/om-gta01/gsmspeakerout.state
packages/alsa/alsa-state/om-gta01/stereoout.state
packages/alsa/alsa-state/om-gta01/voip-handset.state
packages/alsa/alsa-state/om-gta01/voip-headset.state
packages/alsa/alsa-state/om-gta02/asound.state
packages/alsa/alsa-state/om-gta02/gsmhandset.state
packages/alsa/alsa-state/om-gta02/stereoout.state
packages/base-files/base-files/om-gta01/fstab
packages/base-files/base-files/om-gta02/fstab
packages/fbset/fbset-modes/om-gta01/fb.modes
packages/gpephone/gpe-applauncher/om-gta01/hotkeys.conf
packages/gpephone/gpe-applauncher/om-gta01/softkeys.conf
packages/gpsd/files/om-gta01/gps-hardware
packages/gpsd/files/om-gta01/gpsd-default
packages/gpsd/files/om-gta01/restart_gllin.sh
packages/gtkhtml/gtkhtml-3.8_3.18.0.bb
packages/initscripts/initscripts-1.0/om-gta01/inittab
packages/netbase/netbase/om-gta01/interfaces
packages/netbase/netbase/om-gta02/interfaces
packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch
packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch
packages/pointercal/files/om-gta01/pointercal
packages/pointercal/files/om-gta02/pointercal
packages/scummvm/files/om-gta01/openmoko-scummvm
packages/tslib/tslib/om-gta01/ts.conf
packages/u-boot/u-boot-1.2.0/om-gta01/fw_env.config
packages/uclibc/uclibc-0.9.29/om-gta01/uClibc.machine
conf/distro/include/angstrom.inc
conf/distro/openmoko.conf
contrib/angstrom/build-feeds.sh
contrib/angstrom/build-release.sh
contrib/feed-browser/includes/config.inc
contrib/qa/bugzilla.py
packages/alsa/alsa-state.bb
packages/bluez/bluez-utils3.inc
packages/bluez/bluez-utils_3.11.bb
packages/bluez/bluez-utils_3.12.bb
packages/bluez/bluez-utils_3.13.bb
packages/bluez/bluez-utils_3.14.bb
packages/bluez/bluez-utils_3.15.bb
packages/bluez/bluez-utils_3.16.bb
packages/bluez/bluez-utils_3.17.bb
packages/fbreader/fbreader_0.8.2a.bb
packages/gpephone/gpe-applauncher_0.10.bb
packages/gpephone/gpe-applauncher_0.11.bb
packages/gpephone/gpe-applauncher_svn.bb
packages/gpephone/phoneserver_1.0.bb
packages/gpsd/gpsd.inc
packages/linux/linux-openmoko-devel_git.bb
packages/linux/linux-openmoko_2.6.22.5.bb
packages/linux/linux-openmoko_2.6.24.bb
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
packages/openmoko2/neod_svn.bb
packages/openmoko2/openmoko-dialer2_svn.bb
mtn:execute
true
Diffs:
#
# mt diff -r339249f7db7afee978eb07ba05490a35e8bbca0c -r6dc85a26667fb57194c8f87ef7dcbeec305bf6ba
#
#
#
# add_dir "packages/squid/squid"
#
# add_file "packages/squid/squid/fix_epoll_check.patch"
# content [3cc93eef4aafb715194029ed206e7ac60e3299b8]
#
# add_file "packages/squid/squid/squid.init"
# content [68fb293ffb22b47445e4d15cbb9c5f22e0e64ccb]
#
# patch "MAINTAINERS"
# from [2e0e91fa06057ec36ed952f5c1949979e28dad2a]
# to [68b5a6f70f2d35b99a9cee6ed959cf40be50ddeb]
#
# patch "packages/squid/squid_2.6.STABLE14.bb"
# from [a3362ec5fbb758d23c416f5a20431fc5e27a6f40]
# to [c0df6545b0a97a3186cdbeb762ef44b380dedc3b]
#
============================================================
--- packages/squid/squid/fix_epoll_check.patch 3cc93eef4aafb715194029ed206e7ac60e3299b8
+++ packages/squid/squid/fix_epoll_check.patch 3cc93eef4aafb715194029ed206e7ac60e3299b8
@@ -0,0 +1,11 @@
+--- squid-2.6.STABLE14.orig/configure.in 2007-07-15 16:21:59.000000000 +0200
++++ squid-2.6.STABLE14/configure.in 2008-03-25 17:15:53.000000000 +0100
+@@ -2416,7 +2416,7 @@
+
+ if test -n "$SELECT_TYPE"; then
+ : # Nothing to do
+-elif test "$ac_cv_epoll_works" = "yes" ; then
++elif test "$ac_cv_func_epoll_ctl" = "yes" && "$ac_cv_epoll_works" = "yes" ; then
+ SELECT_TYPE="epoll"
+ elif test "$ac_cv_func_kqueue" = "yes" ; then
+ SELECT_TYPE="kqueue"
============================================================
--- packages/squid/squid/squid.init 68fb293ffb22b47445e4d15cbb9c5f22e0e64ccb
+++ packages/squid/squid/squid.init 68fb293ffb22b47445e4d15cbb9c5f22e0e64ccb
@@ -0,0 +1,70 @@
+#!/bin/sh
+DAEMON=/usr/sbin/squid
+NAME=squid
+DESC="Squid HTTP proxy"
+PIDFILE=/var/run/squid.pid
+SQUID_ARGS="-D -sYC"
+
+test -f $DAEMON || exit 0
+
+grepconf() {
+ w=" " # space tab
+ sq=/etc/$NAME.conf
+ # sed is cool.
+ res=`sed -ne '
+ s/^'$1'['"$w"']\+[^'"$w"']\+['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
+ t end;
+ d;
+ :end q' < $sq`
+ [ -n "$res" ] || res=$2
+ echo "$res"
+}
+
+start() {
+ owner=nobody
+
+ cdr=`grepconf cache_dir /var/spool/$NAME`
+ if [ ! -d "$cdr/00" ]; then
+ mkdir -p $cdr
+ chown $owner $cdr
+ $DAEMON -z
+ fi
+
+ ldr="/var/log/$NAME"
+ if [ ! -d "$ldr" ]; then
+ mkdir -p $ldr
+ chown $owner $cdr
+ fi
+
+ start-stop-daemon -S -p $PIDFILE -x $DAEMON
+}
+
+stop() {
+ start-stop-daemon -K -p $PIDFILE -x $DAEMON
+}
+
+case "$1" in
+ start)
+ echo -n "Starting $DESC: $NAME... "
+ start
+ echo "done."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: $NAME... "
+ stop
+ echo "done."
+ ;;
+ restart)
+ echo "Restarting $DESC: $NAME... "
+ stop
+ sleep 1
+ start
+ echo "done."
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- MAINTAINERS 2e0e91fa06057ec36ed952f5c1949979e28dad2a
+++ MAINTAINERS 68b5a6f70f2d35b99a9cee6ed959cf40be50ddeb
@@ -97,7 +97,7 @@ Recipes: libexosip2, python-cheetah,
Website: http://www.jerryweb.org/
Machines: mpc8313e-rdb
Recipes: libexosip2, python-cheetah, python-django, python-pyopenssl,
-Recipes: pump, squidview
+Recipes: pump, squid, squidview
Person: Joaquim Duran
Mail: joaquinduran at adtelecom.es
============================================================
--- packages/squid/squid_2.6.STABLE14.bb a3362ec5fbb758d23c416f5a20431fc5e27a6f40
+++ packages/squid/squid_2.6.STABLE14.bb c0df6545b0a97a3186cdbeb762ef44b380dedc3b
@@ -1,18 +1,36 @@ LICENSE = "GPLv2"
DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"
LICENSE = "GPLv2"
-
+PR = "r1"
DEPENDS = "squid-native-${PV}"
-SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-${PV}.tar.bz2"
+SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-${PV}.tar.bz2 \
+ file://fix_epoll_check.patch;patch=1 \
+ file://squid.init"
-inherit autotools
+inherit autotools update-rc.d
EXTRA_OECONF = "--disable-epoll --disable-nls"
+logdir = ${localstatedir}/log/squid
+EXTRA_OEMAKE = "\
+ DEFAULT_CACHE_LOG=${logdir}/cache.log \
+ DEFAULT_ACCESS_LOG=${logdir}/access.log \
+ DEFAULT_STORE_LOG=${logdir}/store.log \
+ DEFAULT_PID_FILE=${localstatedir}/run/squid.pid \
+ DEFAULT_SWAP_DIR=${localstatedir}/spool/squid \
+ "
+
+INITSCRIPT_NAME = "squid"
+
do_configure_append() {
sed -i -e 's|./cf_gen |${STAGING_BINDIR_NATIVE}/cf_gen |g' src/Makefile
}
+do_install_append() {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 755 ${WORKDIR}/squid.init ${D}${sysconfdir}/init.d/squid
+}
+
# this packages the languages better and saves some space, installs
# English as errors default and the others in locale package
#
# mt diff -r4724e3c77b1dd0458ee0546ec9a8b88a8e779e01 -r6dc85a26667fb57194c8f87ef7dcbeec305bf6ba
#
#
#
# delete "packages/alsa/alsa-state/fic-gta01"
#
# delete "packages/alsa/alsa-state/fic-gta01/asound.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/capturehandset.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/captureheadset.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/gsmhandset.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/gsmheadset.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/stereoout.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/voip-handset.state"
#
# delete "packages/alsa/alsa-state/fic-gta01/voip-headset.state"
#
# delete "packages/alsa/alsa-state/fic-gta02"
#
# delete "packages/alsa/alsa-state/fic-gta02/asound.state"
#
# delete "packages/alsa/alsa-state/fic-gta02/gsmhandset.state"
#
# delete "packages/alsa/alsa-state/fic-gta02/stereoout.state"
#
# delete "packages/base-files/base-files/fic-gta01"
#
# delete "packages/base-files/base-files/fic-gta01/fstab"
#
# delete "packages/base-files/base-files/fic-gta02"
#
# delete "packages/base-files/base-files/fic-gta02/fstab"
#
# delete "packages/fbset/fbset-modes/fic-gta01"
#
# delete "packages/fbset/fbset-modes/fic-gta01/fb.modes"
#
# delete "packages/gpephone/gpe-applauncher/fic-gta01"
#
# delete "packages/gpephone/gpe-applauncher/fic-gta01/hotkeys.conf"
#
# delete "packages/gpephone/gpe-applauncher/fic-gta01/softkeys.conf"
#
# delete "packages/gpsd/files/fic-gta01"
#
# delete "packages/gpsd/files/fic-gta01/gps-hardware"
#
# delete "packages/gpsd/files/fic-gta01/gpsd-default"
#
# delete "packages/gpsd/files/fic-gta01/restart_gllin.sh"
#
# delete "packages/initscripts/initscripts-1.0/fic-gta01"
#
# delete "packages/initscripts/initscripts-1.0/fic-gta01/inittab"
#
# delete "packages/netbase/netbase/fic-gta01"
#
# delete "packages/netbase/netbase/fic-gta01/interfaces"
#
# delete "packages/netbase/netbase/fic-gta02"
#
# delete "packages/netbase/netbase/fic-gta02/interfaces"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta01"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta02"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch"
#
# delete "packages/pointercal/files/fic-gta01"
#
# delete "packages/pointercal/files/fic-gta01/pointercal"
#
# delete "packages/pointercal/files/fic-gta02"
#
# delete "packages/pointercal/files/fic-gta02/pointercal"
#
# delete "packages/scummvm/files/fic-gta01"
#
# delete "packages/scummvm/files/fic-gta01/openmoko-scummvm"
#
# delete "packages/tslib/tslib/fic-gta01"
#
# delete "packages/tslib/tslib/fic-gta01/ts.conf"
#
# delete "packages/u-boot/u-boot-1.2.0/fic-gta01"
#
# delete "packages/u-boot/u-boot-1.2.0/fic-gta01/fw_env.config"
#
# delete "packages/uclibc/uclibc-0.9.29/fic-gta01"
#
# delete "packages/uclibc/uclibc-0.9.29/fic-gta01/uClibc.machine"
#
# rename "conf/machine/fic-gta01.conf"
# to "conf/machine/om-gta01.conf"
#
# rename "conf/machine/fic-gta02.conf"
# to "conf/machine/om-gta02.conf"
#
# add_dir "packages/alsa/alsa-state/om-gta01"
#
# add_dir "packages/alsa/alsa-state/om-gta02"
#
# add_dir "packages/base-files/base-files/om-gta01"
#
# add_dir "packages/base-files/base-files/om-gta02"
#
# add_dir "packages/fbset/fbset-modes/om-gta01"
#
# add_dir "packages/gpephone/gpe-applauncher/om-gta01"
#
# add_dir "packages/gpsd/files/om-gta01"
#
# add_dir "packages/initscripts/initscripts-1.0/om-gta01"
#
# add_dir "packages/netbase/netbase/om-gta01"
#
# add_dir "packages/netbase/netbase/om-gta02"
#
# add_dir "packages/openmoko2/openmoko-dialer2/om-gta01"
#
# add_dir "packages/openmoko2/openmoko-dialer2/om-gta02"
#
# add_dir "packages/pointercal/files/om-gta01"
#
# add_dir "packages/pointercal/files/om-gta02"
#
# add_dir "packages/scummvm/files/om-gta01"
#
# add_dir "packages/tslib/tslib/om-gta01"
#
# add_dir "packages/u-boot/u-boot-1.2.0/om-gta01"
#
# add_dir "packages/uclibc/uclibc-0.9.29/om-gta01"
#
# add_file "packages/alsa/alsa-state/om-gta01/asound.state"
# content [24c88d006bc4b79644d0fd7d8c92b27d5b3d3c28]
#
# add_file "packages/alsa/alsa-state/om-gta01/capturehandset.state"
# content [e9daf2ba483a71ce163925f4f8123f9b21fae829]
#
# add_file "packages/alsa/alsa-state/om-gta01/captureheadset.state"
# content [c2a0fa104836312145b8705962462a0ab4f9049a]
#
# add_file "packages/alsa/alsa-state/om-gta01/gsmbluetooth.state"
# content [8f6dd94826572a3e21eb710a31de17c94b4ff6e5]
#
# add_file "packages/alsa/alsa-state/om-gta01/gsmhandset.state"
# content [88e380e6c174c2c8e0d067f5f3bf5cc23d9279a9]
#
# add_file "packages/alsa/alsa-state/om-gta01/gsmheadset.state"
# content [d136d1e7e79a80885e9b7a0a03c442fdc032cc61]
#
# add_file "packages/alsa/alsa-state/om-gta01/gsmspeakerout.state"
# content [534365ba106105f05e94a03aea74c9c6da59a017]
#
# add_file "packages/alsa/alsa-state/om-gta01/stereoout.state"
# content [24c88d006bc4b79644d0fd7d8c92b27d5b3d3c28]
#
# add_file "packages/alsa/alsa-state/om-gta01/voip-handset.state"
# content [4d28d6e6a2f7c934263fadf690327fe6208168fd]
#
# add_file "packages/alsa/alsa-state/om-gta01/voip-headset.state"
# content [9693cce22afbd9cb814e2f71ff566df3306c8649]
#
# add_file "packages/alsa/alsa-state/om-gta02/asound.state"
# content [4acb8d435fbb807a4eaab133f99c94acd9e1b3d8]
#
# add_file "packages/alsa/alsa-state/om-gta02/gsmhandset.state"
# content [3db54371d119d26931ec5dc3eacd2f5658fb0982]
#
# add_file "packages/alsa/alsa-state/om-gta02/stereoout.state"
# content [4acb8d435fbb807a4eaab133f99c94acd9e1b3d8]
#
# add_file "packages/base-files/base-files/om-gta01/fstab"
# content [2fcbd6c217ae7674edb29400178b9a37722b27c5]
#
# add_file "packages/base-files/base-files/om-gta02/fstab"
# content [2fcbd6c217ae7674edb29400178b9a37722b27c5]
#
# add_file "packages/fbset/fbset-modes/om-gta01/fb.modes"
# content [69c95216456c7e600b70f0abf276b88b6dabc0fc]
#
# add_file "packages/gpephone/gpe-applauncher/om-gta01/hotkeys.conf"
# content [217d1f1642f1bf620c6743ba01c1a6505d7d1d54]
#
# add_file "packages/gpephone/gpe-applauncher/om-gta01/softkeys.conf"
# content [84522e43d3872a2bd2d6f0e6ab13692ac3dc5683]
#
# add_file "packages/gpsd/files/om-gta01/gps-hardware"
# content [34ec43f27b84b7fd298431b678952fe476a19a9f]
#
# add_file "packages/gpsd/files/om-gta01/gpsd-default"
# content [c45e36caad5bdf37b7d5defe8f18d431e25f9bd4]
#
# add_file "packages/gpsd/files/om-gta01/restart_gllin.sh"
# content [1dd563bb0bc587c3b75094aef643c8ddc47c7942]
#
# add_file "packages/gtkhtml/gtkhtml-3.8_3.18.0.bb"
# content [4dc7653498a87712e21f440aa02e1dba7c89b6c3]
#
# add_file "packages/initscripts/initscripts-1.0/om-gta01/inittab"
# content [5e7dbcf2eab7f08defd62b30f6b48930515c5234]
#
# add_file "packages/netbase/netbase/om-gta01/interfaces"
# content [994ab7e5993a6cceab226b5b58a95031d6466741]
#
# add_file "packages/netbase/netbase/om-gta02/interfaces"
# content [994ab7e5993a6cceab226b5b58a95031d6466741]
#
# add_file "packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch"
# content [43b8c9925bee93d59e2aefd4c7eec71d0b796197]
#
# add_file "packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch"
# content [d1c708f7f915fa250e20a84fa9d4512440442a4f]
#
# add_file "packages/pointercal/files/om-gta01/pointercal"
# content [2e0722a1502bba9d6d25f2ac8e16d60e78136baf]
#
# add_file "packages/pointercal/files/om-gta02/pointercal"
# content [da8aab46ca3bee6dd9b77cba52a3066af3c91892]
#
# add_file "packages/scummvm/files/om-gta01/openmoko-scummvm"
# content [2151aa3ba2826c460d0618140846150531a098bd]
#
# add_file "packages/tslib/tslib/om-gta01/ts.conf"
# content [7123e2647340fe6a95f41cd9f53f3307c08cd223]
#
# add_file "packages/u-boot/u-boot-1.2.0/om-gta01/fw_env.config"
# content [43d22d3cac7c0fc5e16f0cf64bf5faaf64bb3299]
#
# add_file "packages/uclibc/uclibc-0.9.29/om-gta01/uClibc.machine"
# content [4bb493d88e9e62926dd36a721907fb0f7485bb50]
#
# patch "MAINTAINERS"
# from [9d64b9db0e89fa6fdd11390962b7ad4cdb7cc68c]
# to [68b5a6f70f2d35b99a9cee6ed959cf40be50ddeb]
#
# patch "conf/distro/include/angstrom.inc"
# from [915080f9ddb0bc308260b139e457c363cbd504b2]
# to [89f41f937d24a4a443d6346369202ff2554cb48a]
#
# patch "conf/distro/openmoko.conf"
# from [cd50da2fc76ee8d83d951fec318dec373f73fc56]
# to [962733e5bfbba7f4cd47e44ffe8c3d5b87a7ec5a]
#
# patch "contrib/angstrom/build-feeds.sh"
# from [3da81c30a10166d29ffd349810cd487d643da115]
# to [3fee6aacd93f0f9a139e66dc33512daa68dc48b7]
#
# patch "contrib/angstrom/build-release.sh"
# from [4ec4d3a4bd4b7faed699da25e5b2cb2e07247b01]
# to [10aacdcbd2bd2034562c28e44c6aab16bce92d4f]
#
# patch "contrib/feed-browser/includes/config.inc"
# from [39327f92e74d13d82921aae4b3e00a118513abd4]
# to [66c123084727cb690dd143de96462ae1143a840d]
#
# patch "contrib/qa/bugzilla.py"
# from [9bf749e3495c7360334ab2743f1aeee6896d6a22]
# to [26b15cf459a31c6734b6080f215908ca76e5cfc0]
#
# patch "packages/alsa/alsa-state.bb"
# from [b78fa244fb9c836713118514b9b2a32dd5f3bd88]
# to [25be1e0b097bb54aa38ed2131d9c7aa9af312d8e]
#
# patch "packages/bluez/bluez-utils3.inc"
# from [3ae629dcab5f90f03d9a52c099f562c86f8f431b]
# to [bec118cc6df5f14eee7fdba640ac94ebc356097c]
#
# patch "packages/bluez/bluez-utils_3.11.bb"
# from [0b6adc1cba101361b308c4adcb33d6ec603c6be6]
# to [3780d25c2c86f881a67fa3ef80ac6f4a9b8429fc]
#
# patch "packages/bluez/bluez-utils_3.12.bb"
# from [d72dc2f2275e92d866ac373559154ce93edfd074]
# to [0f01ed249966ee969ac14df7dd196a1f69a0c137]
#
# patch "packages/bluez/bluez-utils_3.13.bb"
# from [aa82bb7f1840874ad74d6cd0bdc28cae81267c85]
# to [701d090b4d150d2e2f0b4ba06c6bb985c93e2a25]
#
# patch "packages/bluez/bluez-utils_3.14.bb"
# from [25a3823df1759cd938c75896135d2737dc6bae81]
# to [8acb442cd7b77e98b30aa907f7d6a20858d14f69]
#
# patch "packages/bluez/bluez-utils_3.15.bb"
# from [a6515be5f7deaf5c7ae08f4d976c5b84644d682f]
# to [243e843662067252528d91762b19e7879993efda]
#
# patch "packages/bluez/bluez-utils_3.16.bb"
# from [a6515be5f7deaf5c7ae08f4d976c5b84644d682f]
# to [243e843662067252528d91762b19e7879993efda]
#
# patch "packages/bluez/bluez-utils_3.17.bb"
# from [a6515be5f7deaf5c7ae08f4d976c5b84644d682f]
# to [243e843662067252528d91762b19e7879993efda]
#
# patch "packages/fbreader/fbreader_0.8.2a.bb"
# from [44fe07852ed8432ebe5f55988cb384231d8b214a]
# to [34b916ca0e224a0702b6e0ab82743b59573cee83]
#
# patch "packages/gpephone/gpe-applauncher_0.10.bb"
# from [0e87c045f63b3f7d6257a7f35b67b32550263c73]
# to [b52d3bb38d223435e1eb4193a8582fa608732cb8]
#
# patch "packages/gpephone/gpe-applauncher_0.11.bb"
# from [b55f599b04b5149092913c0a2b83bc4350cdba59]
# to [79e3ed874798cd2ab2f52166c9d269abaa1b43b3]
#
# patch "packages/gpephone/gpe-applauncher_svn.bb"
# from [6440fe8aa26c874ff5b0ef8ba11e739418a62743]
# to [7f6b0c224e2a2391d0c584b72dd768279a263588]
#
# patch "packages/gpephone/phoneserver_1.0.bb"
# from [14d006d02e2ccb15c986eae0f3fb83f5ac8d4a11]
# to [0bc8bc5936c4775edd842ef3d8d8ec0fcd571efd]
#
# patch "packages/gpsd/gpsd.inc"
# from [dae818968f61e6ecdfbb50d477b2022d623f6b0e]
# to [144f4865163bcc05ae2c3ada7416ba79f968a03d]
#
# patch "packages/linux/linux-openmoko-devel_git.bb"
# from [e866bcbb4f9ba5cefb2629e3194179eb317ece60]
# to [8468a373b637c60f8384bf2d5b2d0c745aba14fd]
#
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
# from [48a109b0b7e850da45a142398cd214191154e96e]
# to [fd2207bd3d46eda95d40188d7b7402df4f3ab60b]
#
# patch "packages/linux/linux-openmoko_2.6.24.bb"
# from [7f91b97bcdb927a494ac31c550753100bfa612e7]
# to [3e8f4cd5214568968c604f506f3a25821621d654]
#
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
# from [801c5d051ce467eb8964dc701bb8040c2d9315bf]
# to [7d8bb3d1b1be5528b8f6bbed0eb393b9d1e567eb]
#
# patch "packages/openmoko2/neod_svn.bb"
# from [b6f42319c68704f5ba7b3028e3ddce7196da82ec]
# to [77e71dfd10c1980ddc0b4131a79af4bc60b05bc1]
#
# patch "packages/openmoko2/openmoko-dialer2_svn.bb"
# from [07798651132cae433e354258858b87a1702cbf1c]
# to [2d833bb2d643289d63d9f1815c481efeaea0e8ab]
#
# set "packages/scummvm/files/om-gta01/openmoko-scummvm"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/alsa/alsa-state/om-gta01/asound.state 24c88d006bc4b79644d0fd7d8c92b27d5b3d3c28
+++ packages/alsa/alsa-state/om-gta01/asound.state 24c88d006bc4b79644d0fd7d8c92b27d5b3d3c28
@@ -0,0 +1,910 @@
+state.neo1973 {
+ control.1 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'PCM Volume'
+ value.0 230
+ value.1 230
+ }
+ control.2 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'ADC Capture Volume'
+ value.0 195
+ value.1 195
+ }
+ control.3 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Headphone Playback Volume'
+ value.0 127
+ value.1 127
+ }
+ control.4 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Speaker Playback Volume'
+ value.0 121
+ value.1 121
+ }
+ control.5 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Mono Playback Volume'
+ value 121
+ }
+ control.6 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.7 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Sidetone Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.8 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Voice Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.9 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Headphone Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.10 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Speaker Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.11 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Bypass Playback Volume'
+ value 2
+ }
+ control.12 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Sidetone Playback Volume'
+ value 2
+ }
+ control.13 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Voice Playback Volume'
+ value 2
+ }
+ control.14 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Playback ZC Switch'
+ value false
+ }
+ control.15 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Linear Control'
+ comment.item.1 'Adaptive Boost'
+ iface MIXER
+ name 'Bass Boost'
+ value 'Linear Control'
+ }
+ control.16 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '130Hz @ 48kHz'
+ comment.item.1 '200Hz @ 48kHz'
+ comment.item.2 '100Hz @ 16kHz'
+ comment.item.3 '400Hz @ 48kHz'
+ comment.item.4 '100Hz @ 8kHz'
+ comment.item.5 '200Hz @ 8kHz'
+ iface MIXER
+ name 'Bass Filter'
+ value '130Hz @ 48kHz'
+ }
+ control.17 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Bass Volume'
+ value 0
+ }
+ control.18 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Treble Volume'
+ value 7
+ }
+ control.19 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '8kHz'
+ comment.item.1 '4kHz'
+ iface MIXER
+ name 'Treble Cut-off'
+ value %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list