summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-01-18 13:01:17 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-01-18 13:01:17 +0000
commit8c4e5169051889dac706b4f36407e62a717c966a (patch)
tree5566fbbd361fc0c00692896bbcf2bc12de61ed52 /meta/conf
parent9dbd684b5a39ffd0fcc0d24938600c104beb4f47 (diff)
downloadpoky-8c4e5169051889dac706b4f36407e62a717c966a.tar.gz
documentation.conf: merge with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3532 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/documentation.conf8
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 44a174a01b..6c71bc00c7 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -34,6 +34,11 @@ TARGET_CC_ARCH[doc] = "FIXME"
34TARGET_FPU[doc] = "Floating point option (mostly for FPU-less systems), can be 'soft' or empty \ 34TARGET_FPU[doc] = "Floating point option (mostly for FPU-less systems), can be 'soft' or empty \
35for hardware floating point instructions." 35for hardware floating point instructions."
36 36
37ASSUME_PROVIDED[doc] = "List of packages (recipes actually) which are assumed to be implicitly available.\
38 These packages won't be built by bitbake."
39ASSUME_SHLIBS[doc] = "List of shlib:package[_version] mappings. Useful for lib packages in ASSUME_PROVIDED,\
40 for which automatic shlib dependency tracking doesn't work."
41
37PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If you have \ 42PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If you have \
38machine dependant configuration options in your bitbake file add a \ 43machine dependant configuration options in your bitbake file add a \
39PACKAGE_ARCH = "${MACHINE_ARCH}" to the file.' 44PACKAGE_ARCH = "${MACHINE_ARCH}" to the file.'
@@ -98,6 +103,9 @@ PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slot
98 103
99SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1" 104SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
100 105
106FEED_URIS[doc] = "List of ipkg feed records to put into generated image."
107FEED_DEPLOYDIR_BASE_URI[doc] = "Allow to serve ipk deploy dir as an adhoc feed (bogofeed). Set to base URL of the dir as exported by HTTP. Set of adhoc feed configs will be generated in image."
108
101# insane bbclass 109# insane bbclass
102QA_LOG[doc] = "Enable logging of QA errors to log.qa_package. Default is not to log." 110QA_LOG[doc] = "Enable logging of QA errors to log.qa_package. Default is not to log."
103 111