summaryrefslogtreecommitdiff
path: root/conf/distro/angstrom-2007.1.conf
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-08-07 10:46:54 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-08-07 10:46:54 +0000
commit23837f3256a8230816c7c9911a84d0f566c958a9 (patch)
tree9aa28f8e8f72a40a1996d64f0a4b9170a792306b /conf/distro/angstrom-2007.1.conf
parent41745b4e33dba5b1b263ce56434e47c55d262fc0 (diff)
parent5593d02ac796199f87ee5a29ebc9ba2183751361 (diff)
merge of '3bc048bb553b64eaf0567c44a7b375930a42b5af'
and '64cb3a9bf1c0275166bc2bd9550ea0eec67a60b6'
Diffstat (limited to 'conf/distro/angstrom-2007.1.conf')
-rw-r--r--conf/distro/angstrom-2007.1.conf21
1 files changed, 3 insertions, 18 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 0ef38f2f86..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
@@ -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