diff options
author | Rene Wagner <rw@handhelds.org> | 2005-12-19 14:46:10 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-12-19 14:46:10 +0000 |
commit | e32c616ea90fa0314e5f35c4aaa350eb0ccc4816 (patch) | |
tree | 55d1e6cbaebf222ad62a8b3900058a0b7bc68e54 /conf | |
parent | 6099798ad0f7384f0d6d2442373c7e20092b6fe3 (diff) |
handheld-common.conf, pcmcia-cs, pcmciautils: revert virtual/pcmcia-manager changes. introduce PCMCIA_MANAGER. fixes Bug #541.
- Having packages that cannot be used interchangeably provide the same
virtual package leads to all sorts of breakage on the build system
and runtime dependencies levels.
- If you want to use pcmciautils instead of pcmcia-cs for your machine now,
add PCMCIA_MANAGER = "pcmciautils" in your MACHINE .conf before including
handheld-common.conf.
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/handheld-common.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf index 8aad984243..40fd9780f9 100644 --- a/conf/machine/handheld-common.conf +++ b/conf/machine/handheld-common.conf @@ -16,11 +16,11 @@ irda irlan irnet irport irtty ircomm-tty \ input uinput \ " -PREFERRED_PROVIDER_virtual/pcmcia-manager ?= "pcmcia-cs" +PCMCIA_MANAGER ?= "pcmcia-cs" # Configuration bits for "generic handheld" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/pcmcia-manager apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts" -BOOTSTRAP_EXTRA_RDEPENDS += "virtual/pcmcia-manager apm apmd network-suspend-scripts" +BOOTSTRAP_EXTRA_DEPENDS += "${PCMCIA_MANAGER} apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts" +BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts" BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" INHERIT += "linux_modules" |