From 3b7ecf18caaeaebd94c024a48dd923b429d6946e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 25 Feb 2011 17:58:19 +0000 Subject: conf/machine: Use linux-libc-headers instead of linux-libc-headers-yocto Signed-off-by: Richard Purdie --- meta/conf/machine/beagleboard.conf | 2 +- meta/conf/machine/include/qemu.inc | 2 +- meta/conf/machine/mpc8315e-rdb.conf | 2 +- 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 " SERIAL_CONSOLE = "115200 ttyO2" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" +#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" KERNEL_IMAGETYPE = "uImage" 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 = "" # Use a common kernel recipe for all QEMU machines PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" +#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 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" MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" +#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" UBOOT_ENTRYPOINT = "0x00000000" 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" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" +#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" SERIAL_CONSOLE = "115200 ttyS0" -- cgit 1.2.3-korg