summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2007.1.conf8
-rw-r--r--conf/distro/include/angstrom.inc2
2 files changed, 4 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 3243c951dc..91708aba37 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -48,6 +48,7 @@ FEED_ARCH_tosa = "armv5te"
#i686 machines
FEED_ARCH_guinness = "i686"
+FEED_ARCH_progear = "i686"
FEED_URIS += " \
no-arch##${ANGSTROM_URI}/unstable/feed/all \
@@ -153,12 +154,12 @@ PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
-PREFERRED_VERSION_linux-libc-headers_guinness ?= "2.6.18"
+PREFERRED_VERSION_linux-libc-headers_i686 ?= "2.6.18"
PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99"
PREFERRED_VERSION_glibc ?= "2.5"
-PREFERRED_VERSION_glibc-intermediate_guinness ?= "2.4"
+PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
PREFERRED_VERSION_glibc-intermediate ?= "2.5"
# To use an EABI compatible version 3 series gcc, either uncomment
@@ -171,9 +172,6 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.5"
# Busybox <1.1.0 doesn't have EABI support
PREFERRED_VERSION_busybox = "1.2.1"
-PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
-PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
-
PREFERRED_VERSION_dbus ?= "1.0.1"
PREFERRED_VERSION_dbus-glib ?= "0.71"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 20f8be01c1..7f0546c271 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -49,4 +49,4 @@ DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
# We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
+DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci"