diff options
Diffstat (limited to 'conf/distro/include')
| -rw-r--r-- | conf/distro/include/angstrom-2007-preferred-versions.inc | 32 | ||||
| -rw-r--r-- | conf/distro/include/angstrom-eglibc.inc | 14 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 12 | ||||
| -rw-r--r-- | conf/distro/include/insane-srcrevs.inc | 3 | ||||
| -rw-r--r-- | conf/distro/include/moko-autorev.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/preferred-openmoko-versions.inc | 10 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 7 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 80 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 54 |
9 files changed, 117 insertions, 97 deletions
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index c3a8fcc9ec..72533c65e5 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -21,11 +21,11 @@ PREFERRED_VERSION_aircrack-ng ?= "0.9.1" PREFERRED_VERSION_albumshaper ?= "2.1" PREFERRED_VERSION_aliens ?= "1.0.0" PREFERRED_VERSION_aliens-qt ?= "1.0.0" -PREFERRED_VERSION_alsa-lib ?= "1.0.14" -PREFERRED_VERSION_alsa-oss ?= "1.0.14" +PREFERRED_VERSION_alsa-lib ?= "1.0.15" +PREFERRED_VERSION_alsa-oss ?= "1.0.15" PREFERRED_VERSION_alsa-plugins ?= "1.0.14" PREFERRED_VERSION_alsa-state ?= "0.1.0" -PREFERRED_VERSION_alsa-utils ?= "1.0.14" +PREFERRED_VERSION_alsa-utils ?= "1.0.15" PREFERRED_VERSION_anthy ?= "7811" PREFERRED_VERSION_anthy-native ?= "7811" PREFERRED_VERSION_antlr ?= "2.7.5" @@ -97,14 +97,14 @@ PREFERRED_VERSION_bison-native ?= "2.0" PREFERRED_VERSION_bitbake ?= "1.8.6" PREFERRED_VERSION_bitchx ?= "1.1" PREFERRED_VERSION_bluesnarfer ?= "0.1" -PREFERRED_VERSION_bluez-cups-backend ?= "3.20" +PREFERRED_VERSION_bluez-cups-backend ?= "3.22" PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0" PREFERRED_VERSION_bluez-gnome ?= "0.14" -PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.20" +PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.22" PREFERRED_VERSION_bluez-hcidump ?= "1.38" -PREFERRED_VERSION_bluez-libs ?= "3.20" -PREFERRED_VERSION_bluez-utils ?= "3.20" -PREFERRED_VERSION_bluez-utils-alsa ?= "3.20" +PREFERRED_VERSION_bluez-libs ?= "3.22" +PREFERRED_VERSION_bluez-utils ?= "3.22" +PREFERRED_VERSION_bluez-utils-alsa ?= "3.22" PREFERRED_VERSION_bmon ?= "2.1.0" PREFERRED_VERSION_boa ?= "0.94.13" PREFERRED_VERSION_bochs ?= "2.1" @@ -620,6 +620,7 @@ PREFERRED_VERSION_gst-plugins-good ?= "0.10.6" PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.6" PREFERRED_VERSION_gstreamer ?= "0.10.14" PREFERRED_VERSION_gthumb ?= "2.6.9" +PREFERRED_VERSION_gtk+ ?= "2.10.14" PREFERRED_VERSION_gtk-clearlooks-engine ?= "0.6.2" PREFERRED_VERSION_gtk-doc ?= "1.0" PREFERRED_VERSION_gtk-doc-native ?= "1.0" @@ -652,7 +653,7 @@ PREFERRED_VERSION_gweled ?= "0.5" PREFERRED_VERSION_gxine ?= "0.4.1enhanced" PREFERRED_VERSION_gzip ?= "1.3.5" PREFERRED_VERSION_hal ?= "0.5.9" -PREFERRED_VERSION_hal-info ?= "20070618" +PREFERRED_VERSION_hal-info ?= "20070918+git" PREFERRED_VERSION_haserl ?= "0.8.0" PREFERRED_VERSION_havp ?= "0.86" PREFERRED_VERSION_hdparm ?= "6.9" @@ -661,7 +662,7 @@ PREFERRED_VERSION_hexatrolic ?= "1.0beta3" PREFERRED_VERSION_hfsplusutils ?= "1.0.4-4" PREFERRED_VERSION_hfsutils ?= "3.2.6" PREFERRED_VERSION_hibernate-script ?= "1.12" -PREFERRED_VERSION_hicolor-icon-theme ?= "0.9" +PREFERRED_VERSION_hicolor-icon-theme ?= "0.10" PREFERRED_VERSION_hiker ?= "0.9.1" PREFERRED_VERSION_hildon-base-lib ?= "0.11.1" PREFERRED_VERSION_hildon-control-panel ?= "0.9.1-1.2" @@ -675,8 +676,7 @@ PREFERRED_VERSION_hildon-status-bar ?= "0.8.11-1" PREFERRED_VERSION_hildon-thumbnail ?= "0.11" PREFERRED_VERSION_hostap-conf ?= "1.0" PREFERRED_VERSION_hostap-daemon ?= "0.4.4" -PREFERRED_VERSION_hostap-modules ?= "0.4.7" -PREFERRED_VERSION_hostap-utils ?= "0.4.0" +PREFERRED_VERSION_hostap-utils ?= "0.4.7" PREFERRED_VERSION_hotplug-dbus ?= "0.9" PREFERRED_VERSION_hotplug-ng ?= "002" PREFERRED_VERSION_hotplug-qcop ?= "cvs" @@ -776,7 +776,7 @@ PREFERRED_VERSION_keymap-locales ?= "1.0" PREFERRED_VERSION_keymaps ?= "1.0" PREFERRED_VERSION_keyring ?= "0.6.8" PREFERRED_VERSION_kf ?= "0.5.4.1" -PREFERRED_VERSION_kismet ?= "2007-01-R1b" +PREFERRED_VERSION_kismet ?= "2007-10-R1" PREFERRED_VERSION_klibc ?= "1.1.1" PREFERRED_VERSION_klimt ?= "0.6.1" PREFERRED_VERSION_knights ?= "1.14" @@ -1283,8 +1283,8 @@ PREFERRED_VERSION_mousepad ?= "0.2.12" PREFERRED_VERSION_mp3blaster ?= "3.2.3" PREFERRED_VERSION_mpc ?= "0.12.1" PREFERRED_VERSION_mpeg2dec ?= "0.4.0b" -PREFERRED_VERSION_mpfr ?= "2.1.1" -PREFERRED_VERSION_mpfr-native ?= "2.1.1" +PREFERRED_VERSION_mpfr ?= "2.3.0" +PREFERRED_VERSION_mpfr-native ?= "2.3.0" PREFERRED_VERSION_mpg123 ?= "0.66" PREFERRED_VERSION_mpg321 ?= "0.2.10" PREFERRED_VERSION_mplayer-common ?= "0.0.1" @@ -2086,7 +2086,7 @@ PREFERRED_VERSION_xrdb ?= "1.0.4" PREFERRED_VERSION_xscreensaver ?= "4.22" PREFERRED_VERSION_xscrnsaverh ?= "1.0" PREFERRED_VERSION_xserver-common ?= "1.18" -PREFERRED_VERSION_xserver-kdrive ?= "1.4" +PREFERRED_VERSION_xserver-kdrive ?= "1.3.0.0" PREFERRED_VERSION_xserver-kdrive-common ?= "0.1" PREFERRED_VERSION_xserver-nodm-init ?= "1.0" PREFERRED_VERSION_xserver-xorg ?= "1.3.0.0" diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index 6726710aa9..837aec9f2d 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -5,14 +5,12 @@ PREFERRED_PROVIDER_virtual/libc = "eglibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "eglibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "eglibc-intermediate" -PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" - - +PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb${TARGET_VENDOR}-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/arm${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/mipsel${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/sparc${TARGET_VENDOR}-linux-libc-for-gcc = "eglibc-intermediate" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 8116bcb307..510a752211 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -35,6 +35,9 @@ require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc PREFERRED_PROVIDER_qemu-native = "qemu-native" ENABLE_BINARY_LOCALE_GENERATION ?= "1" +# We only want to build UTF8 locales +LOCALE_UTF8_ONLY = "1" + #qemu doesn't like armv6/eabi/vfp ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0" ENABLE_BINARY_LOCALE_GENERATION_nokia800 = "0" @@ -185,6 +188,8 @@ FEED_ARCH_lsppchd = "ppc603e" FEED_ARCH_lsppchg = "ppc603e" FEED_ARCH_storcenter = "ppc603e" FEED_ARCH_turbostation = "ppc603e" +FEED_ARCH_mpc8313e-rdb = "ppce300c3" +FEED_ARCH_mpc8323e-rdb = "ppce300c2" #strongarm machines, no EABI @@ -250,10 +255,11 @@ TINDER_REPORT = "1" # seppuku bbclass SEPPUKU_LOGIN = "http://bugs.openembedded.org/query.cgi?" -SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi?" +SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi?" SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" -SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?" -SEPPUKU_AUTOBUILD = "1" +SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?" +SEPPUKU_AUTOBUILD = "1" SEPPUKU_PRODUCT = "Openembedded" SEPPUKU_COMPONENT = "build" diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc index c70e799705..e039a144d3 100644 --- a/conf/distro/include/insane-srcrevs.inc +++ b/conf/distro/include/insane-srcrevs.inc @@ -1,6 +1,7 @@ SRCREV_pn-aircrack-ng ?= "${AUTOREV}" SRCREV_pn-dfu-util ?= "${AUTOREV}" SRCREV_pn-dfu-util-native ?= "${AUTOREV}" +SRCREV_pn-eds-dbus ?= "${AUTOREV}" SRCREV_pn-eglibc ?= "${AUTOREV}" SRCREV_pn-eglibc-initial ?= "${AUTOREV}" SRCREV_pn-eglibc-intermediate ?= "${AUTOREV}" @@ -19,6 +20,7 @@ SRCREV_pn-libmokopanelui2 ?= "${AUTOREV}" SRCREV_pn-libmokoui2 ?= "${AUTOREV}" SRCREV_pn-libowl ?= "${AUTOREV}" SRCREV_pn-libxosd ?= "${AUTOREV}" +SRCREV_pn-linux-openmoko ?= "${AUTOREV}" SRCREV_pn-llvm-gcc4 ?= "${AUTOREV}" SRCREV_pn-llvm-gcc4-cross ?= "${AUTOREV}" SRCREV_pn-maemo-mapper ?= "${AUTOREV}" @@ -60,6 +62,7 @@ SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" SRCREV_pn-openmoko-session ?= "${AUTOREV}" +SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}" SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index aeb0a2afbc..316fc5a4de 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -35,6 +35,7 @@ SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}" SRCREV_pn-openmoko-libs ?= "${AUTOREV}" SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}" SRCREV_pn-openmoko-messages ?= "${AUTOREV}" +SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}" @@ -44,6 +45,7 @@ SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" +SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" SRCREV_pn-openmoko-session ?= "${AUTOREV}" SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}" diff --git a/conf/distro/include/preferred-openmoko-versions.inc b/conf/distro/include/preferred-openmoko-versions.inc deleted file mode 100644 index c002776d70..0000000000 --- a/conf/distro/include/preferred-openmoko-versions.inc +++ /dev/null @@ -1,10 +0,0 @@ -# -# Specify which versions of OpenMoko packages to build -# - -# -# Bootloader and Kernel -# - -SRCREV_pn-linux-openmoko ?= "2937" - diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index e5db7a9ceb..4d9509fc15 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20070819" +EFL_SRCDATE = "20071206" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -88,6 +88,8 @@ SRCDATE_eflpp ?= "${EFL_SRCDATE}" SRCDATE_python-evas ?= "${EFL_SRCDATE}" SRCDATE_python-ecore ?= "${EFL_SRCDATE}" SRCDATE_python-edje ?= "${EFL_SRCDATE}" +SRCDATE_python-emotion ?= "${EFL_SRCDATE}" +SRCDATE_python-epsilon ?= "${EFL_SRCDATE}" SRCDATE_python-ewl ?= "${EFL_SRCDATE}" SRCDATE_python-etk ?= "${EFL_SRCDATE}" @@ -101,8 +103,11 @@ SRCDATE_exhibit ?= "${EFL_SRCDATE}" SRCDATE_expedite ?= "${EFL_SRCDATE}" SRCDATE_elitaire ?= "${EFL_SRCDATE}" SRCDATE_entice ?= "${EFL_SRCDATE}" +SRCDATE_entrance ?= "${EFL_SRCDATE}" SRCDATE_e-utils ?= "${EFL_SRCDATE}" +SRCDATE_e-wm ?= "${EFL_SRCDATE}" SRCDATE_enna ?= "${EFL_SRCDATE}" +SRCDATE_exquisite ?= "${EFL_SRCDATE}" # Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index e537c66c30..a65f477296 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -9,45 +9,51 @@ SRCREV_pn-aircrack-ng ?= "802" SRCREV_pn-bfin-uclibc ?= "1857" +SRCREV_pn-contact ?= "1410" SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dbus-c++ ?= "13131" SRCREV_pn-dfu-util ?= "2866" SRCREV_pn-dfu-util-native ?= "2866" -SRCREV_pn-eglibc ?= "3531" -SRCREV_pn-eglibc-initial ?= "3531" -SRCREV_pn-eglibc-intermediate ?= "3531" -SRCREV_pn-ezxd ?= "2070" -SRCREV_pn-elf2flt="1786" +SRCREV_pn-eds-dbus ?= "628" +SRCREV_pn-eglibc ?= "4355" +SRCREV_pn-eglibc-initial ?= "4355" +SRCREV_pn-eglibc-intermediate ?= "4355" +SRCREV_pn-ezxd ?= "2074" +SRCREV_pn-elf2flt ?= "1786" +SRCREV_pn-epiphany ?= "7650" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "606" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gypsy ?= "56" -SRCREV_pn-hildon-1 ?= "14173" +SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" +SRCREV_pn-libcalenabler2 ?= "1410" SRCREV_pn-libfakekey ?= "1455" -SRCREV_pn-libgsmd ?= "3074" +SRCREV_pn-libgsmd ?= "3519" SRCREV_pn-libgsmd-devel ?= "3293" -SRCREV_pn-libjana ?= "665" -SRCREV_pn-libmokogsmd2 ?= "2950" +SRCREV_pn-libjana ?= "697" +SRCREV_pn-libmokogsmd2 ?= "3378" SRCREV_pn-libmokojournal2 ?= "3217" -SRCREV_pn-libmokopanelui2 ?= "3226" +SRCREV_pn-libmokopanelui2 ?= "3349" SRCREV_pn-libmokoui2 ?= "3229" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" -SRCREV_pn-linux-bfin ?= "3745" +SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" +SRCREV_pn-linux-ixp4xx ?= "927" +SRCREV_pn-linux-openmoko ?= "3238" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" -SRCREV_pn-maemo-mapper ?= "108" -SRCREV_pn-matchbox-desktop-2 ?= "1649" +SRCREV_pn-maemo-mapper ?= "118" +SRCREV_pn-matchbox-desktop-2 ?= "1778" SRCREV_pn-matchbox-keyboard ?= "1739" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739" SRCREV_pn-matchbox-panel-2 ?= "1626" -SRCREV_pn-moko-gtk-engine ?= "3207" +SRCREV_pn-moko-gtk-engine ?= "3405" SRCREV_pn-mpd-alsa ?= "6952" -SRCREV_pn-neod ?= "2956" +SRCREV_pn-neod ?= "3421" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" SRCREV_pn-osb-jscore ?= "117" @@ -55,66 +61,70 @@ SRCREV_pn-osb-nrcit ?= "125" SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-openmoko-appearance ?= "3239" SRCREV_pn-openmoko-appmanager ?= "1851" -SRCREV_pn-openmoko-appmanager2 ?= "3299" +SRCREV_pn-openmoko-appmanager2 ?= "3442" SRCREV_pn-openmoko-browser2 ?= "3249" SRCREV_pn-openmoko-calculator ?= "2404" SRCREV_pn-openmoko-calculator2 ?= "3235" SRCREV_pn-openmoko-common ?= "397" -SRCREV_pn-openmoko-common2 ?= "2679" +SRCREV_pn-openmoko-common2 ?= "3259" SRCREV_pn-openmoko-contacts ?= "2298" -SRCREV_pn-openmoko-contacts2 ?= "358" +SRCREV_pn-openmoko-contacts2 ?= "374" SRCREV_pn-openmoko-dates ?= "467" -SRCREV_pn-openmoko-dates2 ?= "658" +SRCREV_pn-openmoko-dates2 ?= "661" SRCREV_pn-openmoko-dialer ?= "2811" -SRCREV_pn-openmoko-dialer2 ?= "3298" +SRCREV_pn-openmoko-dialer2 ?= "3522" SRCREV_pn-openmoko-feedreader2 ?= "3080" SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "3158" SRCREV_pn-openmoko-footer ?= "2354" SRCREV_pn-openmoko-icon-theme-standard ?= "2232" -SRCREV_pn-openmoko-icon-theme-standard2 ?= "3225" -SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3225" +SRCREV_pn-openmoko-icon-theme-standard2 ?= "3247" +SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247" SRCREV_pn-openmoko-keyboard ?= "1631" SRCREV_pn-openmoko-libs ?= "2367" -SRCREV_pn-openmoko-mediaplayer2 ?= "3300" +SRCREV_pn-openmoko-mediaplayer2 ?= "3345" SRCREV_pn-openmoko-messages ?= "2276" -SRCREV_pn-openmoko-panel-battery ?= "3272" -SRCREV_pn-openmoko-panel-bt ?= "2896" +SRCREV_pn-openmoko-messages2 ?= "3477" +SRCREV_pn-openmoko-panel-battery ?= "3360" +SRCREV_pn-openmoko-panel-bt ?= "3149" SRCREV_pn-openmoko-panel-clock ?= "2567" SRCREV_pn-openmoko-panel-demo ?= "1622" SRCREV_pn-openmoko-panel-demo-simple ?= "1328" SRCREV_pn-openmoko-panel-gps ?= "2900" -SRCREV_pn-openmoko-panel-gsm ?= "3185" +SRCREV_pn-openmoko-panel-gsm ?= "3256" SRCREV_pn-openmoko-panel-mainmenu ?= "2567" -SRCREV_pn-openmoko-panel-usb ?= "2893" +SRCREV_pn-openmoko-panel-usb ?= "3360" SRCREV_pn-openmoko-session ?= "152" +SRCREV_pn-openmoko-sample2 ?= "3537" SRCREV_pn-openmoko-simplemediaplayer ?= "1688" SRCREV_pn-openmoko-sound-theme-standard2 ?= "3192" SRCREV_pn-openmoko-stylus-demo ?= "2324" SRCREV_pn-openmoko-stylus-demo-simple ?= "1818" SRCREV_pn-openmoko-taskmanager ?= "1663" SRCREV_pn-openmoko-tasks ?= "320" -SRCREV_pn-openmoko-tasks2 ?= "346" -SRCREV_pn-openmoko-terminal2 ?= "2972" +SRCREV_pn-openmoko-tasks2 ?= "348" +SRCREV_pn-openmoko-terminal2 ?= "3435" SRCREV_pn-openmoko-theme-standard ?= "2370" SRCREV_pn-openmoko-theme-standard-qvga ?= "2370" -SRCREV_pn-openmoko-theme-standard2 ?= "3210" -SRCREV_pn-openmoko-theme-standard2-qvga ?= "3210" +SRCREV_pn-openmoko-theme-standard2 ?= "3425" +SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425" SRCREV_pn-openmoko-today ?= "3056" -SRCREV_pn-openmoko-today2 ?= "3287" -SRCREV_pn-openmoko-today2-folders ?= "2680" -SRCREV_pn-openmoko-worldclock2 ?= "3301" +SRCREV_pn-openmoko-today2 ?= "3478" +SRCREV_pn-openmoko-today2-folders ?= "3414" +SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" +SRCREV_pn-python-formencode = "3148" SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" -SRCREV_pn-tmut ?= "15" +SRCREV_pn-tmut ?= "60" SRCREV_pn-webkit-gtk ?= "27222" SRCREV_pn-webkit-qt ?= "27222" SRCREV_pn-webkit-qtopia ?= "27222" +SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1623" SRCREV_pn-mplayer ?= "24587" SRCREV_pn-networkmanager ?= "2887" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 652373a3eb..ab80719646 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.6" +SLUGOS_VERSION = "4.7" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): @@ -64,6 +64,7 @@ FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/${IMAGE_BASENAME} # to enable/disable debugging in the distro. Here noirqdebug is used to # remove the messages about unhandled interrupts - people debugging interrupt # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) +CMDLINE_ROOT = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc" CMDLINE_DEBUG = "noirqdebug" # EXTRA PACKAGES @@ -89,28 +90,38 @@ DISTRO_EXTRA_RRECOMMENDS ?= "" # necessary to define which gets generated first, glibc or the kernel, and # this is done by selecting the provider of libc (in this case it needs the # kernel, so there has to be a non-libc gcc to build the kernel!) -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -# Select 2.6 versions of the depmod support -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" + +# Virtuals: +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" + +#Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo) +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" + +# Set the preferred provider for a few toolchain-related items, otherwise +# these may be selected from the external-toolchain instead. +PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross" +PREFERRED_PROVIDER_virtual/armeb-linux-binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" # compiler/binary/library versions -PREFERRED_VERSION_binutils ?= "2.16" -PREFERRED_VERSION_binutils-cross ?= "2.16" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" -PREFERRED_VERSION_gcc ?= "4.1.1" -PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" -#For SVN uclibc: -#SRCDATE_uclibc ?= "20060120" -#PREFERRED_VERSION_uclibc ?= "0.9.28+svn${SRCDATE_uclibc}" +PREFERRED_VERSION_binutils ?= "2.18" +PREFERRED_VERSION_binutils-cross ?= "2.18" +PREFERRED_VERSION_binutils-cross-sdk ?= "2.18" +PREFERRED_VERSION_gcc ?= "4.1.2" +PREFERRED_VERSION_gcc-cross ?= "4.1.2" +PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2" +PREFERRED_VERSION_glibc ?= "2.5" +PREFERRED_VERSION_glibc-intermediate ?= "2.5" +PREFERRED_VERSION_glibc-initial ?= "2.5" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). -PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.6" # Select the smallest provider of x11 libraries @@ -139,12 +150,7 @@ PREFERRED_VERSION_ipkg-native ?= "0.99.163" #FIXME: HACK: REMOVE THIS IGNORE_STRIP_ERRORS = "" -# Due to upstream instability, and another OE project with conflicting -# needs, nail down a specific, known-working version of madwifi-ng. -# Remove this once the madwifi-ng stuff seems to stabilize once again. -#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225" - -PREFERRED_VERSION_linux-libc-headers = "2.6.18" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.20" # we don't ship gtk-directfb by default PREFERRED_PROVIDER_gtk+ ?= "gtk+" |