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 | |
| 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.
| -rw-r--r-- | conf/machine/handheld-common.conf | 6 | ||||
| -rw-r--r-- | packages/pcmcia-cs/pcmcia-cs_3.2.8.bb | 4 | ||||
| -rw-r--r-- | packages/pcmciautils/pcmciautils_010.bb | 1 |
3 files changed, 4 insertions, 7 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" diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb index 285c263b46..31d90f6377 100644 --- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb +++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb @@ -1,11 +1,9 @@ DESCRIPTION = "Utilities and system configuration files for the Linux PCMCIA card services" SECTION = "base" PRIORITY = "required" -PROVIDES = "virtual/pcmcia-manager" -RPROVIDES = "virtual/pcmcia-manager" LICENSE = "GPL" DEPENDS = "virtual/kernel" -PR = "r25" +PR = "r26" SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \ file://busybox.patch;patch=1 \ diff --git a/packages/pcmciautils/pcmciautils_010.bb b/packages/pcmciautils/pcmciautils_010.bb index f405eea809..8045a0e442 100644 --- a/packages/pcmciautils/pcmciautils_010.bb +++ b/packages/pcmciautils/pcmciautils_010.bb @@ -4,7 +4,6 @@ RDEPENDS = "udev module-init-tools" HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" SECTION = "kernel/userland" PRIORITY = "optional" -PROVIDES = "virtual/pcmcia-manager" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" S = "${WORKDIR}/pcmciautils-${PV}" |