summaryrefslogtreecommitdiff
path: root/conf/distro/angstrom-2007.1.conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro/angstrom-2007.1.conf')
-rw-r--r--conf/distro/angstrom-2007.1.conf25
1 files changed, 5 insertions, 20 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index e83ef90280..282b0532b9 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -12,10 +12,6 @@ DISTRO_REVISION = "46"
require conf/distro/include/sane-srcdates.inc
-#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
-
#Images built can have to modes:
# 'debug': empty rootpassword, strace and gdb included
# 'release' no root password, no strace and gdb by default
@@ -233,7 +229,7 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.5"
#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
require conf/distro/include/preferred-gpe-versions-2.8.inc
require conf/distro/include/preferred-e-versions.inc
-require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
+require conf/distro/include/preferred-xorg-versions.inc
# Virtuals:
@@ -261,7 +257,7 @@ 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 ?= "diet-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
@@ -298,20 +294,9 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
#Silence a warning during parsing
PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-
-
-#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff
-# c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad
-
-
-# add altboot to compatible models, will be replaced with angstrom-bootmanager
-#PREFERRED_VERSION_altboot = "1.0.8+1.0.9_pre1"
-#EXTRA_STUFF_append_c7x0 += "altboot"
-#EXTRA_STUFF_append_akita += "altboot"
-#EXTRA_STUFF_append_poodle += "altboot"
-#EXTRA_STUFF_append_tosa += "altboot"
-#EXTRA_STUFF_append_spitz += "altboot"
-
+#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
# do some task-base stuff here