summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/handheld-common.conf6
-rw-r--r--packages/meta/meta-sdk.bb4
-rw-r--r--packages/pcmcia-cs/pcmcia-cs_3.2.8.bb3
-rw-r--r--packages/pcmciautils/pcmciautils_010.bb1
4 files changed, 6 insertions, 8 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/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index b71a2d44d8..1b009bb5a8 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -5,7 +5,7 @@ DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native \
libidl libsvg-cairo sed-native \
meta-gpe gstreamer\
opie-mail"
-PR = "r8"
+PR = "r9"
PACKAGES = ""
@@ -184,7 +184,7 @@ EOF
mkdir -p ${SDK_DEPLOY}
cd ${SDK_OUTPUT}
- fakeroot tar cfj ${SDK_DEPLOY}/oe-sdk-$(date +"%Y%m%d%H%M%S").tar.bz2 .
+ fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-oe-sdk-${DATE}.tar.bz2 .
}
do_populate_sdk[nostamp] = 1
diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 2f4b48d9c9..31d90f6377 100644
--- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -1,10 +1,9 @@
DESCRIPTION = "Utilities and system configuration files for the Linux PCMCIA card services"
SECTION = "base"
PRIORITY = "required"
-PROVIDES = "virtual/pcmcia-manager"
LICENSE = "GPL"
DEPENDS = "virtual/kernel"
-PR = "r24"
+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}"