diff options
90 files changed, 3049 insertions, 11923 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index b653bec83f..64a179f182 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -287,7 +287,16 @@ oe_libinstall() { if [ -z "$dir" ]; then dir=`pwd` fi + dotlai=$libname.lai + + # Sanity check that the libname.lai is unique + number_of_files=`(cd $dir; find . -name "$dotlai") | wc -l` + if [ $number_of_files -gt 1 ]; then + oefatal "oe_libinstall: $dotlai is not unique in $dir" + fi + + dir=$dir`(cd $dir;find . -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"` olddir=`pwd` __runcmd cd $dir diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 2c2bffea96..0edb4ef0ae 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -1,9 +1,11 @@ +EFL_SRCDATE = "${@time.strftime('%Y%m%d', time.gmtime())}" SRCREV_pn-assassin ?= "${AUTOREV}" SRCREV_pn-dfu-util ?= "${AUTOREV}" SRCREV_pn-dfu-util-native ?= "${AUTOREV}" SRCREV_pn-diversity-daemon ?= "${AUTOREV}" SRCREV_pn-diversity-nav ?= "${AUTOREV}" SRCREV_pn-illume ?= "${AUTOREV}" +SRCREV_pn-illume-theme ?= "${AUTOREV}" SRCREV_pn-libgsmd ?= "${AUTOREV}" SRCREV_pn-libjana ?= "${AUTOREV}" SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}" @@ -14,11 +16,13 @@ SRCREV_pn-linux-openmoko ?= "${AUTOREV}" SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}" SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" SRCREV_pn-multitap-pad ?= "${AUTOREV}" +SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" SRCREV_pn-neod ?= "${AUTOREV}" SRCREV_pn-openmoko-agpsui ?= "${AUTOREV}" SRCREV_pn-openmoko-alsa-scenarios ?= "${AUTOREV}" SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}" +SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}" SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}" SRCREV_pn-openmoko-common2 ?= "${AUTOREV}" @@ -52,8 +56,10 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}" SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" SRCREV_pn-openocd ?= "${AUTOREV}" SRCREV_pn-openocd-native ?= "${AUTOREV}" -#SRCREV_pn-opkg ?= "${AUTOREV}" -#SRCREV_pn-opkg-native ?= "${AUTOREV}" +SRCREV_pn-opkg ?= "${AUTOREV}" +SRCREV_pn-opkg-native ?= "${AUTOREV}" +SRCREV_pn-opkg-sdk ?= "${AUTOREV}" +SRCREV_pn-python-etk ?= "${AUTOREV}" SRCREV_pn-python-gsmd ?= "${AUTOREV}" SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}" SRCREV_pn-u-boot-openmoko-devel ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 23093ef2c1..7721d97ce6 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE ?= "20080427" +EFL_SRCDATE ?= "20080428" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -155,3 +155,6 @@ SRCDATE_yamonenv ?= "20060814" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" +# aleph1/yaffs +SRCDATE_yaffs2-utils = "20080331" +SRCDATE_yaffs2-utils-native = "20080331" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index ffa847677b..246789fcbe 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -12,7 +12,7 @@ # you know what that means? like... a, b, c, d, e, f, g... SRCREV_pn-aircrack-ng ?= "802" -SRCREV_pn-assassin ?= "41" +SRCREV_pn-assassin ?= "93" SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-uclibc ?= "21926" SRCREV_pn-uclibc-initial ?= "21926" @@ -22,11 +22,12 @@ SRCREV_pn-dbus-c++ ?= "13131" SRCREV_pn-dfu-util ?= "4160" SRCREV_pn-dfu-util-native ?= "4160" SRCREV_pn-diversity-daemon ?= "277" -SRCREV_pn-diversity-nav ?= "284" +SRCREV_pn-diversity-nav ?= "340" SRCREV_pn-eds-dbus ?= "659" SRCREV_pn-eglibc ?= "5963" SRCREV_pn-eglibc-initial ?= "5963" SRCREV_pn-eglibc-intermediate ?= "5963" +SRCREV_pn-enlazar ?= "37" SRCREV_pn-exalt ?= "79" SRCREV_pn-exalt-daemon ?= "78" SRCREV_pn-exalt-module ?= "78" @@ -43,7 +44,8 @@ SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" -SRCREV_pn-illume ?= "14" +SRCREV_pn-illume ?= "58" +SRCREV_pn-illume-theme ?= "58" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" @@ -59,6 +61,7 @@ SRCREV_pn-libmokoui2 ?= "4342" SRCREV_pn-libowl ?= "277" SRCREV_pn-librfid ?= "2094" SRCREV_pn-libw100 ?= "47" +SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" @@ -80,7 +83,7 @@ SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-neod ?= "4336" SRCREV_pn-netsurf ?= "3859" -SRCREV_pn-networkmanager ?= "2887" +SRCREV_pn-networkmanager ?= "3202" SRCREV_pn-networkmanager-applet ?= "200" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" @@ -88,7 +91,7 @@ SRCREV_pn-osb-jscore ?= "117" SRCREV_pn-osb-nrcit ?= "125" SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-openmoko-agpsui ?= "7" -SRCREV_pn-openmoko-alsa-scenarios ?= "4317" +SRCREV_pn-openmoko-alsa-scenarios ?= "4406" SRCREV_pn-openmoko-appearance ?= "3262" SRCREV_pn-openmoko-appmanager ?= "1851" SRCREV_pn-openmoko-appmanager2 ?= "3442" @@ -154,6 +157,7 @@ SRCREV_pn-opkg-sdk ?= "4247" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-packagekit ?= "74a3b7e3f3bc8627c23349e0b0d8429fd5f53fc6" SRCREV_pn-psplash ?= "249" +SRCREV_pn-pty-forward-native ?= "4214" SRCREV_pn-python-odeviced ?= "e2ae2c252ef43be23781c2d09567a8d21ca1e965" SRCREV_pn-python-ophoned ?= "e657c81a6729aeef21ba4c6b75590658cbbef391" SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" @@ -165,6 +169,7 @@ SRCREV_pn-python-gsmd = "148" SRCREV_pn-python-lightmediascanner = "68" SRCREV_pn-python-pyrtc = "4b7fd8841ab62d81fa78509ef7f9b14d2118dcae" SRCREV_pn-s3c24xx-gpio ?= "4130" +SRCREV_pn-serial-forward ?= "4214" SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-sphyrna ?= "45" @@ -177,4 +182,5 @@ SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1971" +SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f" SRCREV_pn-zhone ?= "a9496c35328f66ed8e4f840709721c5bacae2bb4" diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index e041b34c6f..3b9ed1b468 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -9,6 +9,7 @@ MACHINE_CLASS = "neo1973" PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo" UBOOT_ENTRYPOINT = "30008000" MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2" diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index d13b9d8270..ce7c97f0cc 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -7,30 +7,16 @@ DESCRIPTION = "Default ALSA configuration" LICENSE = "GPL" RRECOMMENDS_alsa-state = "alsa-states" -RRECOMMENDS_${PN}_openmoko = "openmoko-alsa-scenarios" +RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios" +RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios" PV = "0.1.0" -PR = "r15" +PR = "r16" SRC_URI = " \ file://asoundrc \ file://asound.state \ file://alsa-state " -SRC_URI_append_om-gta01 = " \ - file://capturehandset.state \ - file://captureheadset.state \ - file://gsmbluetooth.state \ - file://gsmhandset.state \ - file://gsmheadset.state \ - file://gsmspeakerout.state \ - file://stereoout.state \ - file://voip-handset.state \ - file://voip-headset.state" - -SRC_URI_append_om-gta02 = "\ - file://stereoout.state \ - file://gsmhandset.state \ - " inherit update-rc.d diff --git a/packages/alsa/alsa-state/om-gta01/asound.state b/packages/alsa/alsa-state/om-gta01/asound.state deleted file mode 100644 index 26db3cf311..0000000000 --- a/packages/alsa/alsa-state/om-gta01/asound.state +++ /dev/null @@ -1,910 +0,0 @@ -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 |