diff options
author | Nathan Rossi <nathan.rossi@xilinx.com> | 2014-05-21 16:42:43 +1000 |
---|---|---|
committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2014-05-21 16:42:43 +1000 |
commit | 6852758f9adc41c4ce9985adacfdb4f36e9a65db (patch) | |
tree | f59414e83274e66c56fc7001fc0daab6218833a9 | |
parent | 07a23482e5526c7037738a6665dcaadbe08ac064 (diff) | |
download | meta-xilinx-6852758f9adc41c4ce9985adacfdb4f36e9a65db.tar.gz |
linux-xlnx-dev: Update recipe
* Update default SRCREV
* Update version
* Clean up comments
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-rw-r--r-- | recipes-kernel/linux/linux-xlnx-dev.bb | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/recipes-kernel/linux/linux-xlnx-dev.bb b/recipes-kernel/linux/linux-xlnx-dev.bb index b1800e9c..89b26409 100644 --- a/recipes-kernel/linux/linux-xlnx-dev.bb +++ b/recipes-kernel/linux/linux-xlnx-dev.bb | |||
@@ -3,33 +3,13 @@ | |||
3 | # | 3 | # |
4 | # To enable this recipe, set PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" | 4 | # To enable this recipe, set PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" |
5 | 5 | ||
6 | # These variables should reflect the linux-xlnx SRCREV and Linux version of | 6 | KBRANCH = "master-next" |
7 | # latest upstream linux release merge. If these are out of date, please email | 7 | KBRANCH_DEFAULT = "${KBRANCH}" |
8 | # meta-xilinx@yoctoproject.org to have it corrected. The linux-xlnx-dev build | ||
9 | # should still function correctly with out of date values, but the naming will | ||
10 | # be missleading. | ||
11 | LINUX_XLNX_NEARTOP_SRCREV = "669ee45083e22963d7fb7b774c5d7893ed35de2e" | ||
12 | LINUX_XLNX_NEARTOP_VERSION = "3.10" | ||
13 | |||
14 | # LINUX_VERSION is set to select the defconfig and dts we wish to use within | ||
15 | # meta-xilinx. If the build fails it may be because this defconfig is out | ||
16 | # of date. If that happens or if the developer desires a non meta-xilinx config | ||
17 | # they should add the defconfig and name it appropriately so the recipes find | ||
18 | # the file. | ||
19 | LINUX_VERSION ?= "3.8" | ||
20 | |||
21 | LINUX_VERSION_EXTENSION ?= "-xilinx-dev" | ||
22 | |||
23 | KBRANCH ?= "master-next" | ||
24 | KBRANCH_DEFAULT = "master" | ||
25 | 8 | ||
26 | include linux-xlnx.inc | 9 | include linux-xlnx.inc |
27 | 10 | ||
28 | # Set default SRCREVs. SRCREVs statically set to prevent network access during | 11 | # Use the SRCREV for the last tagged revision of linux-xlnx. |
29 | # parsing. If linux-xlnx-dev is the preferred provider, they will be overridden | 12 | SRCREV = "f27f400f43062b28d2b6f0977e50492b851d7464" |
30 | # to AUTOREV in the anonymous python routine and resolved when the variables | ||
31 | # are finalized. | ||
32 | SRCREV="${LINUX_XLNX_NEARTOP_SRCREV}" | ||
33 | 13 | ||
34 | python () { | 14 | python () { |
35 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-xlnx-dev": | 15 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-xlnx-dev": |
@@ -38,5 +18,6 @@ python () { | |||
38 | d.setVar("SRCREV", "${AUTOREV}") | 18 | d.setVar("SRCREV", "${AUTOREV}") |
39 | } | 19 | } |
40 | 20 | ||
41 | PR = "r0" | 21 | LINUX_VERSION ?= "3.14+" |
42 | PV = "${LINUX_XLNX_NEARTOP_VERSION}+${LINUX_VERSION_EXTENSION}+git${SRCREV}" | 22 | LINUX_VERSION_EXTENSION = "-xilinx-dev" |
23 | PV = "${LINUX_VERSION}${LINUX_VERSION_EXTENSION}+git${SRCPV}" | ||