diff options
| author | Mike Westerhof <mwester@dls.net> | 2006-05-26 03:58:41 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-26 03:58:41 +0000 |
| commit | 1bdd82295819fdd8eda7a2a2dfa0f75b92eb1f40 (patch) | |
| tree | 6e09ee39a5fc0133a098dcf918ebb6c880b89034 /conf | |
| parent | 80816b62566e1b3175e00382c3076057bb6d46a1 (diff) | |
| parent | 89919672d543b3351b1d9a97f8af1584f0d65795 (diff) | |
merge of 8ac4847056fba1c5b2b9ba03a8b6cb16c799aa19
and b3548a7dc6d9be0b03545b677be4cdd71cbbb2a9
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 6 | ||||
| -rw-r--r-- | conf/documentation.conf | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 9d7c724c8f..5c1ed1296d 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -67,9 +67,9 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" #use EABI toolchain -PREFERRED_VERSION_gcc ?= "4.1.0" -PREFERRED_VERSION_gcc-cross ?= "4.1.0" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.0" +PREFERRED_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" PREFERRED_VERSION_binutils ?= "2.16.91.0.7" PREFERRED_VERSION_binutils-cross ?= "2.16.91.0.7" PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" diff --git a/conf/documentation.conf b/conf/documentation.conf index 20bcc53f5f..b072ac8c67 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -63,8 +63,9 @@ HOMEPAGE[doc] = "Homepage of the package e.g. http://www.project.net." GROUP_dependencies[doc] = "The keys in this group influence the dependency handling of BitBake \ and the resulting packages." DEPENDS[doc] = "Build time dependencies, things needed to build the package. @group dependencies" -RDEPENDS[doc] = "Run time dependencies, things needed for a given package to run. @group dependencies" -PROVIDES[doc] = "Names for additional dependencies that this package will provide. @group dependencies" +RDEPENDS[doc] = "Run time dependencies, things needed for a given package to run. This is used to populate the ipkg:Depends field. @group dependencies" +PROVIDES[doc] = "Names for additional build time dependencies that this package will provide. @group dependencies" +RPROVIDES[doc] = "Names for additional run time dependencies that this package will provide. This is used to populate the ipkg:Provides field. @group dependencies" # packaging @@ -98,4 +99,4 @@ SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the PALMTOP_USE_MULTITHREADED_QT[doc] = "Set to yes, if you want to build qt apps with CONFIG+=thread" COMPATIBLE_HOST[doc] = "A regular expression which matches the HOST_SYS names supported by the package/file. Failure to match will cause the file to be skipped by the parser." -COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser."
\ No newline at end of file +COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser." |