diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-09-15 01:00:45 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2006-09-15 01:00:45 +0000 |
| commit | e80c658fb39ca3f2532a0d45999e45b242e6b782 (patch) | |
| tree | 4dd1b8d06e75a11090ff87a183c2f1a900dccd19 /conf | |
| parent | 7d8b796c738831d3da213dd94b2c0e00b919bc6e (diff) | |
| parent | 478c0749f4b3acf972494510b13115d123916f92 (diff) | |
merge of '423d95142798353c0c747b9d7ffc72e03ddd60c0'
and 'a63e4a781a841ff8a30e02e98663e945da2f1c63'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 5 | ||||
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index e83f2b5667..02a072ca66 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -96,6 +96,11 @@ HOMEPAGE = "unknown" # Package dependencies and provides. +# Ensure that -dev packages recommend the corresponding -dev packages of their +# deps, and the same for -dbg. +DEPCHAIN_PRE = "" +DEPCHAIN_POST = "-dev -dbg" + DEPENDS = "" RDEPENDS = "" PROVIDES = "" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index fbce661a42..c618d6f134 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -103,7 +103,7 @@ PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-inte PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" #shouldn't that be uclibc-initial???? -PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" #use EABI toolchain PREFERRED_VERSION_gcc ?= "4.1.1" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index ba5687615d..89c01bbd6f 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -10,6 +10,7 @@ TARGET_VENDOR = "-angstrom" # Can be "glibc" and "uclibc" ANGSTROM_MODE ?= "glibc" +DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}" require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc #Use this variable in feeds and other parts that need a URI |