From d9bec7fce7e68c7d277276185cea9bfb50e7af1c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 4 Dec 2007 09:12:10 +0000 Subject: angstrom: Define some extra PREFERRED_PROVIDERs to ensure external-toolchain isn't touched --- conf/distro/angstrom-2007.1.conf | 2 ++ conf/distro/angstrom-2008.1.conf | 2 ++ 2 files changed, 4 insertions(+) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 67be27eae3..0e4285f633 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -148,6 +148,7 @@ require conf/distro/include/preferred-e-versions.inc # Virtuals: +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" 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" @@ -177,6 +178,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_esound ?= "pulseaudio" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 0159c7dd0b..bc03465bd5 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -103,6 +103,7 @@ require conf/distro/include/preferred-xorg-versions-X11R7.3.inc # Virtuals: +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" 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" @@ -132,6 +133,7 @@ PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" # Others: +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_esound ?= "pulseaudio" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" -- cgit v1.2.3 From 0f865d735495b470dedd86a82edcac38ababf603 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 4 Dec 2007 11:10:39 +0000 Subject: angstrom-2007-preferred-versions.inc : increase the Angstrom version of kismet to 2007-10-01 as it has a number of wanted improvements as detailed in #3387 no objections were raised on mailing list. --- conf/distro/include/angstrom-2007-preferred-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index e4b083dd86..72533c65e5 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -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" -- cgit v1.2.3