summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2008.1.conf76
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc6
-rw-r--r--conf/distro/include/angstrom-package-deb.inc4
-rw-r--r--conf/distro/include/angstrom-package-ipk.inc5
-rw-r--r--conf/distro/include/angstrom.inc6
-rw-r--r--conf/distro/include/preferred-slugos-versions.inc14
-rw-r--r--conf/distro/include/sane-feed-deb.inc4
-rw-r--r--conf/distro/include/sane-feed-ipk.inc5
-rw-r--r--conf/distro/include/sane-srcrevs-fso.inc2
-rw-r--r--conf/distro/include/sane-srcrevs.inc50
-rw-r--r--conf/distro/include/shr-autorev.inc1
-rw-r--r--conf/distro/include/slugos.inc6
-rw-r--r--conf/distro/jlime-2009.1.conf10
-rw-r--r--conf/distro/micro.conf6
-rw-r--r--conf/distro/minimal.conf14
-rw-r--r--conf/distro/shr.conf28
-rw-r--r--conf/distro/slugos.conf3
17 files changed, 73 insertions, 167 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index c9fc16365b..26614adb72 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -84,23 +84,8 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.31"
#Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
PREFERRED_VERSION_glibc ?= "2.9"
PREFERRED_VERSION_glibc-initial ?= "2.9"
-PREFERRED_VERSION_uclibc ?= "0.9.30"
-PREFERRED_VERSION_uclibc-initial ?= "0.9.30"
-
-# Preferred provider for virtual/psplash
-# This enforces a specific brand to be used, in our case the angstrom
-# one. In case you want to change the logo or something like that we
-# suggest you to create another recipe (e.g: psplash-<brand>) for that
-# and add that into your image.
-# You can also opt to change or override this line, but that isn't
-# needed because psplash is using update-alternatives.
-PREFERRED_PROVIDER_virtual/psplash ?= "psplash-angstrom"
-
-PREFERRED_PROVIDER_avahi = "avahi"
-PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
-PREFERRED_PROVIDER_virtual/gail ?= "gtk+"
-
-PREFERRED_PROVIDER_libfribidi = "fribidi"
+PREFERRED_VERSION_uclibc ?= "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1"
#powerpc needs additional patches to gcc
ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1"
@@ -140,76 +125,31 @@ PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
# Toolchain virtuals:
require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
-# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
-PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
-PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
-PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
-
-PREFERRED_PROVIDER_virtual/db ?= "db"
-PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-
-# Others:
PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-PREFERRED_PROVIDER_esound ?= "pulseaudio"
-PREFERRED_PROVIDER_gconf ?= "gconf"
-PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
-PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-PREFERRED_PROVIDER_tslib-conf ?= "tslib"
-PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
-PREFERRED_PROVIDER_ntp ?= "ntp"
PREFERRED_PROVIDER_hotplug = "udev"
-PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
-PREFERRED_PROVIDER_libxss = "libxss"
-PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils"
-PREFERRED_PROVIDER_bluez-libs = "bluez4"
-PREFERRED_PROVIDER_bluez-utils = "bluez4"
-PREFERRED_PROVIDER_util-linux = "util-linux-ng"
+PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl"
+
# The default is too old for linux-libc-headers-2.6.31:
PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr29789"
ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4"
ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4"
-# 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+"
-
-# QT stuff:
-# There are several flavours of qt4x11 in OE, so lets pick one that is buildable for everyone
-PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
-
-#Silence a warning during parsing
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough"
#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
require conf/distro/include/angstrom${ARM_ABI}.inc
-
-
# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
# We also take this opportunity to inject angstrom-version and the feed configs into the rootfs
IPKG_VARIANT = "opkg-nogpg-nocurl angstrom-version ${ANGSTROM_FEED_CONFIGS}"
+# we need the same provider for opkg and u-a
+PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl"
+
# Select xserver-xorg as default, since kdrive has been EOL'ed
XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
# do some task-base stuff here
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 3098101d7f..d59c99ec00 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -16,7 +16,7 @@ PREFERRED_VERSION_gtkmm = "2.18.1"
PREFERRED_VERSION_hal = "0.5.13"
PREFERRED_VERSION_libgemwidget = "1.0"
PREFERRED_VERSION_libgpephone = "0.4"
-PREFERRED_VERSION_libsdl-x11 = "1.2.11"
+PREFERRED_VERSION_libsdl-x11 = "1.2.14"
PREFERRED_VERSION_libtool = "2.2.6a"
PREFERRED_VERSION_libtool-native = "2.2.6a"
PREFERRED_VERSION_libtool-cross = "2.2.6a"
@@ -36,8 +36,8 @@ PREFERRED_VERSION_udev = "141"
UDEV_GE_141 = "1"
PREFERRED_VERSION_usbutils = "0.82"
-PREFERRED_VERSION_util-macros-native = "1.2.1"
-PREFERRED_VERSION_util-macros = "1.2.1"
+PREFERRED_VERSION_util-macros-native = "1.3.0"
+PREFERRED_VERSION_util-macros = "1.3.0"
PREFERRED_VERSION_wpa-supplicant = "0.6.9"
PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
PREFERRED_VERSION_xserver-xorg = "1.6.1"
diff --git a/conf/distro/include/angstrom-package-deb.inc b/conf/distro/include/angstrom-package-deb.inc
index 3dbb175f93..e060bb1ccf 100644
--- a/conf/distro/include/angstrom-package-deb.inc
+++ b/conf/distro/include/angstrom-package-deb.inc
@@ -1,4 +1,4 @@
INHERIT += "package_deb"
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
diff --git a/conf/distro/include/angstrom-package-ipk.inc b/conf/distro/include/angstrom-package-ipk.inc
index a33a4ad2b4..14206bda2d 100644
--- a/conf/distro/include/angstrom-package-ipk.inc
+++ b/conf/distro/include/angstrom-package-ipk.inc
@@ -1,5 +1,4 @@
INHERIT += "package_ipk"
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
-
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg}
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 6e65285e99..8647dd7ec4 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -11,8 +11,10 @@ BUILDNAME = "Angstrom ${DISTRO_VERSION}"
TARGET_VENDOR = "-angstrom"
-# Add FEED_ARCH to overrides
-OVERRIDES .= ":${FEED_ARCH}"
+SOC_FAMILY ?= "Unknown"
+
+# Add FEED_ARCH and SOC_FAMILY to overrides
+OVERRIDES .= ":${FEED_ARCH}:${SOC_FAMILY}"
# Put links to sources in deploy/sources to make it easier for people to be GPL compliant
INHERIT += "src_distribute_local"
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 5ec80ffeb1..204047fd63 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -36,22 +36,22 @@ PREFERRED_VERSION_binutils ?= "2.18.50.0.7"
PREFERRED_VERSION_binutils-cross ?= "2.18.50.0.7"
PREFERRED_VERSION_binutils-cross-sdk ?= "2.18.50.0.7"
PREFERRED_VERSION_busybox ?= "1.13.2"
-PREFERRED_VERSION_dbus ?= "1.2.1"
+PREFERRED_VERSION_dbus ?= "1.2.3"
PREFERRED_VERSION_gcc ?= "4.2.4"
PREFERRED_VERSION_gcc-cross ?= "4.2.4"
PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.4"
PREFERRED_VERSION_gcc-cross-initial ?= "4.2.4"
PREFERRED_VERSION_gcc-cross-intermediate ?= "4.2.4"
-PREFERRED_VERSION_glib-2.0 ?= "2.18.3"
-PREFERRED_VERSION_glib-2.0-native ?= "2.18.0"
+PREFERRED_VERSION_glib-2.0 ?= "2.22.1"
+PREFERRED_VERSION_glib-2.0-native ?= "2.22.1"
PREFERRED_VERSION_glibc ?= "2.6.1"
PREFERRED_VERSION_glibc-initial ?= "2.6.1"
PREFERRED_VERSION_ipkg ?= "0.99.163"
PREFERRED_VERSION_ipkg-native ?= "0.99.163"
-PREFERRED_VERSION_libtool ?= "2.2.4"
-PREFERRED_VERSION_libtool-native ?= "2.2.4"
-PREFERRED_VERSION_libtool-cross ?= "2.2.4"
-PREFERRED_VERSION_libtool-sdk ?= "2.2.4"
+PREFERRED_VERSION_libtool ?= "2.2.6a"
+PREFERRED_VERSION_libtool-native ?= "2.2.6a"
+PREFERRED_VERSION_libtool-cross ?= "2.2.6a"
+PREFERRED_VERSION_libtool-sdk ?= "2.2.6a"
PREFERRED_VERSION_linux-libc-headers ?= "2.6.23"
PREFERRED_VERSION_m4 ?= "1.4.8"
PREFERRED_VERSION_m4-native ?= "1.4.8"
diff --git a/conf/distro/include/sane-feed-deb.inc b/conf/distro/include/sane-feed-deb.inc
index 4f38b8f936..d953d6ebe0 100644
--- a/conf/distro/include/sane-feed-deb.inc
+++ b/conf/distro/include/sane-feed-deb.inc
@@ -2,5 +2,5 @@
INHERIT += "package_deb"
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
diff --git a/conf/distro/include/sane-feed-ipk.inc b/conf/distro/include/sane-feed-ipk.inc
index a33a4ad2b4..14206bda2d 100644
--- a/conf/distro/include/sane-feed-ipk.inc
+++ b/conf/distro/include/sane-feed-ipk.inc
@@ -1,5 +1,4 @@
INHERIT += "package_ipk"
-PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native"
-PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth"
-
+PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg}
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index f99b44945c..1372c0aad2 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -30,7 +30,7 @@ SRCREV_pn-fso-specs ?= "14de522adbea80416df811085b3112cd1d5d5336"
SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
SRCREV_pn-libeflvala ?= "d07db4fbd24c9d5dfc9b1fd5024fd651b02f123e"
SRCREV_pn-libfso-glib ?= "9a627aa1c33f5a46ae4316fc274126ca5f37e979"
-SRCREV_pn-libframeworkd-glib ?= "dc5409fbf9d2d22a7fa871199bb66da5ac6f5084"
+SRCREV_pn-libframeworkd-glib ?= "411fa741227842dc993aba24184c7c6db0d09ba5"
SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166"
SRCREV_pn-libgsm0710mux ?= "e81ed512ec86e31d0d0119826afa9d1302651693"
SRCREV_pn-libpersistence ?= "26180fd3c0fe4eb6abb7440f10e51d997719b97a"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e755bf5b75..2b332fbf34 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -20,7 +20,7 @@ SRCREV_pn-app-restarter ?= "4552"
SRCREV_pn-assassin ?= "268"
SRCREV_pn-assassin-thumbnail ?= "4690"
SRCREV_pn-aufs2-util ?= "f35ba2292fe40aa94aa83713e0b2719f35a25768"
-SRCREV_pn-babiloo-efl ?= "288"
+SRCREV_pn-babiloo-efl ?= "296"
SRCREV_pn-bfin-uclibc ?= "1857"
SRCREV_pn-blipomoko ?= "93295f36f7b45c691df247cb2a65227facf13654"
SRCREV_pn-bootchart-lite ?= "4"
@@ -46,7 +46,7 @@ SRCREV_pn-dfu-util-native ?= "4160"
SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953"
SRCREV_pn-diversity-daemon ?= "571"
SRCREV_pn-diversity-radar ?= "453"
-SRCREV_pn-e-tasks ?= "14"
+SRCREV_pn-e-tasks ?= "18"
SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -58,15 +58,15 @@ SRCREV_pn-e-wm-theme-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
SRCREV_pn-e-wm-theme-illume-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
SRCREV_pn-ebrainy ?= "21"
SRCREV_pn-eds-dbus ?= "736"
-SRCREV_pn-elementary-theme-gry ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-elementary-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-elementary-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-elementary-theme-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-elementary-theme-gry ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
+SRCREV_pn-elementary-theme-neo ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
+SRCREV_pn-elementary-theme-niebiee ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
+SRCREV_pn-elementary-theme-sixteen ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
SRCREV_pn-elf2flt ?= "1786"
SRCREV_pn-elmdentica ?= "171"
SRCREV_pn-enlazar ?= "37"
SRCREV_pn-enotes ?= "19"
-SRCREV_pn-epdfview ?= "345"
+SRCREV_pn-epdfview ?= "346"
SRCREV_pn-epiphany ?= "7837"
SRCREV_pn-essential-dialer ?= "194"
SRCREV_pn-etk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -107,18 +107,7 @@ SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-illume-keyboard-arabic ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-browse ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-danish ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-default-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-dutch ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-dvorak ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-french ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-german ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-hebrew ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-numeric-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-russian ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-russian-terminal ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboards-shr ?= "c23bde500152c303971b4c2ec5c463d760b7cc14"
SRCREV_pn-illume-theme-asu ?= "4881"
SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
SRCREV_pn-intone ?= "66"
@@ -196,12 +185,13 @@ SRCREV_pn-mplayer-maemo ?= "342"
SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
SRCREV_pn-multitap-pad ?= "373"
SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-navit ?= "1096"
+SRCREV_pn-navit ?= "2846"
+SRCREV_pn-navit-icons ?= "2618"
SRCREV_pn-neod ?= "4617"
-SRCREV_pn-neomis ?= "2"
+SRCREV_pn-neomis ?= "6"
SRCREV_pn-net-snmp ?= "17367"
SRCREV_pn-netsurf ?= "3859"
-SRCREV_pn-numberx ?= "3"
+SRCREV_pn-numberx ?= "4"
SRCREV_pn-numptyphysics ?= "109"
SRCREV_pn-oh-puzzles ?= "22"
SRCREV_pn-ohm ?= "edfe25d49d67884bf004de7ae0724c162bb5e65e"
@@ -258,9 +248,9 @@ SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14"
SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
SRCREV_pn-opimd-utils ?= "0e7007fff120c8cc4c579c0c7e57883798e6d23e"
-SRCREV_pn-opkg ?= "413"
-SRCREV_pn-opkg-native ?= "413"
-SRCREV_pn-opkg-sdk ?= "413"
+SRCREV_pn-opkg ?= "446"
+SRCREV_pn-opkg-native ?= "446"
+SRCREV_pn-opkg-sdk ?= "446"
SRCREV_pn-opkg-utils ?= "4578"
SRCREV_pn-opkg-utils-native ?= "4595"
SRCREV_pn-oprofileui ?= "173"
@@ -302,9 +292,9 @@ SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
SRCREV_pn-shr-dialer ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde"
-SRCREV_pn-shr-launcher ?= "87"
+SRCREV_pn-shr-launcher ?= "92"
SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
-SRCREV_pn-shr-settings ?= "b92390148cf0e979fd4c678a6633bb5e436d5763"
+SRCREV_pn-shr-settings ?= "ef06fe86c49958673889671c46682c0b2f1d74d7"
SRCREV_pn-shr-specs ?= "a881cd133439737708d4d4d150500246ceff7c7d"
SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
SRCREV_pn-shr-splash-theme-dontpanic ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -316,6 +306,7 @@ SRCREV_pn-shr-splash-theme-tux ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
SRCREV_pn-shr-theme ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
SRCREV_pn-shr-theme-gtk-e17lookalike ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
SRCREV_pn-shr-today ?= "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2"
+SRCREV_pn-shr-wizard ?= "35c1042d4547495033c04abb0c038f966a40e048"
SRCREV_pn-sjf2410-linux-native ?= "4268"
SRCREV_pn-socketcan-modules ?= "917"
SRCREV_pn-socketcan-utils-test ?= "917"
@@ -343,7 +334,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCREV ?= "43996"
+EFL_SRCREV ?= "44165"
SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
SRCREV_pn-edb ?= "${EFL_SRCREV}"
SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
@@ -416,6 +407,9 @@ SRCREV_pn-illume ?= "${EFL_SRCREV}"
SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}"
SRCREV_pn-waker ?= "${EFL_SRCREV}"
+#illume default keyboards
+SRCREV_pn-illume-keyboard-default ?= "${EFL_SRCREV}"
+
#exalt
SRCREV_pn-exalt ?= "${EFL_SRCREV}"
SRCREV_pn-exalt-client ?= "${EFL_SRCREV}"
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index 122433b7fc..9449b87604 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -13,4 +13,5 @@ SRCREV_pn-libphone-ui = "${AUTOREV}"
SRCREV_pn-libphone-ui-shr = "${AUTOREV}"
SRCREV_pn-libphone-utils = "${AUTOREV}"
SRCREV_pn-opimd-utils = "${AUTOREV}"
+SRCREV_pn-shr-wizard = "${AUTOREV}"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 8a331ae7f2..10a2bc4a02 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -166,6 +166,12 @@ PREFERRED_PROVIDER_avahi ?= "avahi"
PREFERRED_PROVIDER_gconf ?= "gconf"
PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
+# we use bluez4 instead of the older bluez3
+DISTRO_BLUETOOTH_MANAGER = "bluez4"
+PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils"
+PREFERRED_PROVIDER_bluez-libs = "bluez4"
+PREFERRED_PROVIDER_bluez-utils = "bluez4"
+
# Include any package preferred versions and srcrevs:
require conf/distro/include/preferred-slugos-versions.inc
diff --git a/conf/distro/jlime-2009.1.conf b/conf/distro/jlime-2009.1.conf
index 9d84d1b8c8..97de5cd257 100644
--- a/conf/distro/jlime-2009.1.conf
+++ b/conf/distro/jlime-2009.1.conf
@@ -27,6 +27,7 @@ DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
#<>
#<>------------------------------------------------------------------<
IMAGE_NAME = "${IMAGE_BASENAME}-2009.1-${MACHINE}"
+SPLASH = "psplash"
#
# Naming schemes + packages
@@ -56,6 +57,9 @@ PREFERRED_PROVIDER_virtual/gtk+ = "gtk+"
PREFERRED_PROVIDER_gconf = "gconf"
PREFERRED_PROVIDER_avahi = "avahi"
PREFERRED_PROVIDER_gtk+ = "gtk+"
+PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt-static"
+PREFERRED_PROVIDER_bluez-libs = "bluez-libs"
+PREFERRED_VERSION_gettext-native = "0.14.1"
PREFERRED_VERSION_gcc = "4.2.2"
PREFERRED_VERSION_gcc-cross = "4.2.2"
@@ -64,6 +68,9 @@ PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2"
PREFERRED_VERSION_binutils = "2.18"
PREFERRED_VERSION_binutils-cross = "2.18"
PREFERRED_VERSION_coreutils-native = "6.0"
+PREFERRED_VERSION_e2fsprogs-libs-native = "1.35"
+
+PREFERRED_VERSION_cdparanoia = "10.2"
#
# Target OS & FPU system
@@ -96,5 +103,4 @@ PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
PREFERRED_PROVIDER_tslib = "tslib"
PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
-
+require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index 25880dff9d..d9fc595303 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -72,12 +72,6 @@ OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:\
${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
#############################################################################
-# PREFERRED PROVIDERS
-#############################################################################
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-PREFERRED_PROVIDER_virtual/libx11 = "libx11"
-PREFERRED_PROVIDER_virtual/gail ?= "gtk+"
-#############################################################################
# PREFERRED VERSIONS
#############################################################################
require conf/distro/include/sane-srcdates.inc
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 33eceab456..1e9eec20f4 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -84,20 +84,6 @@ LIBC ?= "eglibc"
require conf/distro/include/sane-toolchain.inc
#############################################################################
-# PREFERRED PROVIDERS
-#############################################################################
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-PREFERRED_PROVIDER_avahi = "avahi"
-PREFERRED_PROVIDER_gconf = "gconf-dbus"
-PREFERRED_PROVIDER_gtk+ = "gtk+"
-PREFERRED_PROVIDER_libgpewidget = "libgpewidget"
-PREFERRED_PROVIDER_virtual/db = "db3"
-PREFERRED_PROVIDER_virtual/db-native = "db3-native"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb"
-
-#############################################################################
# PREFERRED VERSIONS
#############################################################################
require conf/distro/include/sane-srcdates.inc
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 2a33427e30..b99c895dc2 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -30,6 +30,7 @@ DISTRO_TYPE = "debug"
DISTRO = "shr"
DISTRO_SSH_DAEMON = "openssh"
+DISTRO_APM = "fso-apm"
#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
ENABLE_BINARY_LOCALE_GENERATION ?= "1"
@@ -155,34 +156,11 @@ require conf/distro/include/sane-toolchain.inc
#############################################################################
# PREFERRED PROVIDERS
#############################################################################
-PREFERRED_PROVIDER_qemu-native = "qemu-native"
-PREFERRED_PROVIDER_gconf = "gconf"
-PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-logo"
-PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
PREFERRED_PROVIDER_gpsd = "fso-gpsd"
-PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr"
-PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr"
-PREFERRED_PROVIDER_virtual/alsa-scenarios = "alsa-scenarii-shr"
-PREFERRED_PROVIDER_libfribidi = "fribidi"
-PREFERRED_PROVIDER_bluez-libs = "bluez4"
-PREFERRED_PROVIDER_bluez-utils = "bluez4"
-PREFERRED_PROVIDER_classpath = "classpath"
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
-PREFERRED_PROVIDER_virtual/gail = "gtk+"
-PREFERRED_PROVIDER_opkg = "opkg"
-PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial"
PREFERRED_PROVIDER_atd = "atd-over-fso"
-PREFERRED_PROVIDER_qt4x11 = "qt4-x11-free"
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-PREFERRED_PROVIDER_avahi = "avahi"
-PREFERRED_PROVIDER_gtk+ = "gtk+"
-PREFERRED_PROVIDER_libgpewidget = "libgpewidget"
-PREFERRED_PROVIDER_virtual/db = "db3"
-PREFERRED_PROVIDER_virtual/db-native = "db3-native"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_opkg = "opkg"
PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb"
+PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
#############################################################################
# PREFERRED VERSIONS
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index d82be5d2b5..d9b00f41a8 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -12,7 +12,8 @@ DISTRO_TYPE = "alpha"
TARGET_ARCH ?= "armeb"
ARM_INSTRUCTION_SET = "arm"
TARGET_OS = "linux-gnueabi"
-IPKG_VARIANT ?= "opkg-nogpg-nocurl"
+IPKG_VARIANT ?= "opkg-nogpg-nocurl-slugos"
+PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl-slugos"
IMAGE_INITSCRIPTS ?= "initscripts-slugos"
require conf/distro/include/slugos.inc
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-02 09:55:16 +0000