diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2006-03-20 09:39:17 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-20 09:39:17 +0000 |
| commit | 86629673742ddb672f54f224a85d668aee7955c7 (patch) | |
| tree | e68ce7a0ac3f8f5128a392e5f8871701f665f38e /conf | |
| parent | 969cbaecfd63d9c57842b91f18585d4bbcabf401 (diff) | |
| parent | 3edbcedcf193ba5058fd0bbb1c82c8dfeb79813c (diff) | |
merge of 0cd761de98072480e6e68e383c48e38bedd2f557
and 52ebc3713b5433a8127e7b025d8d2f4f085214e8
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 1 | ||||
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 18 | ||||
| -rw-r--r-- | conf/sanity.conf | 8 |
3 files changed, 27 insertions, 0 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index a2ba5e6382..cd435a9cad 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -394,3 +394,4 @@ include conf/target/${TARGET_SYS}.conf include conf/machine/${MACHINE}.conf include conf/distro/${DISTRO}.conf include conf/documentation.conf +require conf/sanity.conf diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 9c9f751bff..b0147aad55 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -63,3 +63,21 @@ PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e" PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e" PREFERRED_VERSION_dbus = "0.61" + +#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff + +#### GPE section ### + +#Install libgtkinput in devices without a keyboard +GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" +GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" +GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" +GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" +#As soon as a kill switch is in place we can add it to devices with a keyboard +#GPE_EXTRA_INSTALL_append_c7x0 = " libgtkinput" +#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" +#GPE_EXTRA_INSTALL_append_akita = " libgtkinput" +#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" +#GPE_EXTRA_INSTALL_append_borzoi = " libgtkinput" + + diff --git a/conf/sanity.conf b/conf/sanity.conf new file mode 100644 index 0000000000..df2ec3e82a --- /dev/null +++ b/conf/sanity.conf @@ -0,0 +1,8 @@ +# Sanity checks for common user misconfigurations +# +# See sanity.bbclass +# +# Expert users can confirm their sanity with "touch conf/sanity.conf" + +INHERIT += "sanity" + |