summaryrefslogtreecommitdiffstats
path: root/meta
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:42:48 +0000
commit4a7a476785a9bdbd72fd9c32cf640e3c82a2f531 (patch)
treec9fd5c5c935f5257658d70a08ac1fd60f07ab370 /meta
parent0d2a301bca4eb9d43243f1a03c1cd1ab3f27f30a (diff)
downloadpoky-4a7a476785a9bdbd72fd9c32cf640e3c82a2f531.tar.gz
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. (From OE-Core rev: f6f289c13b9da9c2793d1fd30456216db8afad64) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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"
702SSTATE_DIR ?= "${TOPDIR}/sstate-cache" 702SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
703IMAGE_FSTYPES ?= "tar.gz" 703IMAGE_FSTYPES ?= "tar.gz"
704INITRAMFS_FSTYPES ?= "cpio.gz" 704INITRAMFS_FSTYPES ?= "cpio.gz"
705PCMCIA_MANAGER ?= "pcmciautils"
706DEFAULT_TASK_PROVIDER ?= "packagegroup-base" 705DEFAULT_TASK_PROVIDER ?= "packagegroup-base"
707MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" 706MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
708IMAGE_ROOTFS_SIZE ?= "65536" 707IMAGE_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"
4KERNEL_CONSOLE ?= "ttyS0" 4KERNEL_CONSOLE ?= "ttyS0"
5KEEPUIMAGE ??= "yes" 5KEEPUIMAGE ??= "yes"
6 6
7PCMCIA_MANAGER ?= "pcmciautils"
8
9IMAGE_LINGUAS ?= "en-us en-gb" 7IMAGE_LINGUAS ?= "en-us en-gb"
10LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB" 8LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
11ENABLE_BINARY_LOCALE_GENERATION ?= "1" 9ENABLE_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."
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 (currently, pcmciautils)."
113
114SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1" 112SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
115 113
116IPK_FEED_URIS[doc] = "List of ipkg feed records to put into generated image." 114IPK_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 @@
1PCMCIA_MANAGER = "pcmciautils"
2PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 1PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
3PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 2PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
4PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri" 3PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"