diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2011-08-09 16:20:40 -0700 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-08-18 22:20:52 -0700 |
| commit | e744900fa58d90bcccf7a1af1841863419ffcda3 (patch) | |
| tree | 1647fdda90a95a3c0f621a35c019c91d06a672bb /meta-yocto/conf/machine | |
| parent | 978cdd5cb5b445f1cf406296444cb57cd8aa526a (diff) | |
| download | poky-e744900fa58d90bcccf7a1af1841863419ffcda3.tar.gz | |
meta-yocto: allow for virtual/kernel override
Conditionally assign the PREFERRED_PROVIDER_virtual/kernel in the meta-yocto
machine configs to allow the user or other layers to override it. This is
required to use the linux-yocto-rt kernel, for example.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'meta-yocto/conf/machine')
| -rw-r--r-- | meta-yocto/conf/machine/mpc8315e-rdb.conf | 2 | ||||
| -rw-r--r-- | meta-yocto/conf/machine/routerstationpro.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-yocto/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf index 172deec68e..b30c8afef5 100644 --- a/meta-yocto/conf/machine/mpc8315e-rdb.conf +++ b/meta-yocto/conf/machine/mpc8315e-rdb.conf | |||
| @@ -11,7 +11,7 @@ SERIAL_CONSOLE = "115200 ttyS0" | |||
| 11 | 11 | ||
| 12 | MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" | 12 | MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" |
| 13 | 13 | ||
| 14 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" | 14 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 15 | #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" | 15 | #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" |
| 16 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" | 16 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" |
| 17 | XSERVER = "xserver-kdrive-fbdev" | 17 | XSERVER = "xserver-kdrive-fbdev" |
diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf index e6f89d848c..a0afd5d16a 100644 --- a/meta-yocto/conf/machine/routerstationpro.conf +++ b/meta-yocto/conf/machine/routerstationpro.conf | |||
| @@ -10,7 +10,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 \ | |||
| 10 | KERNEL_IMAGETYPE = "vmlinux" | 10 | KERNEL_IMAGETYPE = "vmlinux" |
| 11 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" | 11 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" |
| 12 | 12 | ||
| 13 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" | 13 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 14 | #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" | 14 | #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" |
| 15 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" | 15 | PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" |
| 16 | XSERVER = "xserver-kdrive-fbdev" | 16 | XSERVER = "xserver-kdrive-fbdev" |