diff options
-rw-r--r-- | meta/conf/machine/include/qemu.inc | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 502e24f770..d762d010c4 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/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb index 0515233958..762b6a8d24 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb | |||
@@ -6,14 +6,12 @@ B = "${S}" | |||
6 | INHIBIT_DEFAULT_DEPS = "1" | 6 | INHIBIT_DEFAULT_DEPS = "1" |
7 | DEPENDS += "unifdef-native" | 7 | DEPENDS += "unifdef-native" |
8 | PROVIDES = "linux-libc-headers" | 8 | PROVIDES = "linux-libc-headers" |
9 | PV = "2.6.34+git-${SRCPV}" | 9 | PV = "2.6.37+git-${SRCPV}" |
10 | PR = "r1" | 10 | PR = "r2" |
11 | |||
12 | SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;fullclone=1" | ||
13 | 11 | ||
14 | SRCREV_FORMAT = "meta_machine" | 12 | SRCREV_FORMAT = "meta_machine" |
15 | SRC_URI = "git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ | 13 | SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;fullclone=1;branch=${KBRANCH};name=machine \ |
16 | git://git.pokylinux.org/linux-2.6-windriver.git;protocol=git;noclone=1;branch=wrs_meta;name=meta" | 14 | git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;noclone=1;branch=meta;name=meta" |
17 | 15 | ||
18 | set_arch() { | 16 | set_arch() { |
19 | case ${TARGET_ARCH} in | 17 | case ${TARGET_ARCH} in |