[oe-commits] org.oe.dev merge of '50705f6719ea83bd28466a1c4445ea1f3af2dd73'

koen commit openembedded-commits at lists.openembedded.org
Mon Nov 19 15:27:11 UTC 2007


merge of '50705f6719ea83bd28466a1c4445ea1f3af2dd73'
     and 'e278d635280136dca9a2d1d6bce39908402e377f'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 36192872b2176688fcbc4233f22dc68b6987bd11
ViewMTN: http://monotone.openembedded.org/revision/info/36192872b2176688fcbc4233f22dc68b6987bd11
Files:
1
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
packages/tasks/task-base.bb
packages/meta/meta-sdk-gpe.bb
packages/meta/meta-sdk-sbox-gpe.bb
packages/meta/meta-sdk-sbox.bb
packages/meta/meta-sdk.bb
packages/zaurus-updater/c7x0
packages/zaurus-updater/c7x0/updater.sh
packages/zaurus-updater/tosa
packages/zaurus-updater/tosa/updater.sh
packages/fuse/gmailfs_0.7.3.bb
packages/fuse/gmailfs.inc
packages/notecase/notecase-1.7.2
packages/pango/pango-1.18.3
packages/zaurus-updater/zaurus-updater
packages/alsa/alsa-state/fic-gta01/voip-handset.state
packages/alsa/alsa-state/fic-gta01/voip-headset.state
packages/autoconf/autoconf-2.61/fix_path_xtra.patch
packages/fuse/fuse-module_2.7.1.bb
packages/fuse/gmailfs_0.8.0.bb
packages/gnutls/gnutls/configure_madness.patch
packages/iptables/files/getsockopt-failed.patch
packages/linux/linux-2.6.23/mpc8323e-rdb/mpc832x-leds.patch
packages/meta/meta-toolchain-gpe-sbox.bb
packages/meta/meta-toolchain-gpe.bb
packages/meta/meta-toolchain-sbox.bb
packages/notecase/notecase-1.7.2/no-hardcoded-cxx.patch
packages/notecase/notecase_1.7.2.bb
packages/pango/pango-1.18.3/no-tests.patch
packages/pango/pango_1.18.3.bb
packages/zaurus-updater/zaurus-updater/updater.sh
classes/base.bbclass
classes/binconfig.bbclass
classes/cross.bbclass
classes/distutils.bbclass
classes/image.bbclass
classes/mozilla.bbclass
classes/pkgconfig.bbclass
classes/rootfs_deb.bbclass
classes/sdk.bbclass
classes/seppuku.bbclass
classes/tmake.bbclass
classes/xlibs.bbclass
conf/bitbake.conf
conf/distro/include/angstrom.inc
conf/distro/include/sane-srcrevs.inc
packages/alsa/alsa-state.bb
packages/apr/apr-util_0.9.12.bb
packages/apr/apr-util_1.2.7.bb
packages/asterisk/asterisk_1.2.24.bb
packages/atk/atk.inc
packages/atk/atk_1.20.0.bb
packages/autoconf/autoconf-native_2.61.bb
packages/autoconf/autoconf_2.61.bb
packages/boost/boost_1.33.0.bb
packages/boost/boost_1.33.1.bb
packages/clamav/clamav.inc
packages/duma/duma_2.5.7.bb
packages/eds/eds-dbus_svn.bb
packages/enchant/enchant_1.1.3.bb
packages/enchant/enchant_1.2.5.bb
packages/enchant/enchant_1.3.0.bb
packages/file-roller/file-roller_2.6.1.bb
packages/gcalctool/gcalctool_5.5.21.bb
packages/glibc/glibc-initial.inc
packages/glibc/glibc-package.bbclass
packages/gnome/gnome-desktop_2.10.2.bb
packages/gnome/gnome-desktop_2.16.1.bb
packages/gnome/gnome-desktop_2.18.3.bb
packages/gnome/gnome-desktop_2.7.90.bb
packages/gnutls/gnutls.inc
packages/gnutls/gnutls_1.6.3.bb
packages/gpdf/gpdf_2.10.0.bb
packages/gpdf/gpdf_2.8.0.bb
packages/gpdf/gpdf_2.8.2.bb
packages/gsm/gsmd.inc
packages/gtk+/gdk-pixbuf-csource_2.10.14.bb
packages/gtk+/gtk+-fastscaling_2.10.14.bb
packages/gtk+/gtk-2.10.inc
packages/initscripts/initscripts-1.0/volatiles
packages/initscripts/initscripts_1.0.bb
packages/iptables/iptables_1.3.8.bb
packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig
packages/linux/linux_2.6.23.bb
packages/meta/meta-toolchain-openmoko.bb
packages/meta/meta-toolchain.bb
packages/openmoko2/openmoko-sound-system2/pulseaudio
packages/openmoko2/openmoko-sound-system2_0.1.0.bb
packages/zaurus-updater/zaurus-updater.bb
Diffs:

