diff options
author | Darren Hart <dvhart@linux.intel.com> | 2012-06-28 21:17:59 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-29 13:31:02 +0100 |
commit | 602808b78800b20cc526dc0c2a1b15b875d07b0d (patch) | |
tree | 32f5213ccdc8a3fdb9e05b6d35845978b62e67c9 | |
parent | 347424e558a8d6db1c82f3bb1dbbf7b7b574566b (diff) | |
download | poky-602808b78800b20cc526dc0c2a1b15b875d07b0d.tar.gz |
linux-libc-headers-yocto: Do not include linux-yocto
The only bit we seem to need from the linux-yocto include is the
SRCREV_FORMAT. If we define this explicitly, we can avoid including the
linux-yocto include.
This is desirable so that linux-yocto can require kernel and simplify
the PR update process of all the linux-yocto* recipes. Pulling in
kernel to the linux-libc-headers-yocto recipes causes build failures by
pulling in "update-modules-nativesdk".
(From meta-yocto rev: be73421c4c8f5ae119aa8c030cca2442087d5c22)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb b/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb index b4222f14bb..8ab4fb18d9 100644 --- a/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb +++ b/meta-yocto/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb | |||
@@ -1,5 +1,4 @@ | |||
1 | require recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 1 | require recipes-kernel/linux-libc-headers/linux-libc-headers.inc |
2 | include recipes-kernel/linux/linux-yocto.inc | ||
3 | 2 | ||
4 | B = "${S}" | 3 | B = "${S}" |
5 | 4 | ||
@@ -13,6 +12,8 @@ SRCREV = "a1cdb60720c452c3965eaec3ec2cd10f06261cc5" | |||
13 | PV = "3.4+git-${SRCPV}" | 12 | PV = "3.4+git-${SRCPV}" |
14 | PR = "r6" | 13 | PR = "r6" |
15 | 14 | ||
15 | SRCREV_FORMAT ?= "meta_machine" | ||
16 | |||
16 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" |
17 | 18 | ||
18 | # force this to empty to prevent installation failures, we aren't | 19 | # force this to empty to prevent installation failures, we aren't |