diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-25 17:58:19 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-25 22:43:33 +0000 |
| commit | e26e8ea364fdceb7a5829ea91bde782ba4626023 (patch) | |
| tree | 13e955d69d1ea3b4bbbbb49f1b76c69395d020e9 /meta/conf | |
| parent | 6ec769fd308b14196310c2305c69debe5215cd9c (diff) | |
| download | poky-e26e8ea364fdceb7a5829ea91bde782ba4626023.tar.gz | |
conf/machine: Use linux-libc-headers instead of linux-libc-headers-yocto
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/machine/beagleboard.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/qemu.inc | 2 | ||||
| -rw-r--r-- | meta/conf/machine/mpc8315e-rdb.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/routerstationpro.conf | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/conf/machine/beagleboard.conf b/meta/conf/machine/beagleboard.conf index 41351e7bf4..b1f73504bf 100644 --- a/meta/conf/machine/beagleboard.conf +++ b/meta/conf/machine/beagleboard.conf | |||
| @@ -25,7 +25,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp " | |||
| 25 | SERIAL_CONSOLE = "115200 ttyO2" | 25 | SERIAL_CONSOLE = "115200 ttyO2" |
| 26 | 26 | ||
| 27 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 27 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 28 | PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" | 28 | #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" |
| 29 | 29 | ||
| 30 | KERNEL_IMAGETYPE = "uImage" | 30 | KERNEL_IMAGETYPE = "uImage" |
| 31 | 31 | ||
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 225906b471..61281bf516 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc | |||
| @@ -16,6 +16,6 @@ RDEPENDS_kernel-base = "" | |||
| 16 | 16 | ||
| 17 | # Use a common kernel recipe for all QEMU machines | 17 | # Use a common kernel recipe for all QEMU machines |
| 18 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 18 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 19 | PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" | 19 | #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" |
| 20 | 20 | ||
| 21 | EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" | 21 | EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" |
diff --git a/meta/conf/machine/mpc8315e-rdb.conf b/meta/conf/machine/mpc8315e-rdb.conf index 578751c57f..34b75bbc8a 100644 --- a/meta/conf/machine/mpc8315e-rdb.conf +++ b/meta/conf/machine/mpc8315e-rdb.conf | |||
| @@ -13,7 +13,7 @@ SERIAL_CONSOLE = "115200 ttyS0" | |||
| 13 | MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" | 13 | MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" |
| 14 | 14 | ||
| 15 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" | 15 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" |
| 16 | PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" | 16 | #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" |
| 17 | 17 | ||
| 18 | UBOOT_ENTRYPOINT = "0x00000000" | 18 | UBOOT_ENTRYPOINT = "0x00000000" |
| 19 | 19 | ||
diff --git a/meta/conf/machine/routerstationpro.conf b/meta/conf/machine/routerstationpro.conf index 9e5036d86c..d464842134 100644 --- a/meta/conf/machine/routerstationpro.conf +++ b/meta/conf/machine/routerstationpro.conf | |||
| @@ -13,7 +13,7 @@ KERNEL_IMAGETYPE = "vmlinux" | |||
| 13 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" | 13 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" |
| 14 | 14 | ||
| 15 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" | 15 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" |
| 16 | PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" | 16 | #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" |
| 17 | 17 | ||
| 18 | SERIAL_CONSOLE = "115200 ttyS0" | 18 | SERIAL_CONSOLE = "115200 ttyS0" |
| 19 | 19 | ||