diff options
| author | Matthias Hentges <oe@hentges.net> | 2007-12-22 15:02:05 +0000 |
|---|---|---|
| committer | Matthias Hentges <oe@hentges.net> | 2007-12-22 15:02:05 +0000 |
| commit | f2c4f3397c04101dc3877cd644f8747d93a32eb8 (patch) | |
| tree | 5deeee72b1dbc33d9d9e82564cdffcb3f5972339 /conf | |
| parent | 7f3a107ffad1c762c0f9667439f0b28f48b2ffc8 (diff) | |
| parent | 46fde04ffa4861599bd6a17702d1d36ffeee14b4 (diff) | |
merge of '700ee409f8ee36c40f4c50e4ce581e1d11fd5fa0'
and 'b9d02215b2fc8567ca9440f96665d1645ec21d56'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/documentation.conf | 3 | ||||
| -rw-r--r-- | conf/machine/h2200.conf | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/conf/documentation.conf b/conf/documentation.conf index 96a292b9d7..6c71bc00c7 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -103,6 +103,9 @@ PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slot SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1" +FEED_URIS[doc] = "List of ipkg feed records to put into generated image." +FEED_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." + # insane bbclass QA_LOG[doc] = "Enable logging of QA errors to log.qa_package. Default is not to log." diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 75ffc0d423..b54859b913 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -26,7 +26,8 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" -MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " h2200-bootloader " +MACHINE_EXTRA_RDEPENDS = " udev-hostap-cs-vcc-workaround " MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-snd-h2200-audio \ kernel-module-i2c-pxa \ |