[oe-commits] org.oe.dev merge of '3524b1de858df7cc6c88667817fb70332cf4b03e'

rwhitby commit openembedded-commits at lists.openembedded.org
Thu Jun 21 17:39:04 UTC 2007


merge of '3524b1de858df7cc6c88667817fb70332cf4b03e'
     and 'cb41a381e7a0c491e5968be15cd985dc75d92aaf'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: db1728ec4eb0f06b07e6e7376cff9b934b0b6de1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=db1728ec4eb0f06b07e6e7376cff9b934b0b6de1
Files:
1
packages/kismet/kismet-2006-04-R1
packages/kismet/kismet-2006-04-R1/no-chmod.patch
packages/kismet/kismet_2005-04-R1.bb
packages/kismet/kismet_2005-08-R1.bb
packages/kismet/kismet_2006-04-R1.bb
packages/libmpeg2
packages/libmpeg2/libmpeg2-0.4.0b
packages/libmpeg2/libmpeg2-0.4.0b/Makefile.patch
packages/libmpeg2/libmpeg2_0.4.0b.bb
packages/xorg-lib/files/errordb-keysymdb-path-fix.patch
packages/bluez/bluez-utils_3.10.1.bb
packages/bluez/bluez-utils_3.11.bb
packages/libiconv/libiconv_1.9.2.bb
packages/libiconv/libiconv_1.11.bb
packages/lighttpd/lighttpd_1.4.13.bb
packages/lighttpd/lighttpd_1.4.15.bb
packages/uclibc/uclibc-initial_0.9.28.bb
packages/uclibc/uclibc-initial_0.9.29.bb
packages/alsa/alsa-state/c7x0
packages/alsa/alsa-state/spitz
packages/alsa/alsa-state/tosa
packages/xorg-xserver/xserver-kdrive-1.3.0.0
conf/distro/hentges-2.0.conf
conf/machine/hentges-2.0_common.conf
conf/machine/hentges-2.0_spitz.conf
packages/alsa/alsa-state/c7x0/asound.state
packages/alsa/alsa-state/spitz/asound.state
packages/alsa/alsa-state/tosa/asound.state
packages/bluez/bluez-libs_3.11.bb
packages/gnome/gnome-desktop/no-desktop-docs.patch
packages/gtk+/composite-pixbuf_0.0.bb
packages/images/hentges-console-image.bb
packages/images/hentges-x11-image.bb
packages/libcap/libcap-1.10/syscall.patch
packages/meta/oplinux-packages.bb
packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/wireless.patch
packages/rt2x00/rt2570-k2wrlz_1.6.0.bb
packages/scummvm/scummvm_0.9.1.bb
packages/tasks/task-hentges-base.bb
packages/tasks/task-hentges-x11.bb
packages/telepathy/empathy_0.4.bb
packages/telepathy/telepathy-mission-control_4.22.bb
packages/vsftpd/vsftpd-2.0.5/syscall.patch
packages/watchdog/watchdog_5.3.1.bb
packages/xorg-xserver/xserver-kdrive-1.3.0.0/disable-xf86-dga-xorgcfg.patch
packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch
packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch
packages/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
packages/zaurusd/files/alsa-cxx00-default.state.patch
packages/zaurusd/files/disable-alsa-handling.patch
MAINTAINERS
classes/icecc.bbclass
conf/checksums.ini
conf/distro/angstrom-2007.1.conf
conf/distro/slugos.conf
conf/machine/guinness.conf
conf/machine/htcuniversal.conf
packages/alsa/alsa-state.bb
packages/alsa/alsa-utils_1.0.13.bb
packages/gdb/gdb_6.6.bb
packages/gnome/gnome-desktop_2.16.1.bb
packages/kismet/kismet_2007-01-R1b.bb
packages/libcap/libcap_1.10.bb
packages/libgpevtype/libgpevtype_svn.bb
packages/linux/ipod_2.4.24-ipod0.bb
packages/linux/linux-dht-walnut_2.6.20.bb
packages/linux/linux-magicbox_2.6.19.2.bb
packages/linux-uml/linux-uml_2.4.26.bb
packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
packages/mesa/mesa-mesa.inc
packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
packages/scummvm/scummvm-qpe_0.6.1b.bb
packages/scummvm/scummvm_0.6.0.bb
packages/scummvm/scummvm_0.6.1b.bb
packages/scummvm/scummvm_0.9.0.bb
packages/tasks/task-base.bb
packages/uboot/u-boot.inc
packages/uclibc/uclibc_0.9.29.bb
packages/vsftpd/vsftpd_2.0.5.bb
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg_1.2.0.bb
packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
packages/zaurusd/zaurusd_svn.bb
removal.txt
Diffs:

