diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/openmoko.inc | 142 | ||||
| -rw-r--r-- | conf/distro/include/preferred-openmoko-versions.inc | 54 | ||||
| -rw-r--r-- | conf/distro/openmoko.conf | 7 |
3 files changed, 9 insertions, 194 deletions
diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc deleted file mode 100644 index 80c861b95c..0000000000 --- a/conf/distro/include/openmoko.inc +++ /dev/null @@ -1,142 +0,0 @@ -# -# Header -# -DISTRO_NAME = "OpenMoko" - -# -# Naming schemes -# -INHERIT += "debian multimachine" - -# -# Packaging and output format -# -INHERIT += "package_ipk" -IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" -IMAGE_FSTYPES_x86 = "tar.gz" -IMAGE_ROOTFS_SIZE_ext2 = "131072" - -# -# Binutils & Compiler -# -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" - -# EABI stuff -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" - -# -# Target OS & FPU system -# -TARGET_OS = "linux" -TARGET_FPU_arm = "soft" -TARGET_FPU_armeb = "soft" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" -PREFERRED_VERSION_linux-libc-headers_x86 = "2.6.15.99" -PREFERRED_VERSION_linux-libc_headers = "2.6.18" -# -# Features -# -DISTRO_FEATURES = "alsa bluetooth ext2 ipsec nfs ppp smbfs usbgadget usbhost" - -# -# Bootstrap & Init -# -require conf/distro/include/sane-srcdates.inc - -# -# Framebuffer & X -# -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11" -PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" -PREFERRED_PROVIDER_virtual/esmart ?= "esmart-x11" -PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_tslib ?= "tslib" -PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -require conf/distro/include/preferred-xorg-versions-X11R7.1.inc - -# -# Gnome -# -PREFERRED_PROVIDER_dbus-glib = "dbus-glib" -PREFERRED_PROVIDER_gconf = "gconf-dbus" -#new -#PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs" -#old -PREFERRED_PROVIDER_gnome-vfs = "gnome-vfs" -PREFERRED_PROVIDER_gnome-vfs-plugin-file = "gnome-vfs" - -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -PREFERRED_PROVIDER_bluez-utils = "bluez-utils-dbus" - -PREFERRED_VERSION_dbus-native = "1.0.2" -PREFERRED_VERSION_dbus = "1.0.2" -PREFERRED_VERSION_dbus-glib-native = "0.71" -PREFERRED_VERSION_dbus-glib = "0.71" -PREFERRED_VERSION_atk = "1.9.0" -PREFERRED_VERSION_pango = "1.8.2" -PREFERRED_VERSION_glib-2.0 = "2.12.3" -PREFERRED_VERSION_gtk+ = "2.6.10" -PREFERRED_VERSION_gtk-engines = "2.6.5" -#PREFERRED_VERSION_gnome-vfs = "2.16.3" - -PREFERRED_VERSION_fontconfig = "2.4.1" - -# we don't ship gtk-directfb by default -PREFERRED_PROVIDER_gtk+ ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" -PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" -# -# GPE -# -PREFERRED_PROVIDER_libgpewidget = "libgpewidget" - -# -# O-Hand -# -PREFERRED_VERSION_contacts = "0.1" -PREFERRED_VERSION_dates = "0.1" -# PREFERRED_VERSION_web = "???" - -# -# Development -# -PREFERRED_PROVIDER_qemu-native = "qemu-native" -PREFERRED_VERSION_qemu-native = "0.9.0+cvs${SRCDATE}" - -# -# Opie -# -QTE_VERSION = "2.3.10" -PALMTOP_USE_MULTITHREADED_QTE = "yes" -require conf/distro/include/preferred-opie-versions.inc - -# -# Enlightenment -# -require conf/distro/include/preferred-e-versions.inc - -# -# OpenMoko -# - -#We comment this out since external developers don't needs to use SRCDATE="now" as that generated unneed traffic -#require conf/distro/include/preferred-openmoko-versions.inc - diff --git a/conf/distro/include/preferred-openmoko-versions.inc b/conf/distro/include/preferred-openmoko-versions.inc index 263406c90b..ea24db3708 100644 --- a/conf/distro/include/preferred-openmoko-versions.inc +++ b/conf/distro/include/preferred-openmoko-versions.inc @@ -3,58 +3,8 @@ # # -# Base +# Bootloader and Kernel # -SRCDATE_uboot = "now" -SRCDATE_uboot-gta01 = "now" -SRCDATE_kernel = "now" -SRCDATE_linux-gta01 = "now" -SRCDATE_linux-gta01-nobbt = "now" -SRCDATE_libgsmd = "now" -SRCDATE_openmoko-session = "now" -SRCDATE_openmoko-common = "now" -SRCDATE_openmoko-theme-standard = "now" -SRCDATE_openmoko-libs = "now" +SRCREV_pn-linux-openmoko = "2937" -# -# Examples -# -SRCDATE_openmoko-stylus-demo = "now" -SRCDATE_openmoko-stylus-demo-simple = "now" -SRCDATE_openmoko-finger-demo = "now" -SRCDATE_openmoko-panel-demo = "now" -SRCDATE_openmoko-panel-demo-simple = "now" - -# -# PIM -# -SRCDATE_openmoko-contacts = "now" -SRCDATE_openmoko-dates = "now" - -# -# Applications -# -SRCDATE_openmoko-appmanager = "now" -SRCDATE_openmoko-chordmaster = "now" -SRCDATE_openmoko-dialer = "now" -SRCDATE_openmoko-footer = "now" -SRCDATE_openmoko-phone = "now" -SRCDATE_openmoko-mainmenu = "now" -SRCDATE_openmoko-taskmanager = "now" - -# -# Multimedia -# -SRCDATE_openmoko-simplemediaplayer = "now" - -# -# Panel Plugins -# -SRCDATE_openmoko-panel-clock = "now" -SRCDATE_openmoko-panel-battery = "now" -SRCDATE_openmoko-panel-mainmenu = "now" -SRCDATE_openmoko-panel-gsm = "now" -SRCDATE_openmoko-panel-gps = "now" -SRCDATE_openmoko-panel-bt = "now" -SRCDATE_openmoko-panel-usb = "now" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 0748b8cb7f..602ef8cff4 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -29,3 +29,10 @@ FEED_URIS = "\ updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \ updates-armv4t##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/armv4t \ updates-fic-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/fic-gta01 " + +# 2.18 seems to break badly on 64-bit systems +PREFERRED_VERSION_binutils ?= "2.17.50.0.12" +PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12" + +require conf/distro/include/preferred-openmoko-versions.inc + |