#
# mt diff -r50705f6719ea83bd28466a1c4445ea1f3af2dd73 -r36192872b2176688fcbc4233f22dc68b6987bd11
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [b266e41e304fb5ce0ec4b11c2fe160cb123bbe47]
#    to [e97c45e12a1c234a20806eeedde2ff0900f49f75]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [5064b92d581b19db3f8834669b3079f971c98b2f]
#    to [a44e85b6e6e664e9244ae58e75d3bf2d3d3162cf]
# 
# patch "packages/tasks/task-base.bb"
#  from [cdcb312e0d4f77e69ca83bf82f6643335a03135c]
#    to [1a67a9902fc957b26de1621d69f747dac26ee6e2]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	b266e41e304fb5ce0ec4b11c2fe160cb123bbe47
+++ conf/distro/angstrom-2007.1.conf	e97c45e12a1c234a20806eeedde2ff0900f49f75
@@ -14,7 +14,7 @@ require conf/distro/include/sane-srcrevs
 require conf/distro/include/sane-srcrevs.inc
 
 #Images built can have to modes:
-# 'debug': empty rootpassword, strace and gdb included
+# 'debug': empty rootpassword, strace included
 # 'release' no root password, no strace and gdb by default
 DISTRO_TYPE ?= "debug"
 #DISTRO_TYPE = "release"
@@ -206,7 +206,7 @@ DEBUG_APPS ?= ""
 
 # We want to ship extra debug utils in the rootfs when doing a debug build 
 DEBUG_APPS ?= ""
-DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}'
+DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
 
 #this should go away soon
 EXTRA_STUFF ?= ""
============================================================
--- conf/distro/angstrom-2008.1.conf	5064b92d581b19db3f8834669b3079f971c98b2f
+++ conf/distro/angstrom-2008.1.conf	a44e85b6e6e664e9244ae58e75d3bf2d3d3162cf
@@ -20,7 +20,7 @@ require conf/distro/include/sane-srcrevs
 require conf/distro/include/sane-srcrevs.inc
 
 #Images built can have to modes:
-# 'debug': empty rootpassword, strace and gdb included
+# 'debug': empty rootpassword, strace included
 # 'release' no root password, no strace and gdb by default
 DISTRO_TYPE ?= "debug"
 #DISTRO_TYPE = "release"
@@ -168,7 +168,7 @@ DEBUG_APPS ?= ""
 
 # We want to ship extra debug utils in the rootfs when doing a debug build 
 DEBUG_APPS ?= ""
-DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}'
+DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
 
 # Angstrom want to ship some extra stuff. This should be moved into task-base eventually
 # contains ipkg specific stuff as well :(
============================================================
--- packages/tasks/task-base.bb	cdcb312e0d4f77e69ca83bf82f6643335a03135c
+++ packages/tasks/task-base.bb	1a67a9902fc957b26de1621d69f747dac26ee6e2
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r44"
+PR = "r45"
 
 inherit task
 


