diff options
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-dev.bb | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb index 5e097203e2..9b49eee876 100644 --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -11,37 +11,30 @@ inherit kernel require recipes-kernel/linux/linux-yocto.inc -USE_MACHINE_AUTOREV ?= "1" -USE_META_AUTOREV ?= "1" - # provide this .inc to set specific revisions include recipes-kernel/linux/linux-yocto-dev-revisions.inc +# Skip processing of this recipe if it is not explicitly specified as the +# PREFERRED_PROVIDER for virtual/kernel. This avoids network access required +# by the use of AUTOREV SRCREVs, which are the default for this recipe. +python () { + if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-yocto-dev": + raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-dev to enable it") +} + KBRANCH = "standard/base" KBRANCH_DEFAULT = "${KBRANCH}" KMETA = "meta" -SRC_URI = "git://git.pokylinux.org/linux-yocto-dev.git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta" +SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" # Set default SRCREVs. Both the machine and meta SRCREVs are statically set # to the korg v3.7 tag, and hence prevent network access during parsing. If # linux-yocto-dev is the preferred provider, they will be overridden to # AUTOREV in following anonymous python routine and resolved when the # variables are finalized. -SRCREV_machine ?= "29594404d7fe73cd80eaa4ee8c43dcc53970c60e" -SRCREV_meta ?= "29594404d7fe73cd80eaa4ee8c43dcc53970c60e" - -python () { - if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-yocto-dev": - raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-dev to enable it") - else: - # if the revisions have been changed from the defaults above we leave them - # alone. But if the defaults are left, we change to AUTOREV. - if d.getVar("USE_MACHINE_AUTOREV", True) == "1": - d.setVar("SRCREV_machine", "${AUTOREV}") - if d.getVar("USE_META_AUTOREV", True) == "1": - d.setVar("SRCREV_meta", "${AUTOREV}") -} +SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' +SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' LINUX_VERSION ?= "3.14+" LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" |