diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2011-06-14 16:47:20 -0400 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2011-06-14 20:05:57 -0700 |
commit | d207c9531effb40d75d4552f589cad60bf8a84e2 (patch) | |
tree | 6561aa43ccb0a5c32b57f69c77a7f6780cf48fc3 /meta-sugarbay | |
parent | 129773b573a4a2cf1dff2b0f128a8948c069aca8 (diff) | |
download | meta-intel-d207c9531effb40d75d4552f589cad60bf8a84e2.tar.gz |
meta-intel/linux-yocto: update to match the renamed linux-yocto recipes
The linux-yocto recipes have been renamed to include explicit
version numbers. The meta-intel bbappends must be updated to
follow the new naming convention.
As a consequence of the recipe renames any SRCREV specificiations
that were part of a machine.conf have been moved to the corresponding
bbappend file. This allows the 2.6.34 and 2.6.37 SRCREVs to co-exist.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Minor whitespace cleanup.
Remove inadvertant? linux-libc-headers provider change.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'meta-sugarbay')
-rw-r--r-- | meta-sugarbay/conf/machine/sugarbay.conf | 3 | ||||
-rw-r--r-- | meta-sugarbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend | 7 | ||||
-rw-r--r-- | meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend | 5 |
3 files changed, 7 insertions, 8 deletions
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf index cca50a97..ebc6dbcc 100644 --- a/meta-sugarbay/conf/machine/sugarbay.conf +++ b/meta-sugarbay/conf/machine/sugarbay.conf | |||
@@ -44,6 +44,3 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "grub" | |||
44 | TARGET_CC_ARCH = "-m64" | 44 | TARGET_CC_ARCH = "-m64" |
45 | 45 | ||
46 | PREFERRED_VERSION_grub ?= "1.98" | 46 | PREFERRED_VERSION_grub ?= "1.98" |
47 | |||
48 | SRCREV_machine_pn-linux-yocto_sugarbay ?= "5021040d4d881cd0f4a741c6342a290a3af7d021" | ||
49 | SRCREV_meta_pn-linux-yocto_sugarbay ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" | ||
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend new file mode 100644 index 00000000..0d5556c6 --- /dev/null +++ b/meta-sugarbay/recipes-kernel/linux/linux-yocto_2.6.37.bbappend | |||
@@ -0,0 +1,7 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_sugarbay = "sugarbay" | ||
4 | KMACHINE_sugarbay = "yocto/standard/common-pc-64/sugarbay" | ||
5 | |||
6 | SRCREV_machine_pn-linux-yocto_sugarbay ?= "5021040d4d881cd0f4a741c6342a290a3af7d021" | ||
7 | SRCREV_meta_pn-linux-yocto_sugarbay ?= "f1dc3722d45cdcc92c84ebfecf4ce616d2efed26" | ||
diff --git a/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend b/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend deleted file mode 100644 index 72d00ec4..00000000 --- a/meta-sugarbay/recipes-kernel/linux/linux-yocto_git.bbappend +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | COMPATIBLE_MACHINE_sugarbay = "sugarbay" | ||
4 | KMACHINE_sugarbay = "yocto/standard/common-pc-64/sugarbay" | ||
5 | |||