#
# mt diff -r3524b1de858df7cc6c88667817fb70332cf4b03e -rdb1728ec4eb0f06b07e6e7376cff9b934b0b6de1
#
# 
# no changes
# 


#
# mt diff -rcb41a381e7a0c491e5968be15cd985dc75d92aaf -rdb1728ec4eb0f06b07e6e7376cff9b934b0b6de1
#
# 
# 
# delete "packages/kismet/kismet-2006-04-R1"
# 
# delete "packages/kismet/kismet-2006-04-R1/no-chmod.patch"
# 
# delete "packages/kismet/kismet_2005-04-R1.bb"
# 
# delete "packages/kismet/kismet_2005-08-R1.bb"
# 
# delete "packages/kismet/kismet_2006-04-R1.bb"
# 
# delete "packages/libmpeg2"
# 
# delete "packages/libmpeg2/libmpeg2-0.4.0b"
# 
# delete "packages/libmpeg2/libmpeg2-0.4.0b/Makefile.patch"
# 
# delete "packages/libmpeg2/libmpeg2_0.4.0b.bb"
# 
# delete "packages/xorg-lib/files/errordb-keysymdb-path-fix.patch"
# 
# rename "packages/bluez/bluez-utils_3.10.1.bb"
#     to "packages/bluez/bluez-utils_3.11.bb"
# 
# rename "packages/libiconv/libiconv_1.9.2.bb"
#     to "packages/libiconv/libiconv_1.11.bb"
# 
# rename "packages/lighttpd/lighttpd_1.4.13.bb"
#     to "packages/lighttpd/lighttpd_1.4.15.bb"
# 
# rename "packages/uclibc/uclibc-initial_0.9.28.bb"
#     to "packages/uclibc/uclibc-initial_0.9.29.bb"
# 
# add_dir "packages/alsa/alsa-state/c7x0"
# 
# add_dir "packages/alsa/alsa-state/spitz"
# 
# add_dir "packages/alsa/alsa-state/tosa"
# 
# add_dir "packages/xorg-xserver/xserver-kdrive-1.3.0.0"
# 
# add_file "conf/distro/hentges-2.0.conf"
#  content [0e4e2f8ba133f45365cb9694301abc4d83ea08d2]
# 
# add_file "conf/machine/hentges-2.0_common.conf"
#  content [a9504a6863568231c88c9182e434faf2a723aa25]
# 
# add_file "conf/machine/hentges-2.0_spitz.conf"
#  content [9f6507c5768a10e6fa79279d422049adde6a2fe2]
# 
# add_file "packages/alsa/alsa-state/c7x0/asound.state"
#  content [012aede108f1f056ec75ab961a56b1190b1a66ff]
# 
# add_file "packages/alsa/alsa-state/spitz/asound.state"
#  content [cfae718855d1e5dfb6361f15edcb3f9b9a8356d0]
# 
# add_file "packages/alsa/alsa-state/tosa/asound.state"
#  content [286b6f6d135ae0b735245ec22b02789d855daf99]
# 
# add_file "packages/bluez/bluez-libs_3.11.bb"
#  content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
# 
# add_file "packages/gnome/gnome-desktop/no-desktop-docs.patch"
#  content [136181323f2ef479cf676a41ee7e78daecbf4bd4]
# 
# add_file "packages/gtk+/composite-pixbuf_0.0.bb"
#  content [a37b89b70770a6a01f14f3fb5f947ea02ef6fab5]
# 
# add_file "packages/images/hentges-console-image.bb"
#  content [4d0e5cf6cda554ce15509c1fca159702f8101ded]
# 
# add_file "packages/images/hentges-x11-image.bb"
#  content [79961cabf7e2012da37668c9412120bae0a9eaa6]
# 
# add_file "packages/libcap/libcap-1.10/syscall.patch"
#  content [afd55fb9c1720c3ca3c7a4b1e64c781cc6d0fde4]
# 
# add_file "packages/lighttpd/lighttpd_1.4.13.bb"
#  content [8b5674cbb64f69a0c4f5bc1c5cea3b6dd6ac2ca3]
# 
# add_file "packages/meta/oplinux-packages.bb"
#  content [f020e9c1d3a786bfa6bff00cb43713a88924070e]
# 
# add_file "packages/prismstumbler/prismstumbler-0.7.3+0.7.4pre1/wireless.patch"
#  content [30c59780b1f8ceb904513026f874a968866057f8]
# 
# add_file "packages/rt2x00/rt2570-k2wrlz_1.6.0.bb"
#  content [4e5dc40dbeba9597e068ab1d3ea0d90f98130b9d]
# 
# add_file "packages/scummvm/scummvm_0.9.1.bb"
#  content [7a143213146b4e648a364d33165d80b505cff402]
# 
# add_file "packages/tasks/task-hentges-base.bb"
#  content [b18f14c0e0dc0b467346f12106dbfde340a9e7b5]
# 
# add_file "packages/tasks/task-hentges-x11.bb"
#  content [794d8a26c1da3e1034644fc2fd3327044563687b]
# 
# add_file "packages/telepathy/empathy_0.4.bb"
#  content [59ad2389224f8de9a5218db79829674d0eb59824]
# 
# add_file "packages/telepathy/telepathy-mission-control_4.22.bb"
#  content [24eeb5be373d15a2eb60ea390cbf29104a7ef411]
# 
# add_file "packages/uclibc/uclibc-initial_0.9.28.bb"
#  content [7caa98e267d3cfe298ae6020da2bbce247aacc84]
# 
# add_file "packages/vsftpd/vsftpd-2.0.5/syscall.patch"
#  content [991f11f968951a0da9a96c08771ea3d1d1f0ddd5]
# 
# add_file "packages/watchdog/watchdog_5.3.1.bb"
#  content [ed2652c9fd4c0b34a5b01b7ef1319c925ebe54aa]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/disable-xf86-dga-xorgcfg.patch"
#  content [0e8754f39994efeff67f876087794543f5ec4a2f]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-epson.patch"
#  content [4d657da764e8fb33cf647d9d68079ba7721c2952]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-tslib.patch"
#  content [da8dca6dddb0c70f2142c1e9dedd95a1fc90039e]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/enable-xcalibrate.patch"
#  content [3275da5de47a6f6c3d3a21a633100b84b73b12b1]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/optional-xkb.patch"
#  content [0251f2f2cb12806f75ee044421a05b3b94ae3049]
# 
# add_file "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
#  content [433dab838e5f1b64db9165a9c06ddd64703dca57]
# 
# add_file "packages/xorg-xserver/xserver-xorg_1.3.0.0.bb"
#  content [41a0c1a5da83422122b84345f03373d38f79e2c2]
# 
# add_file "packages/zaurusd/files/alsa-cxx00-default.state.patch"
#  content [8639ceffa75b367727f4636524e4a663237a1b54]
# 
# add_file "packages/zaurusd/files/disable-alsa-handling.patch"
#  content [472f7fb912da7db8ab3faeecc209ca2b7d33ded7]
# 
# patch "MAINTAINERS"
#  from [9725f7ac037ee4c5e60affa3c62399b768fbe2dd]
#    to [37b3a8cb66e9e882060255cd601ab403e802c4ce]
# 
# patch "classes/icecc.bbclass"
#  from [b5dd4df0905e5e5d131bbfd736d2f5a4b4cb6609]
#    to [85ea9ee2e04f7cf2e0b9311d2d6ad1e2438cf2b4]
# 
# patch "conf/checksums.ini"
#  from [7baa470a5270fde2a46d8d08c5cfaf8a37088211]
#    to [aae44932a5dd71e85cff747399c2880a5bbe1e36]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [5f2ea0dd2ad015c8ba74a060916a7b93eea809b1]
#    to [7f885dcbd6c382ec39ffa68188eba0709ec70be9]
# 
# patch "conf/distro/slugos.conf"
#  from [de02ec36b58523c6f54f561db5d01cabde5320dd]
#    to [29fd215da81e8b58c53efc27170d6a7137a64d1d]
# 
# patch "conf/machine/guinness.conf"
#  from [cc7d8f65106b69468f32a288b39adb73ebe67516]
#    to [83ad2351ae9b942f6123ebaa254deff0ea2ecdce]
# 
# patch "conf/machine/htcuniversal.conf"
#  from [056e40a23b2f65b8c4ecce35d0a124ae80f505e1]
#    to [56434d7220eb7af0190ee2dfe9b46bcf17f6bf57]
# 
# patch "packages/alsa/alsa-state.bb"
#  from [747555cc4a0cbfa3972e8c0aa4e8b60e21fa8ef0]
#    to [76c0d186f336624e9f74d6008ad5370e916e9dcf]
# 
# patch "packages/alsa/alsa-utils_1.0.13.bb"
#  from [f0fb7ffcdba9df40b9421ac6bab4fe0c8bc4a239]
#    to [32b3714001d9cf34c7dc17a9d8ba3515c860bf01]
# 
# patch "packages/bluez/bluez-utils_3.11.bb"
#  from [fd4419b18e6b9a21aefd2216ea12ad5ac819765d]
#    to [d085546d5c9fcdbfd1ae08a896ecbd3be3a0ef29]
# 
# patch "packages/gdb/gdb_6.6.bb"
#  from [821e0a7c7cda50453e9f2ec21e5c20f4945969e5]
#    to [8ee31828436ac1d886ad16b308b24da25b75e05e]
# 
# patch "packages/gnome/gnome-desktop_2.16.1.bb"
#  from [00c0726a9a2e3855908aa0e3482be7ff06a7a677]
#    to [aedf2dc2ff050fdb7531f504b91874001a221108]
# 
# patch "packages/kismet/kismet_2007-01-R1b.bb"
#  from [f8644a2188120fa96a9a7523343a5d88d02ca9cc]
#    to [8e5e1adc389029982ba35c8c5bcf03c1920cba94]
# 
# patch "packages/libcap/libcap_1.10.bb"
#  from [f018b5d648660b59ca1c26ef873c7bd661fcff03]
#    to [81d8e4285aa20124a39a1e371a41b964e426b65d]
# 
# patch "packages/libgpevtype/libgpevtype_svn.bb"
#  from [5a073bafd91865f732e48110a8725097b8a3abc2]
#    to [f164741db5bc25f003389485bc2605eae38caa00]
# 
# patch "packages/libiconv/libiconv_1.11.bb"
#  from [3a4e69620e97ab8a62c1ebde21ffede74dd8e1dd]
#    to [52137a0e3a08f75fd220e0d2b2721e50100fba4c]
# 
# patch "packages/lighttpd/lighttpd_1.4.15.bb"
#  from [8b5674cbb64f69a0c4f5bc1c5cea3b6dd6ac2ca3]
#    to [529df615fe85f2f7b359d4d261adb8aea9eb8192]
# 
# patch "packages/linux/ipod_2.4.24-ipod0.bb"
#  from [fbdbef69b3be27e031e67ab5692bdd1c44423b94]
#    to [845c75c31a77c4c15ce959368264f149ad5b4fc9]
# 
# patch "packages/linux/linux-dht-walnut_2.6.20.bb"
#  from [17bc2c6474f82af668f226f819958a820e101408]
#    to [5bba799fb41647abc69b90597720e73eac8304a3]
# 
# patch "packages/linux/linux-magicbox_2.6.19.2.bb"
#  from [50b660ee853c1bab59898c62292255e06437f470]
#    to [13f580e11d09d60a8467960d6129428aefbbfbf3]
# 
# patch "packages/linux-uml/linux-uml_2.4.26.bb"
#  from [f1429a2ec0f3cca6049da884f2859f112f24faf0]
#    to [92b6564c0fb8ff3e40a94b5f6311a53762f35c20]
# 
# patch "packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb"
#  from [99a5293ca3cfbf5b0beca84a354e0cae5203826c]
#    to [d33007edcc70beafd160e6805a08dbf4625f93c2]
# 
# patch "packages/mesa/mesa-mesa.inc"
#  from [b5c04b57417c9f743acc6cd41672c4412417d595]
#    to [c3f4825be15cca4020b384f678fbac7b9a35ce1c]
# 
# patch "packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb"
#  from [0a8f715664b5b6d2eb8f3713f2923afe8834a7e8]
#    to [ff05b33ae44ccc640ff1d95273165fe12162c37b]
# 
# patch "packages/scummvm/scummvm-qpe_0.6.1b.bb"
#  from [4e03df595de87b39780ef8cfc0a55120ed361604]
#    to [2f55a00053cc26fac217fd6f9679476248253163]
# 
# patch "packages/scummvm/scummvm_0.6.0.bb"
#  from [19fc8bf64c4fb3fa849acf71fde29ab712a5310a]
#    to [1cd019411dd4f59d4b1bb30a9bb26ee92dfad033]
# 
# patch "packages/scummvm/scummvm_0.6.1b.bb"
#  from [cd9ff2ab213bf6b4091152dcf6479653a323b744]
#    to [14249c7b6d34dac4def9c00785fa90f44368a505]
# 
# patch "packages/scummvm/scummvm_0.9.0.bb"
#  from [44b26791880ecebcbea140615330e56f168267a2]
#    to [a06952ebb91237116b5cd491fd24684557613021]
# 
# patch "packages/tasks/task-base.bb"
#  from [2b2c29568915b448d3708223e248e492e0515cc6]
#    to [c7d78b238314b3dc605d1eeefbc2b3190f62b112]
# 
# patch "packages/uboot/u-boot.inc"
#  from [b60eaf1fa3f4b35d4c251cc8248d2aed83398223]
#    to [9b411dad54104c1356dbdfc969aae07173a3a9b1]
# 
# patch "packages/uclibc/uclibc_0.9.29.bb"
#  from [a27c318d0f522d9889e1763f32eb55a206cd9df2]
#    to [56e93eceb12756f047d0495c07227001aa8a4c07]
# 
# patch "packages/vsftpd/vsftpd_2.0.5.bb"
#  from [6933cb69fbc9b310795fb41c57441e1bcfe91ee3]
#    to [e6fca472c973041a5e55bd7c387c1bb1a795df6f]
# 
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
#  from [a376ada0014113f0ea8b44219ad452b038ea267b]
#    to [6ee88f6492a3c730cd52b35bfbb20b699613b9f3]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.2.0.bb"
#  from [40d387b5c43301c14244d81c9240af4fcdd9c5d7]
#    to [41a0c1a5da83422122b84345f03373d38f79e2c2]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver"
#  from [20c5e6ac9f0569c8727f9021704cfd77a39c9082]
#    to [d2388d51184156d1aec429601b0199f1af934529]
# 
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
#  from [28550b005836838c17609f28a71e7f5d8e58989f]
#    to [5bd12bd7ec1767db6e23bcbccdbbc6991a9eb7f2]
# 
# patch "packages/zaurusd/zaurusd_svn.bb"
#  from [6c12b71f582ea4a44e70010f46f549966ee4a37a]
#    to [8b451c1c4b8d4de40888cbc057c5d8461b30aea1]
# 
# patch "removal.txt"
#  from [35bf563b2befc8d4c7883077edcc82fd6cd4d709]
#    to [a1cc58b6166222fde69b9e29f33c0df662d49f6b]
# 
============================================================
--- conf/distro/hentges-2.0.conf	0e4e2f8ba133f45365cb9694301abc4d83ea08d2
+++ conf/distro/hentges-2.0.conf	0e4e2f8ba133f45365cb9694301abc4d83ea08d2
@@ -0,0 +1,42 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at hentges.net> (c) 2007
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
+#               for a copy of the license)
+#
+# Filename: hentges-2.0.conf
+# Date: 20070521 (YMD)
+
+DESCRIPTION = "Distribution configuration for the Hentges ROM based on Angstrom"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe at hentges.net>"
+HOMEPAGE = "http://www.hentges.net"
+LICENSE = "MIT"
+
+######################################################################################
+
+require conf/distro/angstrom-2007.1.conf
+
+######################################################################################
+
+require conf/machine/hentges-2.0_common.conf
+require conf/machine/hentges-2.0_${MACHINE}.conf
+
+######################################################################################
+
+DISTRO_VERSION = "1.9+WIP-${DATE}"
+DISTRO_REVISION = "1"
+
+DISTRO = "hentges-2.0"
+DISTRO_NAME = "Hentges"
+
+######################################################################################
+
+# Override FEED_URIS here
+
+######################################################################################
+
+HENTGES_PV = "${DISTRO_VERSION}"
+HENTGES_PR = "${DISTRO_REVISION}"
+
+######################################################################################
+
============================================================
--- conf/machine/hentges-2.0_common.conf	a9504a6863568231c88c9182e434faf2a723aa25
+++ conf/machine/hentges-2.0_common.conf	a9504a6863568231c88c9182e434faf2a723aa25
@@ -0,0 +1,40 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at hentges.net> (c) 2007
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
+#               for a copy of the license)
+#
+# Filename: hentges-2.0_common.conf
+# Date: 20070521 (YMD)
+
+DESCRIPTION = "Hentges common dependency description"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe at hentges.net>"
+LICENSE = "MIT"
+
+######################################################################################
+
+HENTGES_BASE_DEPENDS = "task-base-wifi"
+HENTGES_BASE_RDEPENDS = "task-base-wifi"
+
+######################################################################################
+
+# Handled via task-base:
+
+DISTRO_SSH_DAEMON ?= "dropbear"
+
+######################################################################################
+
+# Handled via task-base:
+
+DISTRO_EXTRA_RDEPENDS = "\
+    update-modules \
+    ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
+    angstrom-version \
+    ipkg ipkg-collateral \
+    util-linux-mount util-linux-umount \
+    ${EXTRA_STUFF} \
+    ${DEBUG_APPS} \
+    "
+    
+HENTGES_X11_DEPENDS += "angstrom-x11-base-depends \
+			angstrom-gpe-task-base"
============================================================
--- conf/machine/hentges-2.0_spitz.conf	9f6507c5768a10e6fa79279d422049adde6a2fe2
+++ conf/machine/hentges-2.0_spitz.conf	9f6507c5768a10e6fa79279d422049adde6a2fe2
@@ -0,0 +1,39 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at hentges.net> (c) 2007
+# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
+#               for a copy of the license)
+#
+# Filename: hentges-2.0_spitz.conf
+# Date: 20070521 (YMD)
+
+DESCRIPTION = "Hentges dependency description for Spitz aka SL-C3x00"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe at hentges.net>"
+HOMEPAGE = "<homepage>"
+LICENSE = "MIT"
+
+######################################################################################
+
+DISTRO_SSH_DAEMON_spitz = "openssh"
+
+XSERVER = "xserver-kdrive-fbdev"
+
+######################################################################################
+
+HENTGES_BASE_RDEPENDS += "tar bash"
+
+######################################################################################
+
+# In the future I plan to replace the angstrom-*task* stuff with custom
+# hentges tasks, replacing the angstrom defaults where needed
+
+HENTGES_X11_RDEPENDS += "${XSERVER} \
+			angstrom-gpe-task-pim \
+			angstrom-ohand-task-pim \
+			angstrom-gpe-task-settings \
+			angstrom-gpe-task-apps \
+			angstrom-gpe-task-games \
+			angstrom-task-office \
+			angstrom-task-printing \
+			angstrom-task-sectest \
+			firefox gftp"
============================================================
--- packages/alsa/alsa-state/c7x0/asound.state	012aede108f1f056ec75ab961a56b1190b1a66ff
+++ packages/alsa/alsa-state/c7x0/asound.state	012aede108f1f056ec75ab961a56b1190b1a66ff
@@ -0,0 +1,151 @@
+state.Corgi {
+	control.1 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 127'
+		iface MIXER
+		name 'Playback Volume'
+		value.0 103
+		value.1 103
+	}
+	control.2 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Playback Switch'
+		value.0 false
+		value.1 false
+	}
+	control.3 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		iface MIXER
+		name 'Capture Volume'
+		value.0 23
+		value.1 23
+	}
+	control.4 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Capture Switch'
+		value.0 false
+		value.1 false
+	}
+	control.5 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Mic Boost (+20dB)'
+		value false
+	}
+	control.6 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Capture Mic Switch'%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list