summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-01-23 16:24:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-25 12:35:49 +0000
commitf6f289c13b9da9c2793d1fd30456216db8afad64 (patch)
tree7807117459cb4fa5a5f8d2046712034464d202b1
parent784ca68fcca4ffb34390d55d9343570cfdf0305f (diff)
downloadopenembedded-core-f6f289c13b9da9c2793d1fd30456216db8afad64.tar.gz
openembedded-core-f6f289c13b9da9c2793d1fd30456216db8afad64.tar.bz2
openembedded-core-f6f289c13b9da9c2793d1fd30456216db8afad64.zip
meta: remove all mention of PCMCIA_MANAGER
Nothing appears to use this anymore, and it's been a very long time since there was anyone expressing an interest in the alternatives. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf1
-rw-r--r--meta/conf/distro/include/default-distrovars.inc2
-rw-r--r--meta/conf/documentation.conf2
-rw-r--r--meta/conf/machine/include/qemu.inc1
4 files changed, 0 insertions, 6 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b6ab5c3cb1..223c03fab7 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -702,7 +702,6 @@ DL_DIR ?= "${TOPDIR}/downloads"
SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
IMAGE_FSTYPES ?= "tar.gz"
INITRAMFS_FSTYPES ?= "cpio.gz"
-PCMCIA_MANAGER ?= "pcmciautils"
DEFAULT_TASK_PROVIDER ?= "packagegroup-base"
MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
IMAGE_ROOTFS_SIZE ?= "65536"
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index f07354771a..1169ca5b6f 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -4,8 +4,6 @@ OEINCLUDELOGS ?= "yes"
KERNEL_CONSOLE ?= "ttyS0"
KEEPUIMAGE ??= "yes"
-PCMCIA_MANAGER ?= "pcmciautils"
-
IMAGE_LINGUAS ?= "en-us en-gb"
LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
ENABLE_BINARY_LOCALE_GENERATION ?= "1"
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index e8a1811228..0e7c39550a 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -109,8 +109,6 @@ T[doc] = "Temporary directory within the WORKDIR."
GROUP_locale[doc] = "Locale generation of the GNU libc implementation"
ENABLE_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"
-PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slots (currently, pcmciautils)."
-
SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
IPK_FEED_URIS[doc] = "List of ipkg feed records to put into generated image."
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index de694bd954..f68bf32d16 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -1,4 +1,3 @@
-PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"