diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-02-21 12:45:56 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-22 23:57:26 +0000 |
| commit | 57bab0ecca35a8dd13de8b25e4ee755d71f41250 (patch) | |
| tree | 16bee80befdc2bb62541a4c1f52a94769a8054cb /meta | |
| parent | 4656149d10677f02fdf55d0e74b98ec0fcf1a868 (diff) | |
| download | poky-57bab0ecca35a8dd13de8b25e4ee755d71f41250.tar.gz | |
linux-yocto: fix PV
For whatever reason, the creation of the 5.4 recipes missed the
PV that we've always had in linux-yocto. PV follows the LINUX_VERSION
variable and clearly indicates that we have git commits in our tree
above the -stable releases.
(From OE-Core rev: e597fe76a710cc6bb833ee50c235c5c565eb23fa)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index fc31dc869a..ab93f1bf55 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | |||
| @@ -24,7 +24,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" | |||
| 24 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" | 24 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" |
| 25 | DEPENDS += "openssl-native util-linux-native" | 25 | DEPENDS += "openssl-native util-linux-native" |
| 26 | 26 | ||
| 27 | PV = "5.4.15" | 27 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 28 | 28 | ||
| 29 | KMETA = "kernel-meta" | 29 | KMETA = "kernel-meta" |
| 30 | KCONF_BSP_AUDIT_LEVEL = "2" | 30 | KCONF_BSP_AUDIT_LEVEL = "2" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index cfecf986fb..097357d9c0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | |||
| @@ -19,7 +19,7 @@ SRCREV_machine_qemuarm ?= "3805e4f98313c4a4c64ffdb06b6401de8746fe45" | |||
| 19 | SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" | 19 | SRCREV_machine ?= "2358d789229f8d80ebe4b3e35d3819c4f0e00926" |
| 20 | SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" | 20 | SRCREV_meta ?= "c11911d4d1cf0d0b069dfd1922b41256f61442de" |
| 21 | 21 | ||
| 22 | PV = "5.4.15" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 23 | 23 | ||
| 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
| 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index aa17380d00..0b2a2305f1 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb | |||
| @@ -35,7 +35,7 @@ LINUX_VERSION ?= "5.4.20" | |||
| 35 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" | 35 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" |
| 36 | DEPENDS += "openssl-native util-linux-native" | 36 | DEPENDS += "openssl-native util-linux-native" |
| 37 | 37 | ||
| 38 | PV = "5.4.15" | 38 | PV = "${LINUX_VERSION}+git${SRCPV}" |
| 39 | 39 | ||
| 40 | KMETA = "kernel-meta" | 40 | KMETA = "kernel-meta" |
| 41 | KCONF_BSP_AUDIT_LEVEL = "2" | 41 | KCONF_BSP_AUDIT_LEVEL = "2" |