#
# mt diff -re278d635280136dca9a2d1d6bce39908402e377f -r36192872b2176688fcbc4233f22dc68b6987bd11
#
# 
# 
# delete "packages/meta/meta-sdk-gpe.bb"
# 
# delete "packages/meta/meta-sdk-sbox-gpe.bb"
# 
# delete "packages/meta/meta-sdk-sbox.bb"
# 
# delete "packages/meta/meta-sdk.bb"
# 
# delete "packages/zaurus-updater/c7x0"
# 
# delete "packages/zaurus-updater/c7x0/updater.sh"
# 
# delete "packages/zaurus-updater/tosa"
# 
# delete "packages/zaurus-updater/tosa/updater.sh"
# 
# rename "packages/fuse/gmailfs_0.7.3.bb"
#     to "packages/fuse/gmailfs.inc"
# 
# add_dir "packages/notecase/notecase-1.7.2"
# 
# add_dir "packages/pango/pango-1.18.3"
# 
# add_dir "packages/zaurus-updater/zaurus-updater"
# 
# add_file "packages/alsa/alsa-state/fic-gta01/voip-handset.state"
#  content [c5b60d82c1897991c9945ce182c4b0ffca5a9d12]
# 
# add_file "packages/alsa/alsa-state/fic-gta01/voip-headset.state"
#  content [6e7478155fdc57345e3112db7c8de2755a5e931e]
# 
# add_file "packages/autoconf/autoconf-2.61/fix_path_xtra.patch"
#  content [b750b33038108521042cd0c4435cba62a2f2aa11]
# 
# add_file "packages/fuse/fuse-module_2.7.1.bb"
#  content [18508e3a2ef6dcff4b6e5195c41b8b231e169cf7]
# 
# add_file "packages/fuse/gmailfs_0.7.3.bb"
#  content [69d4a1cdb3ebc1a1fe898172c6a3bc1e1f243c09]
# 
# add_file "packages/fuse/gmailfs_0.8.0.bb"
#  content [69d4a1cdb3ebc1a1fe898172c6a3bc1e1f243c09]
# 
# add_file "packages/gnutls/gnutls/configure_madness.patch"
#  content [2998e7642de3c93def273f07b105f57b61a9f9c9]
# 
# add_file "packages/iptables/files/getsockopt-failed.patch"
#  content [38ab94e3fbbab5bb7dee894315a8d1cbc39ba972]
# 
# add_file "packages/linux/linux-2.6.23/mpc8323e-rdb/mpc832x-leds.patch"
#  content [25f5f43e76ffd4542e4a8f2e9ac797d44344f834]
# 
# add_file "packages/meta/meta-toolchain-gpe-sbox.bb"
#  content [cfdfc9f4b2bbdd1f3ad0ebd0cfa69553220548d7]
# 
# add_file "packages/meta/meta-toolchain-gpe.bb"
#  content [e4b3b787a0714a603a46e6d0423cfddb7bba3c58]
# 
# add_file "packages/meta/meta-toolchain-sbox.bb"
#  content [00b9d0333251622f7df96dfb38a417c61e90a281]
# 
# add_file "packages/notecase/notecase-1.7.2/no-hardcoded-cxx.patch"
#  content [51ab9f2f39f13a1affed9594ed4bf1b08d5924ed]
# 
# add_file "packages/notecase/notecase_1.7.2.bb"
#  content [aeb0a547c5d487b7af7569f01b002beffd26546d]
# 
# add_file "packages/pango/pango-1.18.3/no-tests.patch"
#  content [60137f9cd0f6a15a189956274570896d16cd4631]
# 
# add_file "packages/pango/pango_1.18.3.bb"
#  content [24af597bfe27e33d9b2bb47c39d625d95e8eecc2]
# 
# add_file "packages/zaurus-updater/zaurus-updater/updater.sh"
#  content [d49404556e2187447d41a9c4c22080442b70d001]
# 
# patch "classes/base.bbclass"
#  from [e1c68dc4c2e471a2a583c360a4fd407334e3f6b4]
#    to [aa9556ce2534ddc34c19b8887bb5cd01a46e8ba1]
# 
# patch "classes/binconfig.bbclass"
#  from [6df8ff62e378cb9641276f7b3ed87f3cda559c4e]
#    to [660275cce8f7fec339f68e7aa419d334663a5a21]
# 
# patch "classes/cross.bbclass"
#  from [3a4bcbb22dfee161783616c57a9668a76776f63c]
#    to [8ef5df86820dc67931c8ddb72f1fe303ee04f0b8]
# 
# patch "classes/distutils.bbclass"
#  from [539b0b48207ebc4a3d5c0eb1aabe41de88cc8922]
#    to [09ebff44a5c1e71a442d953d3616f2d4f8c4eaaa]
# 
# patch "classes/image.bbclass"
#  from [469ee07830a49ad3c97a67804413039b7e82c1a0]
#    to [57e9ee07875e7423b6e199df2c69e55bdcdb8a69]
# 
# patch "classes/mozilla.bbclass"
#  from [31a97114fb000d9036266b9dcdcc85790ae09d2f]
#    to [6ab6eb167d906fa0e43bd10ab5c10985f1a1162a]
# 
# patch "classes/pkgconfig.bbclass"
#  from [63cdda1bfc6dad494dbd704675246aa24fc852ae]
#    to [9d65286d1a88f4f1731e7a5c0d77b73f19a4fb91]
# 
# patch "classes/rootfs_deb.bbclass"
#  from [2626dcbe48732859448d08101587a14fe238e7ac]
#    to [a0b75d9e9ae17a15ef75f4c35ae2dbe1a9b70922]
# 
# patch "classes/sdk.bbclass"
#  from [2c814910040ad3a2a065b5001ff19084627f4b30]
#    to [c676bc74ec4f1990541362dca4fe5698aca8eba8]
# 
# patch "classes/seppuku.bbclass"
#  from [600990318f058b4d0322d76c901d7805b090a8c3]
#    to [aa7c1e4b25e78a6657bbd1981530497920099520]
# 
# patch "classes/tmake.bbclass"
#  from [8bd645a6112f70f5ddcc9fa992ff31da23f56038]
#    to [4306ef98dd175ec795cc2dc43fabf275758f235d]
# 
# patch "classes/xlibs.bbclass"
#  from [ea5dd6de4c563ff84d78c6feaf862d16dc6d3948]
#    to [2be3a77c5785ddbbf13dd40f8f9ce044da7a0769]
# 
# patch "conf/bitbake.conf"
#  from [8f16ea0cf38da032893952e183028d445464eedb]
#    to [4ed306ec9f44c19fe02153d4d9a25294d8358687]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [13ccb1f539e12759cb2c505e7f20720cfde25382]
#    to [e97c45e12a1c234a20806eeedde2ff0900f49f75]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [ac4d743447171017b0a7e202e882cc6b040afd36]
#    to [a44e85b6e6e664e9244ae58e75d3bf2d3d3162cf]
# 
# patch "conf/distro/include/angstrom.inc"
#  from [4d41dec0200341e616e594500fc2112370eafd7e]
#    to [9a60ebf691335d1d901b90a8904aff3769f5c1e7]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [6d0c484efba81861d983282087a7cb547e23b01a]
#    to [a7241387cffe65ec6d95b9d1ba03094818c4c4fd]
# 
# patch "packages/alsa/alsa-state.bb"
#  from [a7771dd3c4e224c5afba49e2e2a5792232f72121]
#    to [01b3bf425533199f948a122a8612b2535773c47b]
# 
# patch "packages/apr/apr-util_0.9.12.bb"
#  from [bd4d3d0829e9cbdad6d55ceef5a6b5d1e74174a1]
#    to [1e12960a70bff1c6523d2f7c2538d715626dd335]
# 
# patch "packages/apr/apr-util_1.2.7.bb"
#  from [eafdc458a041562fe759adb4eade0a21d4818606]
#    to [5bea7d4ba65baaae2f314e0e4725e74384c7d8c6]
# 
# patch "packages/asterisk/asterisk_1.2.24.bb"
#  from [c63cd54b2a89fcd7568d7662af05fc02b04b29ba]
#    to [75b0abfa9a0684f19edd02f4383136655d35b61d]
# 
# patch "packages/atk/atk.inc"
#  from [12a24475f571a0921b5788ca3986c5c64bb547fb]
#    to [c823ee3d1af4afa6bcb287e03e6765369bb78fbd]
# 
# patch "packages/atk/atk_1.20.0.bb"
#  from [bc7f8176d301e45a91e539f78177d6f88a5e1d85]
#    to [190d05cefc4412792de79e5b9d1dc0f11194d0a3]
# 
# patch "packages/autoconf/autoconf-native_2.61.bb"
#  from [5b5e460d1ae2d2c23c9ee23969e82124c681c4c0]
#    to [df4d485d3054c9db240bbff4da81782adb601ec7]
# 
# patch "packages/autoconf/autoconf_2.61.bb"
#  from [c54a5aee52046432870f167d5f80009f6bf44115]
#    to [29150170d4d5f197c6ff49a1ecf0aa86d9c016ff]
# 
# patch "packages/boost/boost_1.33.0.bb"
#  from [8fa8e9505e20c792ddcac30a4b3c8d3d2f8a90fb]
#    to [9250e9c2e1581c023e64867372028588784a5709]
# 
# patch "packages/boost/boost_1.33.1.bb"
#  from [4c47ab85f2b6ad4f19473452638727872754947f]
#    to [b7d50805cd778e9f1ace2effa81618d4968d1175]
# 
# patch "packages/clamav/clamav.inc"
#  from [368bdddd995e9d32e0ae7e3f7dfbde55064ef7b3]
#    to [6c1522361fd3f40d78e38a31c594878efbb79141]
# 
# patch "packages/duma/duma_2.5.7.bb"
#  from [b1ca5760b7d15aded488f0d1f3c54a45f2cb1def]
#    to [e1658367dddd38b9789d8f6fef7f6659dc1a06c8]
# 
# patch "packages/eds/eds-dbus_svn.bb"
#  from [8a86f6fbd6b6db637d98ac1c7a87a33eebd8e4bf]
#    to [7abc578fce79a61821501f43eaac6092b4d56b7b]
# 
# patch "packages/enchant/enchant_1.1.3.bb"
#  from [066e12129a58ae25bbdc077e2f2b44784605261e]
#    to [dc93fa3106e9f08fd59eefefc36ed3c9587bfc5f]
# 
# patch "packages/enchant/enchant_1.2.5.bb"
#  from [5fad4b190e6aa2f74c0ea429a588922845e78f8c]
#    to [2a88fd9469d02bbf4cb6eb00004449c32d5fd822]
# 
# patch "packages/enchant/enchant_1.3.0.bb"
#  from [5d3482f3342a24589afff5f57df432edb1651a94]
#    to [985996bbeae0c009a211076b1d413e9f20688e6d]
# 
# patch "packages/file-roller/file-roller_2.6.1.bb"
#  from [0eacecded1adbf3214e367aefec06fe1c1b671a5]
#    to [7952715d413519456cb4f6d28519b49baee68e5b]
# 
# patch "packages/gcalctool/gcalctool_5.5.21.bb"
#  from [7fda82a461076e663974eb74b248de321e3d9896]
#    to [b46fb79589359df12f05088bc49c1977a1fa9e25]
# 
# patch "packages/glibc/glibc-initial.inc"
#  from [edf86eee3b82e6c856795cfdf29481c1119ea9eb]
#    to [62ca813faa060868029e9048fa2a224239e64044]
# 
# patch "packages/glibc/glibc-package.bbclass"
#  from [71e532d510413de3e18dd2b598fc5523ea29f7a9]
#    to [7424898eefe4cc4de00b0f2afd7c044a6c8fb18d]
# 
# patch "packages/gnome/gnome-desktop_2.10.2.bb"
#  from [fe2de0492cdee4337cb21898f2876afb956ecc5b]
#    to [9d8ed2560882aa4b8ce7f82115ed70e10d71a9b8]
# 
# patch "packages/gnome/gnome-desktop_2.16.1.bb"
#  from [aedf2dc2ff050fdb7531f504b91874001a221108]
#    to [565cba914027dd074428c1510c94057850e452ca]
# 
# patch "packages/gnome/gnome-desktop_2.18.3.bb"
#  from [09b25d93e7c51249327663f8ed2786c0475092f4]
#    to [ef92f7acaa754891bf23e36646e9c3faa46a8a6c]
# 
# patch "packages/gnome/gnome-desktop_2.7.90.bb"
#  from [79fdc802317918984cc4746057cce033ecb067c5]
#    to [672cf3775b27ea7c0ca4479a528992bf28309f93]
# 
# patch "packages/gnutls/gnutls.inc"
#  from [68f9beaa99eeb59c7371dd555e9485abd13efa46]
#    to [cc20d75c7e1753143d7a8fd4b2ec7fc8a708868a]
# 
# patch "packages/gnutls/gnutls_1.6.3.bb"
#  from [d18e2ac29c491d7cb869d8f693413a0ab802f11c]
#    to [dbb7cf9f7c57730e2f8cac2d3f4c14485a44bf85]
# 
# patch "packages/gpdf/gpdf_2.10.0.bb"
#  from [62893c96f88dd7d1c1fbb07ca01a8e105bc6e78c]
#    to [36e3098d3b9881f45edaca1c5aec8129523bb48b]
# 
# patch "packages/gpdf/gpdf_2.8.0.bb"
#  from [d41cb3e769026015793aee484042ad628a61482a]
#    to [dff9485393917aba43d187f9c22331081f8195be]
# 
# patch "packages/gpdf/gpdf_2.8.2.bb"
#  from [6acf3349519b5d2b9eb35da96c52d4e713baa00b]
#    to [bb25b66636b66a19b50f05a972168d4e2225c134]
# 
# patch "packages/gsm/gsmd.inc"
#  from [e002ffa198376259ddf782677161057d58b0ac71]
#    to [47a99ec93ca96658be70db56cfe0b8ef57b36875]
# 
# patch "packages/gtk+/gdk-pixbuf-csource_2.10.14.bb"
#  from [df88309722de065fb39ab6330611fb9d91848a2a]
#    to [a2ef39d2f5b1d4cfee0c652d063ffca9ebded3d9]
# 
# patch "packages/gtk+/gtk+-fastscaling_2.10.14.bb"
#  from [ce64606a5f1dcd6be709945a0b16a7f87bddc59f]
#    to [4327a093907014dbbe461ad66db3a0495a986aa7]
# 
# patch "packages/gtk+/gtk-2.10.inc"
#  from [0b317cf35adb0014c5b13d515f1e4a88a1395969]
#    to [162cf297e438ae9441b397783b38eb85d188382d]
# 
# patch "packages/initscripts/initscripts-1.0/volatiles"
#  from [018cdf15373dbc496fd5aabfbb165ecaab713d78]
#    to [0742cbf364df1c77440f9a0c0463d1d30c5bc708]
# 
# patch "packages/initscripts/initscripts_1.0.bb"
#  from [952178e21940e48fa3ab1d4e922384de36bea513]
#    to [1b188ef14b2f1a5999174606f8b5ac18ec979467]
# 
# patch "packages/iptables/iptables_1.3.8.bb"
#  from [c113e9d38b20dc53603f06d7376e50c77dcbf070]
#    to [83d804879e6ab91717d2adb82237eb57d5a4f291]
# 
# patch "packages/linux/linux-2.6.23/mpc8323e-rdb/defconfig"
#  from [1ab95eabf6a3c2f25c8a38107cfdefdba748aa0a]
#    to [27678d7ecddb52724e52d1e6d8bdc0be12b8b32a]
# 
# patch "packages/linux/linux_2.6.23.bb"
#  from [3a43d1090a78823d2ddda0478a27d8a7712f0106]
#    to [00a00d10df9de70b87c4f01ef218370ab40cc076]
# 
# patch "packages/meta/meta-toolchain-openmoko.bb"
#  from [5a2e215e02b6321dcc448a76c44590d15e889728]
#    to [052ed3fc28dde371bd81be6bf9ffaa47c10deb57]
# 
# patch "packages/meta/meta-toolchain.bb"
#  from [c1aa88e153b9f22addc4e09b97c0fdc31ea25efe]
#    to [5837a2cfa7fd7b8a68b416ea0f102347fee62919]
# 
# patch "packages/openmoko2/openmoko-sound-system2/pulseaudio"
#  from [d433451e55cb5437d6d11869506ebab909fc386b]
#    to [dcb5a9c029d96ff9418987416eec111961106e7b]
# 
# patch "packages/openmoko2/openmoko-sound-system2_0.1.0.bb"
#  from [b87498bde36aceaf3befb0207750a942452d5865]
#    to [13b0af54bfe883481d5d3db51bf22cf84091f8d4]
# 
# patch "packages/zaurus-updater/zaurus-updater.bb"
#  from [8f431da1e46051baa0e8fb2ca9012101c3146fea]
#    to [0841e26124c537013227ff1ca2c7645139dfb6e4]
# 
============================================================
--- packages/alsa/alsa-state/fic-gta01/voip-handset.state	c5b60d82c1897991c9945ce182c4b0ffca5a9d12
+++ packages/alsa/alsa-state/fic-gta01/voip-handset.state	c5b60d82c1897991c9945ce182c4b0ffca5a9d12
@@ -0,0 +1,900 @@
+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 255
+		value.1 255
+	}
+	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 121
+		value.1 121
+	}
+	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 6
+		value.1 6
+	}
+	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 true
+		value.1 true
+	}
+	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 6
+	}
+	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 '8kHz'
+	}
+	control.20 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 7'
+		iface MIXER
+		name 'Sidetone Capture Volume'
+		value.0 2
+		value.1 2
+	}
+	control.21 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 7'
+		iface MIXER
+		name 'Voice Sidetone Capture Volume'
+		value 2
+	}
+	control.22 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 63'
+		iface MIXER
+		name 'Capture Volume'
+		value.0 63
+		value.1 63
+	}
+	control.23 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Capture ZC Switch'
+		value.0 false
+		value.1 false
+	}
+	control.24 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Capture Switch'
+		value.0 true
+		value.1 true
+	}
+	control.25 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list