summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-08-08 23:26:57 (GMT)
committerDarren Hart <dvhart@linux.intel.com>2011-08-11 19:57:50 (GMT)
commit907c859f84237b30ed568aaad036f898809ece2b (patch)
treebfa6d8249343f70b07d7c5f074538e8fdd7dc69e
parent90d7762bb322a3357c6ca90a6055dbc092cba603 (diff)
downloadmeta-intel-907c859f84237b30ed568aaad036f898809ece2b.tar.gz
allow override of kernel provider
Allow users or layers to override PREFERRED_PROVIDER_virtual/kernel. This is required to use the linux-yocto-rt kernel, for example. Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r--meta-crownbay/conf/machine/crownbay-noemgd.conf2
-rw-r--r--meta-crownbay/conf/machine/crownbay.conf2
-rw-r--r--meta-emenlow/conf/machine/emenlow.conf2
-rw-r--r--meta-fishriver/conf/machine/fishriver.conf5
-rw-r--r--meta-fri2/conf/machine/fri2.conf4
-rw-r--r--meta-jasperforest/conf/machine/jasperforest.conf4
-rw-r--r--meta-sugarbay/conf/machine/sugarbay.conf2
7 files changed, 10 insertions, 11 deletions
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index 7b8a7f2..0219bd1 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
@@ -11,7 +11,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
11 11
12KERNEL_IMAGETYPE = "bzImage" 12KERNEL_IMAGETYPE = "bzImage"
13 13
14PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 14PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
15PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 15PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
16PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 16PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
17PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 17PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index fd53dbb..323c8c1 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -11,7 +11,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
11 11
12KERNEL_IMAGETYPE = "bzImage" 12KERNEL_IMAGETYPE = "bzImage"
13 13
14PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 14PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
15PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 15PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
16PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 16PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
17PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 17PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
index 21b314f..de6794e 100644
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ b/meta-emenlow/conf/machine/emenlow.conf
@@ -11,7 +11,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
11 11
12KERNEL_IMAGETYPE = "bzImage" 12KERNEL_IMAGETYPE = "bzImage"
13 13
14PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 14PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
15PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 15PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
16PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo" 16PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo"
17PREFERRED_PROVIDER_drm = "libdrm-poulsbo" 17PREFERRED_PROVIDER_drm = "libdrm-poulsbo"
diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index a44d896..70dcc2f 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -11,9 +11,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
11 11
12KERNEL_IMAGETYPE = "bzImage" 12KERNEL_IMAGETYPE = "bzImage"
13 13
14PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 14PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
15PREFERRED_VERSION_linux-yocto = "3.0+git%" 15PREFERRED_VERSION_linux-yocto ?= "3.0+git%"
16
17PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 16PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
18PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 17PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
19PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 18PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index 6b25a51..fea43a2 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -11,8 +11,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
11 11
12KERNEL_IMAGETYPE = "bzImage" 12KERNEL_IMAGETYPE = "bzImage"
13 13
14PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 14PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
15PREFERRED_VERSION_linux-yocto = "3.0+git%" 15PREFERRED_VERSION_linux-yocto ?= "3.0+git%"
16 16
17PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 17PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
18PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 18PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf
index 89626da..6c44fe5 100644
--- a/meta-jasperforest/conf/machine/jasperforest.conf
+++ b/meta-jasperforest/conf/machine/jasperforest.conf
@@ -11,8 +11,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
11 11
12KERNEL_IMAGETYPE = "bzImage" 12KERNEL_IMAGETYPE = "bzImage"
13 13
14PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 14PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
15PREFERRED_VERSION_linux-yocto = "3.0+git%" 15PREFERRED_VERSION_linux-yocto ?= "3.0+git%"
16PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 16PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
17 17
18PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 18PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index 0d1ab06..a6f6ddf 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -11,7 +11,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
11 11
12KERNEL_IMAGETYPE = "bzImage" 12KERNEL_IMAGETYPE = "bzImage"
13 13
14PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 14PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
15PREFERRED_VERSION_linux-yocto = "3.0+git%" 15PREFERRED_VERSION_linux-yocto = "3.0+git%"
16PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 16PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
17 17