diff options
author | Koen Kooi <koen@openembedded.org> | 2007-08-07 08:36:22 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2007-08-07 08:36:22 +0000 |
commit | 677a59895b1307962929db946c263e14d4a6b040 (patch) | |
tree | 40fc04f50be601004a77ed4f3d8895c90ca8e9d4 /conf | |
parent | 63790e079e25031d8632d17cc3aaea701b64bb77 (diff) |
angstrom: move include so it can override more parts
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/angstrom-2007.1.conf | 21 |
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 |