diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/chinook-compat.conf | 11 | ||||
| -rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 33 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 3 | ||||
| -rw-r--r-- | conf/distro/openmoko.conf | 1 | ||||
| -rw-r--r-- | conf/machine/xilinx-ml403.conf | 2 |
5 files changed, 36 insertions, 14 deletions
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf index 1503a6f380..f6029eed1b 100644 --- a/conf/distro/chinook-compat.conf +++ b/conf/distro/chinook-compat.conf @@ -52,7 +52,9 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-binutils = "binutils-cross" -PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-header" +PREFERRED_PROVIDER_linux-libc-header = "linux-libc-headers" +PREFERRED_PROVIDER_virtual/libx11 = "libx11" +PREFERRED_PROVIDER_gconf ?= "gconf-dbus" PREFERRED_VERSION_automake-native = "1.9.6" @@ -84,6 +86,9 @@ PREFERRED_VERSION_glib-2.0 = "2.12.12" PREFERRED_VERSION_pango = "1.16.4" PREFERRED_VERSION_atk = "1.18.0" PREFERRED_VERSION_gtk+ = "2.10.14" +PREFERRED_VERSION_libpng = "1.2.8" +PREFERRED_VERSION_dbus = "1.0.3" +PREFERRED_VERSION_expat = "1.95.7" PREFERRED_VERSION_gnome-vfs = "2.16.3" @@ -112,6 +117,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/libsdl = "libsdl-directfb" PREFERRED_VERSION_libsdl-directfb = "1.2.9" PREFERRED_VERSION_libsdl-image = "1.2.3" +PREFERRED_VERSION_libsdl-mixer = "1.2.6" PREFERRED_PROVIDER_xserver = "xserver-kdrive" @@ -137,7 +143,7 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp = "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm = "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm = "gtk+" -PREFERRED_PROVIDER_gconf = "gconf" +PREFERRED_PROVIDER_gconf = "gconf-dbus" PREFERRED_VERSION_pixman = "0.9.6" @@ -192,6 +198,7 @@ PKG_glib-2.0 = "libglib2.0-0" PKG_gconf = "libgconf2-6" DEBIANNAME_dbus_pn-dbus = "dbus" PKG_libhildon = "libhildon1" +DEBIANNAME_eds-dbus_pn-libedataserver-1.2 = "libedataserver" PKG_zlib = "zlib1g" PKG_libglade = "libglade2-0" diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 5ba510a4b7..a9fbb3067d 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1227,16 +1227,28 @@ PREFERRED_VERSION_microcom ?= "1.02" PREFERRED_VERSION_micro-emacs ?= "20060909" PREFERRED_VERSION_microwindows ?= "0.90" PREFERRED_VERSION_midori ?= "0.0.17" -PREFERRED_VERSION_midpath ?= "0.1" -PREFERRED_VERSION_midpath-alsa ?= "0.1" -PREFERRED_VERSION_midpath-cldc ?= "0.1" -PREFERRED_VERSION_midpath-cldc-native ?= "0.1" -PREFERRED_VERSION_midpath-cldc-sdl ?= "0.1" -PREFERRED_VERSION_midpath-cldc-x11 ?= "0.1" -PREFERRED_VERSION_midpath-gtk ?= "0.1" -PREFERRED_VERSION_midpath-qt3x11 ?= "0.1" -PREFERRED_VERSION_midpath-qte ?= "0.1" -PREFERRED_VERSION_midpath-test ?= "0.1" +PREFERRED_VERSION_midpath-backend-alsa ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-backend-escher ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-backend-esd ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-backend-fb ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-backend-gtk ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-backend-pulseaudio ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-backend-qt3x11 ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-backend-qt4x11 ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-backend-qte ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-backend-sdl ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-cldc ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-core ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-demos ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-jgl ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-location ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-m3g ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-maemo ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-messaging ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-opengles ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-openmoko ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-svg ?= "0.2+0.3rc1" +PREFERRED_VERSION_midpath-webservices ?= "0.2+0.3rc1" PREFERRED_VERSION_mikmod ?= "3.2.2-beta1" PREFERRED_VERSION_mileage ?= "4.2.0-cvs-20060814" PREFERRED_VERSION_militaryalphabet ?= "0.2.1" @@ -1345,7 +1357,6 @@ PREFERRED_VERSION_obexpush ?= "1.0.0" PREFERRED_VERSION_obexpush-native ?= "1.0.0" PREFERRED_VERSION_octave ?= "2.1.73" PREFERRED_VERSION_offlineimap ?= "4.0.14" -PREFERRED_VERSION_olsr ?= "0.3-1" PREFERRED_VERSION_olsrd ?= "0.5.3" PREFERRED_VERSION_omext ?= "0.2" PREFERRED_VERSION_omniorb ?= "4.0.7" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 3acc8b2bc2..8661e5b065 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -166,5 +166,8 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" +PREFERRED_PROVIDER_avahi ?= "avahi" +PREFERRED_PROVIDER_gconf ?= "gconf" + require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index d7a3b98f6e..75d9a9756a 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -62,6 +62,7 @@ PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" PREFERRED_PROVIDER_classpath = "classpath" PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk" +PREFERRED_PROVIDER_midpath = "midpath-openmoko" # deploy gta01 and gta02 in ${MACHINE_CLASS} directory DEPLOY_DIR_IMAGE_om-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" diff --git a/conf/machine/xilinx-ml403.conf b/conf/machine/xilinx-ml403.conf index 9b51b87a7f..219d1f301e 100644 --- a/conf/machine/xilinx-ml403.conf +++ b/conf/machine/xilinx-ml403.conf @@ -7,7 +7,7 @@ TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "ppc405" -PREFERRED_PROVIDER_virtual/kernel = "linux-ml403-slab-2.6.x" +PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx-slab" MACHINE_FEATURES = "kernel26 ext2" |