[oe-commits] org.oe.dev merge of '91b1890c469c39d7efcba63967f106bf6efd0c4f'
mickeyl commit
openembedded-commits at lists.openembedded.org
Tue Oct 16 14:04:38 UTC 2007
merge of '91b1890c469c39d7efcba63967f106bf6efd0c4f'
and 'ce9648eef13f1ef5d8dff88dc64af875993364e9'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 12a7d4ddc577b162ca36d7cf194a947588be8419
ViewMTN: http://monotone.openembedded.org/revision/info/12a7d4ddc577b162ca36d7cf194a947588be8419
Files:
1
packages/linux/linux/adzs-bf548-ezlite
packages/linux/linux-bfin/adzs-bf548-ezlite
packages/linux/linux-bfin
packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state
packages/linux/linux-bfin_svn.bb
packages/openssh/files/sftp-server-nolibcrypto.patch
conf/distro/include/sane-srcrevs.inc
conf/machine/adsp-bf537-stamp.conf
conf/machine/adzs-bf538f-ezlite.conf
conf/machine/adzs-bf548-ezlite.conf
packages/alsa/alsa-state.bb
packages/linux/linux-bfin/adzs-bf548-ezlite/defconfig
packages/linux/linux.inc
packages/musicpd/mpd-alsa_svn.bb
packages/openmoko2/openmoko-appmanager2_svn.bb
packages/openssh/openssh_4.6p1.bb
packages/tasks/task-openmoko.bb
packages/uclibc/elf2flt_svn.bb
packages/usbpath/usbpath-native_svn.bb
packages/usbpath/usbpath_svn.bb
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-vga.ppm
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
mtn:manual_merge
true
Diffs:
#
# mt diff -r91b1890c469c39d7efcba63967f106bf6efd0c4f -r12a7d4ddc577b162ca36d7cf194a947588be8419
#
#
#
# rename "packages/linux/linux/adzs-bf548-ezlite"
# to "packages/linux/linux-bfin/adzs-bf548-ezlite"
#
# add_dir "packages/linux/linux-bfin"
#
# add_file "packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state"
# content [bd1a1a0426f6ee33355f8a327e980e6dfea4b84e]
#
# add_file "packages/linux/linux-bfin_svn.bb"
# content [acaf25dafeeaf1a75a5ad17d0c4409efc6f00188]
#
# add_file "packages/openssh/files/sftp-server-nolibcrypto.patch"
# content [485b76bc2a787612d9a03d9cc81a22ca3bba9523]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [5e0b7020a16147b948f3cf8ab77187bdf0b43cf4]
# to [094e6ff87045ec722ce3d1558347fe856bcf813c]
#
# patch "conf/machine/adsp-bf537-stamp.conf"
# from [0e4ae8573f75816c7fc87665b8cecc83062140c1]
# to [f2f3766d5f005cfbd822e0459b03196ed9d88c3b]
#
# patch "conf/machine/adzs-bf538f-ezlite.conf"
# from [f2a85e24d5481eff7d75087ab3d6cfaa2453c959]
# to [03714bc8d82e3fa8a43cc6b31d7fdc4069459802]
#
# patch "conf/machine/adzs-bf548-ezlite.conf"
# from [c5c115d33f7af348761a65741a6e0430d468ee03]
# to [fd323dc62f2f3c668388604d1cd6269465340f41]
#
# patch "packages/alsa/alsa-state.bb"
# from [c5a974bedd90b65940d3b4101b2bd8c1ceee517b]
# to [e101e63a590ba537cd32bd6c7119cf2f31a13dff]
#
# patch "packages/linux/linux-bfin/adzs-bf548-ezlite/defconfig"
# from [3c1912e8bee1cb4fee11943c15a8307478ee5110]
# to [cc15cda7d452e91dd810cf9f70c76ef47053cca7]
#
# patch "packages/linux/linux.inc"
# from [5398595a8e49265af51d223f13af5a6a2de98ad3]
# to [49dac159501ac3f1a2200ea3bddcb502ecc464de]
#
# patch "packages/musicpd/mpd-alsa_svn.bb"
# from [c0ccec3ce71dbdf4a633fa5b71b01ac93f9d46f8]
# to [9c260ecf17b379f15bbe22c751332d0f7540ccaf]
#
# patch "packages/openmoko2/openmoko-appmanager2_svn.bb"
# from [cd5979321d700d7dee8025135947a97abe7587da]
# to [8808bd67fd00d89f7b8ea151d37f6cfd24aba0eb]
#
# patch "packages/openssh/openssh_4.6p1.bb"
# from [b6dd08fb7fd9e64409034815aef2658608f0968f]
# to [10c9d7afb3cf9de6cae64ac94cf32103fa96bce6]
#
# patch "packages/tasks/task-openmoko.bb"
# from [853e5cf4effc206059d9e3955df4a6d161c7188b]
# to [870be401b6ac910ccf7cbc8611c17b7ebeb32882]
#
# patch "packages/uclibc/elf2flt_svn.bb"
# from [339525a526bf04879f8f94a238602fe87870a1a0]
# to [376f3f2ab831cad1d7e4af6fdbc4d054ce873500]
#
# patch "packages/usbpath/usbpath-native_svn.bb"
# from [2c360ca2b6915f0e077e0fa5c4f668415e51dfcd]
# to [6349cf45fe11f5e62cb70c23cc3b3f4978b082a1]
#
# patch "packages/usbpath/usbpath_svn.bb"
# from [61551de573a39c0d443493ef48d187adb037426c]
# to [e591bdd3d0b6a3f0591d035272658f7abed81521]
#
============================================================
--- packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state bd1a1a0426f6ee33355f8a327e980e6dfea4b84e
+++ packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state bd1a1a0426f6ee33355f8a327e980e6dfea4b84e
@@ -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 0
+ value.1 0
+ }
+ 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 111
+ }
+ control.6 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Playback Volume'
+ value.0 5
+ value.1 5
+ }
+ control.7 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Sidetone Playback Volume'
+ value.0 1
+ value.1 1
+ }
+ 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 5
+ }
+ control.12 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Sidetone Playback Volume'
+ value 6
+ }
+ control.13 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Voice Playback Volume'
+ value 6
+ }
+ 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 0
+ value.1 0
+ }
+ control.21 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Voice Sidetone Capture Volume'
+ value 0
+ }
+ control.22 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 63'
+ iface MIXER
+ name 'Capture Volume'
+ value.0 0
+ value.1 0
+ }
+ 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 false
+ value.1 false
+ }
+ control.25 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '3.4Hz @ 48kHz'
+ comment.item.1 '82Hz @ 16k'
+ comment.item.2 '82Hz @ 8kHz'
+ comment.item.3 '170Hz @ 8kHz'
+ iface MIXER
+ name 'Capture Filter Select'
+ value '3.4Hz @ 48kHz'
+ }
+ control.26 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 HiFi
+ comment.item.1 Voice
+ iface MIXER
+ name 'Capture Filter Cut-off'
+ value Voice
+ }
+ control.27 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture Filter Switch'
+ value true
+ }
+ control.28 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Target Volume'
+ value 5
+ }
+ control.29 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Max Volume'
+ value 7
+ }
+ control.30 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Off
+ comment.item.1 Right
+ comment.item.2 Left
+ comment.item.3 Stereo
+ iface MIXER
+ name 'ALC Capture Function'
+ value Off
+ }
+ control.31 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture ZC Switch'
+ value false
+ }
+ control.32 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Hold Time'
+ value 15
+ }
+ control.33 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Decay Time'
+ value 12
+ }
+ control.34 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Attack Time'
+ value 5
+ }
+ control.35 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 31'
+ iface MIXER
+ name 'ALC Capture NG Threshold'
+ value 0
+ }
+ control.36 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Constant PGA Gain'
+ comment.item.1 'Mute ADC Output'
+ iface MIXER
+ name 'ALC Capture NG Type'
+ value 'Constant PGA Gain'
+ }
+ control.37 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture NG Switch'
+ value false
+ }
+ control.38 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Capture
+ comment.item.1 Playback
+ iface MIXER
+ name '3D Function'
+ value Capture
+ }
+ control.39 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '2.2kHz'
+ comment.item.1 '1.5kHz'
+ iface MIXER
+ name '3D Upper Cut-off'
+ value '2.2kHz'
+ }
+ control.40 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '200Hz'
+ comment.item.1 '500Hz'
+ iface MIXER
+ name '3D Lower Cut-off'
+ value '200Hz'
+ }
+ control.41 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name '3D Volume'
+ value 0
+ }
+ control.42 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name '3D Switch'
+ value false
+ }
+ control.43 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture 6dB Attenuate'
+ value false
+ }
+ control.44 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback 6dB Attenuate'
+ value false
+ }
+ control.45 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 None
+ comment.item.1 '32kHz'
+ comment.item.2 '44.1kHz'
+ comment.item.3 '48kHz'
+ iface MIXER
+ name De-emphasis
+ value None
+ }
+ control.46 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 Left
+ comment.item.2 Right
+ comment.item.3 Mono
+ iface MIXER
+ name 'Playback Mono Mix'
+ value Stereo
+ }
+ control.47 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Non Inverted'
+ comment.item.1 Inverted
+ iface MIXER
+ name 'Playback Phase'
+ value Inverted
+ }
+ control.48 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic2 Capture Volume'
+ value 0
+ }
+ control.49 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic1 Capture Volume'
+ value 0
+ }
+ control.50 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'DAI 0'
+ comment.item.1 'DAI 1'
+ comment.item.2 'DAI 2'
+ comment.item.3 'DAI 3'
+ iface MIXER
+ name 'DAI Mode'
+ value 'DAI 0'
+ }
+ control.51 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Left ADC'
+ comment.item.2 'Right ADC'
+ comment.item.3 'Channel Swap'
+ iface MIXER
+ name 'ADC Data Select'
+ value Stereo
+ }
+ control.52 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Mic 1'
+ comment.item.1 'Mic 2'
+ comment.item.2 'Mic 3'
+ iface MIXER
+ name 'Mic Selection Mux'
+ value 'Mic 1'
+ }
+ control.53 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'RXP - RXN'
+ comment.item.1 'RXP + RXN'
+ comment.item.2 RXP
+ comment.item.3 RXN
+ iface MIXER
+ name 'Rx Mixer'
+ value 'RXP - RXN'
+ }
+ control.54 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1 + 2'
+ comment.item.1 'Line 1 - 2'
+ comment.item.2 'Line 1'
+ comment.item.3 'Line 2'
+ iface MIXER
+ name 'Line Mixer'
+ value 'Line 1 + 2'
+ }
+ control.55 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line Mix'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Mono Mux'
+ value 'Line Mix'
+ }
+ control.56 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 2'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Right Mux'
+ value 'Rx Mix'
+ }
+ control.57 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Rx Mix'
+ iface MIXER
+ name 'Line Left Mux'
+ value 'Rx Mix'
+ }
+ control.58 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Line Capture Switch'
+ value false
+ }
+ control.59 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Mic2 Capture Switch'
+ value false
+ }
+ control.60 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Mic1 Capture Switch'
+ value false
+ }
+ control.61 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Mixer Rx Capture Switch'
+ value false
+ }
+ control.62 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Left PGA'
+ comment.item.1 'Mic 1'
+ comment.item.2 'Mic 2'
+ comment.item.3 'Right PGA'
+ iface MIXER
+ name 'Mic Sidetone Mux'
+ value 'Mic 1'
+ }
+ control.63 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 PGA
+ comment.item.1 'Line or RXP-RXN'
+ comment.item.2 Sidetone
+ iface MIXER
+ name 'Capture Right Mux'
+ value PGA
+ }
+ control.64 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 PGA
+ comment.item.1 'Line or RXP-RXN'
+ comment.item.2 Line
+ iface MIXER
+ name 'Capture Left Mux'
+ value PGA
+ }
+ control.65 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Analogue Mix Left'
+ comment.item.2 'Analogue Mix Right'
+ comment.item.3 'Digital Mono Mix'
+ iface MIXER
+ name 'Capture Right Mixer'
+ value Stereo
+ }
+ control.66 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Analogue Mix Left'
+ comment.item.2 'Analogue Mix Right'
+ comment.item.3 'Digital Mono Mix'
+ iface MIXER
+ name 'Capture Left Mixer'
+ value Stereo
+ }
+ control.67 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Mixer Voice Capture Sw'%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rce9648eef13f1ef5d8dff88dc64af875993364e9 -r12a7d4ddc577b162ca36d7cf194a947588be8419
#
#
#
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm"
# content [01cb2d765905e52f4a87fb84a3736f5025e20ba8]
#
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-vga.ppm"
# content [67e567a6535ec794e565e89b8e882fa10c20cacf]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver"
# from [1e3ac3df8b80313d192e4b3b31e1228b4154186f]
# to [7e9b719553b5e77b1e579024abf0be3c694dce4f]
#
# patch "packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb"
# from [fdeb17ae69a5b4e0f75d5465ad49c3c492da548f]
# to [eced316f2258d6c425f8c597ae8e6163bf6d55e7]
#
# set "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm"
# attr "mtn:manual_merge"
# value "true"
#
# set "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-vga.ppm"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
# packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm is binary
============================================================
# packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-vga.ppm is binary
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 1e3ac3df8b80313d192e4b3b31e1228b4154186f
+++ packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver 7e9b719553b5e77b1e579024abf0be3c694dce4f
@@ -91,14 +91,15 @@ case `module_id` in
modprobe mbxfb
ARGS="$ARGS -br -fb /dev/fb1" ;;
"GTA01" | "GTA02")
- ARGS="$ARGS -dpi 285 -screen 480x640 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash.ppm" ;;
+ ARGS="$ARGS -dpi 285 -screen 480x640 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-vga.ppm" ;;
"Motorola Ezx Platform")
- ARGS="$ARGS -dpi 170 -screen 240x320 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash.ppm" ;;
+ ARGS="$ARGS -dpi 170 -screen 240x320 -hide-cursor -root-ppm /usr/share/pixmaps/xsplash-qvga.ppm" ;;
"Nokia N800")
ARGS="$ARGS -br -dpi 225 -screen 800x480x16 -mouse tslib" ;;
*)
+# It is a device we do not know about, in which case we force
# It is a device we do not know about, in which case we force
- # kdrive to use the current framebuffer geometry -- otherwise
+# kdrive to use the current framebuffer geometry -- otherwise
# it will default to trying to achieve 1024x768
S=`fallback_screen_arg`
ARGS="$ARGS -screen $S" ;;
============================================================
--- packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb fdeb17ae69a5b4e0f75d5465ad49c3c492da548f
+++ packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb eced316f2258d6c425f8c597ae8e6163bf6d55e7
@@ -1,8 +1,8 @@ RDEPENDS_${PN} = "xmodmap libxrandr xdpy
DESCRIPTION = "Common X11 scripts"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit"
-PR = "r18"
+PR = "r19"
SRC_URI = "\
file://Xdefaults \
@@ -15,6 +15,11 @@ SRC_URI = "\
file://90xXWindowManager \
"
+SRC_URI_append_openmoko = "\
+ file://xsplash-vga.ppm \
+ file://xsplash-qvga.ppm \
+"
+
etcFiles = "\
Xdefaults \
Xinit \
@@ -29,8 +34,6 @@ S = "${WORKDIR}"
S = "${WORKDIR}"
-PACKAGE_ARCH = "all"
-
do_install() {
install -d ${D}/${sysconfdir}/X11/Xsession.d
for i in ${etcFiles}; do
@@ -39,4 +42,15 @@ do_install() {
for i in ${sessionFiles}; do
install -m 0755 ${WORKDIR}/$i ${D}/${sysconfdir}/X11/Xsession.d/
done
+
+ # branding-foo. yes, /usr/share/pixmaps is hardcoded here, since it's
+ # also hardcoded in the Xserver script...
+ if [ "x${DISTRO}" = "xopenmoko" ]; then
+ install -d ${D}/usr/share/pixmaps
+ install -m 0755 ${WORKDIR}/*.ppm ${D}/usr/share/pixmaps
+ fi
}
+
+PACKAGE_ARCH = "all"
+PACKAGE_ARCH_openmoko = "openmoko"
+
More information about the Openembedded-commits
mailing list