diff options
author | Leonardo Sandoval <leonardo.sandoval.gonzalez at linux.intel.com> | 2017-06-17 09:49:09 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-04 17:38:09 +0100 |
commit | 38613fdacf8e0699229811c870f3f7bf317ef32a (patch) | |
tree | 9f9ea71ed09df2de8d264eb5011bf5412ef9fd56 /scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel | |
parent | 767caa9cf34191bdcc40d0887ce04a3b141407d3 (diff) | |
download | poky-38613fdacf8e0699229811c870f3f7bf317ef32a.tar.gz |
recipes-kernel: Skip kernel version check on kernel templates
Currently, SRCREV is set to AUTOREV, causing mismatch between PV and the kernel
version shown in the makefile (see below to see the bitbake log). The solution
is to comment the lines which defaults SRCREV to AUTOREV, leaving the previous
comment to replace the SRCREVs for real ones once kernel changes are done.
ERROR: linux-yocto-4.8.12+gitAUTOINC+4fb6f24600_d4148a2064-r0.1
do_kernel_version_sanity_check: Package Version (4.8.12+gitAUTOINC
+4fb6f24600_d4148a2064) does not match of kernel being built (4.8.21).
Please update the PV variable to match the kernel source.
ERROR: linux-yocto-4.8.12+gitAUTOINC+4fb6f24600_d4148a2064-r0.1
do_kernel_version_sanity_check: Function failed:
do_kernel_version_sanity_check (log file is located
at ../tmp/work/myqemu-poky-linux/linux-yocto/4.8.12+gitAUTOINC+4fb6f24600_d4148a2064-r0.1/temp/log.do_kernel_version_sanity_check.17509)
[YOCTO #11064]
(From meta-yocto rev: 51a42001c39d1b7c8170cc84904fa915295f1358)
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez at linux.intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel')
6 files changed, 12 insertions, 12 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend index 0a47a4e37f..f4fc21930e 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.1.bbappend | |||
@@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ | |||
28 | 28 | ||
29 | # replace these SRCREVs with the real commit ids once you've had | 29 | # replace these SRCREVs with the real commit ids once you've had |
30 | # the appropriate changes committed to the upstream linux-yocto repo | 30 | # the appropriate changes committed to the upstream linux-yocto repo |
31 | SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" | 31 | #SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" |
32 | SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" | 32 | #SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" |
33 | #LINUX_VERSION = "4.1" | 33 | #LINUX_VERSION = "4.1" |
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend index 815c77b813..4ec3e480dc 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.4.bbappend | |||
@@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ | |||
28 | 28 | ||
29 | # replace these SRCREVs with the real commit ids once you've had | 29 | # replace these SRCREVs with the real commit ids once you've had |
30 | # the appropriate changes committed to the upstream linux-yocto repo | 30 | # the appropriate changes committed to the upstream linux-yocto repo |
31 | SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" | 31 | #SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" |
32 | SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" | 32 | #SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" |
33 | #LINUX_VERSION = "4.4" | 33 | #LINUX_VERSION = "4.4" |
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend index 5fb45d9ab7..51cb0124cd 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto-tiny_4.8.bbappend | |||
@@ -28,6 +28,6 @@ SRC_URI += "file://{{=machine}}-tiny.scc \ | |||
28 | 28 | ||
29 | # replace these SRCREVs with the real commit ids once you've had | 29 | # replace these SRCREVs with the real commit ids once you've had |
30 | # the appropriate changes committed to the upstream linux-yocto repo | 30 | # the appropriate changes committed to the upstream linux-yocto repo |
31 | SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" | 31 | #SRCREV_machine_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" |
32 | SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" | 32 | #SRCREV_meta_pn-linux-yocto-tiny_{{=machine}} ?= "${AUTOREV}" |
33 | #LINUX_VERSION = "4.8" | 33 | #LINUX_VERSION = "4.8" |
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.1.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.1.bbappend index 2d3d073f79..1d78865762 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.1.bbappend | |||
@@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ | |||
27 | 27 | ||
28 | # replace these SRCREVs with the real commit ids once you've had | 28 | # replace these SRCREVs with the real commit ids once you've had |
29 | # the appropriate changes committed to the upstream linux-yocto repo | 29 | # the appropriate changes committed to the upstream linux-yocto repo |
30 | SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | 30 | #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" |
31 | SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | 31 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" |
32 | #LINUX_VERSION = "4.1" \ No newline at end of file | 32 | #LINUX_VERSION = "4.1" \ No newline at end of file |
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.4.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.4.bbappend index b88a06c52a..1725bf4bcb 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.4.bbappend | |||
@@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ | |||
27 | 27 | ||
28 | # replace these SRCREVs with the real commit ids once you've had | 28 | # replace these SRCREVs with the real commit ids once you've had |
29 | # the appropriate changes committed to the upstream linux-yocto repo | 29 | # the appropriate changes committed to the upstream linux-yocto repo |
30 | SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | 30 | #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" |
31 | SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | 31 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" |
32 | #LINUX_VERSION = "4.4" | 32 | #LINUX_VERSION = "4.4" |
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.8.bbappend b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.8.bbappend index 7c0df8bcd9..15d6431e20 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.8.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/linux-yocto_4.8.bbappend | |||
@@ -27,6 +27,6 @@ SRC_URI += "file://{{=machine}}-standard.scc \ | |||
27 | 27 | ||
28 | # replace these SRCREVs with the real commit ids once you've had | 28 | # replace these SRCREVs with the real commit ids once you've had |
29 | # the appropriate changes committed to the upstream linux-yocto repo | 29 | # the appropriate changes committed to the upstream linux-yocto repo |
30 | SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | 30 | #SRCREV_machine_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" |
31 | SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" | 31 | #SRCREV_meta_pn-linux-yocto_{{=machine}} ?= "${AUTOREV}" |
32 | #LINUX_VERSION = "4.8" | 32 | #LINUX_VERSION = "4.8" |