summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/conf/documentation.conf2
-rw-r--r--meta/recipes-bsp/pcmciautils/pcmciautils.inc1
-rw-r--r--meta/recipes-core/udev/udev/network.sh3
4 files changed, 2 insertions, 6 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1ca885fe3f..744f4dfda8 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -689,7 +689,7 @@ DL_DIR ?= "${TOPDIR}/downloads"
689SSTATE_DIR ?= "${TOPDIR}/sstate-cache" 689SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
690IMAGE_FSTYPES ?= "tar.gz" 690IMAGE_FSTYPES ?= "tar.gz"
691INITRAMFS_FSTYPES ?= "cpio.gz" 691INITRAMFS_FSTYPES ?= "cpio.gz"
692PCMCIA_MANAGER ?= "pcmcia-cs" 692PCMCIA_MANAGER ?= "pcmciautils"
693DEFAULT_TASK_PROVIDER ?= "task-base" 693DEFAULT_TASK_PROVIDER ?= "task-base"
694MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" 694MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
695IMAGE_ROOTFS_SIZE ?= "65536" 695IMAGE_ROOTFS_SIZE ?= "65536"
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 24b307b862..e8a1811228 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -109,7 +109,7 @@ T[doc] = "Temporary directory within the WORKDIR."
109GROUP_locale[doc] = "Locale generation of the GNU libc implementation" 109GROUP_locale[doc] = "Locale generation of the GNU libc implementation"
110ENABLE_BINARY_LOCALE_GENERATION[doc] = "Enable the use of qemu to generate locale information during build time on the host instead of runtime on the target. If you have trouble with qemu-native you should make this an empty var. @group locale" 110ENABLE_BINARY_LOCALE_GENERATION[doc] = "Enable the use of qemu to generate locale information during build time on the host instead of runtime on the target. If you have trouble with qemu-native you should make this an empty var. @group locale"
111 111
112PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slots (usually pcmcia-cs or pcmciautils)." 112PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slots (currently, pcmciautils)."
113 113
114SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1" 114SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
115 115
diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
index c0c1d0cea4..fa35daf46d 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7 7
8DEPENDS = "sysfsutils flex-native" 8DEPENDS = "sysfsutils flex-native"
9RDEPENDS_${PN} = "udev module-init-tools" 9RDEPENDS_${PN} = "udev module-init-tools"
10RCONFLICTS_${PN} += "pcmcia-cs"
11 10
12SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" 11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
13 12
diff --git a/meta/recipes-core/udev/udev/network.sh b/meta/recipes-core/udev/udev/network.sh
index 5016328df4..bccd422dbf 100644
--- a/meta/recipes-core/udev/udev/network.sh
+++ b/meta/recipes-core/udev/udev/network.sh
@@ -1,8 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2 2
3# Do not run when pcmcia-cs is installed
4test -x /sbin/cardctl && exit 0
5
6# We get two "add" events for hostap cards due to wifi0 3# We get two "add" events for hostap cards due to wifi0
7echo "$INTERFACE" | grep -q wifi && exit 0 4echo "$INTERFACE" | grep -q wifi && exit 0
8 5