diff options
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/preferred-slugos-versions.inc | 3 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-toolchain.inc | 8 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 6 |
5 files changed, 12 insertions, 9 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 992d6566a3..7c70c84552 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -21,7 +21,7 @@ # stable/2009 branch #DISTRO_VERSION = "2009.X" -DISTRO_VERSION = "2010.4-test-${DATE}" +DISTRO_VERSION = "2010.7-test-${DATE}" DISTRO_REVISION = "3" DISTRO_PR = ".5" diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index c7683b67c3..84b138146b 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -83,3 +83,6 @@ PREFERRED_VERSION_udev ?= "118" # latest tcl recipe has a bug that overwites regex.h; use the old tcl #PREFERRED_VERSION_tcl ?= "8.4.19" + +# We need the bluez4 version of the libs, which has default_precedence = -1 +PREFERRED_VERSION_bluez-libs ?= "4.42" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 1b29537056..92a869aa27 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -2,4 +2,4 @@ # only SRCREVs included in more recipes should be here, otherwise put sane SRCREV to recipe directly OPKG_SRCREV ?= "536" -EFL_SRCREV ?= "49660" +EFL_SRCREV ?= "49761" diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index 1b77f7573b..f61d218fe3 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -141,7 +141,7 @@ ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0" #qemu has taken a dislike to armeb as well ENABLE_BINARY_LOCALE_GENERATION_armeb = "0" def detect_arm_abi (d): - import bb + import bb if bb.data.getVar('DISTRO_FEATURES',d) is None: if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]: return "oabi" @@ -159,8 +159,8 @@ def compute_os_portion_of_target_triplet (d): armv5te iwmmxt armv7a armv7 armv5teb armv4t" ppc_spe_supporting_arches = "ppce500v2 ppce500" gnu_suffix = "" - if bb.data.getVar('LIBC', d, 1) == "uclibc": - libc_suffix = "uclibc" + if bb.data.getVar('LIBC', d, 1) == "uclibc": + libc_suffix = "uclibc" else: libc_suffix = "" @@ -170,7 +170,7 @@ def compute_os_portion_of_target_triplet (d): else: os_suffix = "uclinux" else: - os_suffix = "linux" + os_suffix = "linux" bparch = bb.data.getVar('BASE_PACKAGE_ARCH', d,1) if bb.data.getVar('DISTRO_FEATURES',d,1) is not None and \ diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 00a10bf20b..5acf90f97f 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -165,13 +165,13 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" PREFERRED_PROVIDER_avahi ?= "avahi" PREFERRED_PROVIDER_ifupdown ?= "ifupdown" PREFERRED_PROVIDER_gconf ?= "gconf" -PREFERRED_PROVIDER_libqte2 ?= "qte" +PREFERRED_PROVIDER_virtual/libqte2 ?= "qte" 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-dbus = "bluez4" +PREFERRED_PROVIDER_bluez-libs = "bluez-libs" PREFERRED_PROVIDER_bluez-utils = "bluez4" # Include any package preferred versions and srcrevs: |