* [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function @ 2016-09-16 23:48 California Sullivan 2016-09-19 15:04 ` Bruce Ashfield 2016-09-21 3:11 ` Robert Yang 0 siblings, 2 replies; 16+ messages in thread From: California Sullivan @ 2016-09-16 23:48 UTC (permalink / raw) To: openembedded-core; +Cc: bruce.ashfield The kernel being built should match what the recipe claims it is building. This function ensures that happens by comparing the version information in the kernel's Makefile to the PV the recipe is using. v2 changes: * Match against PV instead of LINUX_VERSION * Match against EXTRAVERSION as well (e.g., -rc4) * Cleaned up version string building Fixes [YOCTO #6767]. Signed-off-by: California Sullivan <california.l.sullivan@intel.com> --- meta/classes/kernel.bbclass | 30 ++++++++++++++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto.inc | 1 + 2 files changed, 31 insertions(+) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index a6112e8..f894795 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -327,6 +327,36 @@ kernel_do_install() { } do_install[prefuncs] += "package_get_auto_pr" +# Must be ran no earlier than after do_kernel_checkout or else Makefile won't be in ${S}/Makefile +do_kernel_version_sanity_check() { + # The Makefile determines the kernel version shown at runtime + # Don't use KERNEL_VERSION because the headers it grabs the version from aren't generated until do_compile + VERSION=$(grep "^VERSION =" ${S}/Makefile | sed s/.*=\ *//) + PATCHLEVEL=$(grep "^PATCHLEVEL =" ${S}/Makefile | sed s/.*=\ *//) + SUBLEVEL=$(grep "^SUBLEVEL =" ${S}/Makefile | sed s/.*=\ *//) + EXTRAVERSION=$(grep "^EXTRAVERSION =" ${S}/Makefile | sed s/.*=\ *//) + + # Build a string for regex and a plain version string + reg="^${VERSION}\.${PATCHLEVEL}" + vers="${VERSION}.${PATCHLEVEL}" + if [ -n "${SUBLEVEL}" ]; then + # Ignoring a SUBLEVEL of zero is fine + if [ "${SUBLEVEL}" = "0" ]; then + reg="${reg}(\.${SUBLEVEL})?" + else + reg="${reg}\.${SUBLEVEL}" + vers="${vers}.${SUBLEVEL}" + fi + fi + vers="${vers}${EXTRAVERSION}" + reg="${reg}${EXTRAVERSION}" + + if [ -z `echo ${PV} | grep -E "${reg}"` ]; then + bbfatal "Package Version (${PV}) does not match of kernel being built (${vers}). Please update the PV variable to match the kernel source." + fi + exit 0 +} + addtask shared_workdir after do_compile before do_compile_kernelmodules addtask shared_workdir_setscene diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 98a48ec..d979662 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -55,6 +55,7 @@ do_install_append(){ } # extra tasks +addtask kernel_version_sanity_check after do_kernel_checkout before do_compile addtask kernel_link_images after do_compile before do_install addtask validate_branches before do_patch after do_kernel_checkout addtask kernel_configcheck after do_configure before do_compile -- 2.5.5 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-16 23:48 [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function California Sullivan @ 2016-09-19 15:04 ` Bruce Ashfield 2016-09-19 15:09 ` Burton, Ross 2016-09-21 3:11 ` Robert Yang 1 sibling, 1 reply; 16+ messages in thread From: Bruce Ashfield @ 2016-09-19 15:04 UTC (permalink / raw) To: California Sullivan, openembedded-core On 2016-09-16 07:48 PM, California Sullivan wrote: > The kernel being built should match what the recipe claims it is > building. This function ensures that happens by comparing the version > information in the kernel's Makefile to the PV the recipe is using. > > v2 changes: > * Match against PV instead of LINUX_VERSION > * Match against EXTRAVERSION as well (e.g., -rc4) > * Cleaned up version string building > > Fixes [YOCTO #6767]. > > Signed-off-by: California Sullivan <california.l.sullivan@intel.com> > --- > meta/classes/kernel.bbclass | 30 ++++++++++++++++++++++++++++++ > meta/recipes-kernel/linux/linux-yocto.inc | 1 + > 2 files changed, 31 insertions(+) > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > index a6112e8..f894795 100644 > --- a/meta/classes/kernel.bbclass > +++ b/meta/classes/kernel.bbclass > @@ -327,6 +327,36 @@ kernel_do_install() { > } > do_install[prefuncs] += "package_get_auto_pr" > > +# Must be ran no earlier than after do_kernel_checkout or else Makefile won't be in ${S}/Makefile > +do_kernel_version_sanity_check() { > + # The Makefile determines the kernel version shown at runtime > + # Don't use KERNEL_VERSION because the headers it grabs the version from aren't generated until do_compile > + VERSION=$(grep "^VERSION =" ${S}/Makefile | sed s/.*=\ *//) > + PATCHLEVEL=$(grep "^PATCHLEVEL =" ${S}/Makefile | sed s/.*=\ *//) > + SUBLEVEL=$(grep "^SUBLEVEL =" ${S}/Makefile | sed s/.*=\ *//) > + EXTRAVERSION=$(grep "^EXTRAVERSION =" ${S}/Makefile | sed s/.*=\ *//) > + > + # Build a string for regex and a plain version string > + reg="^${VERSION}\.${PATCHLEVEL}" > + vers="${VERSION}.${PATCHLEVEL}" > + if [ -n "${SUBLEVEL}" ]; then > + # Ignoring a SUBLEVEL of zero is fine > + if [ "${SUBLEVEL}" = "0" ]; then > + reg="${reg}(\.${SUBLEVEL})?" > + else > + reg="${reg}\.${SUBLEVEL}" > + vers="${vers}.${SUBLEVEL}" > + fi > + fi > + vers="${vers}${EXTRAVERSION}" > + reg="${reg}${EXTRAVERSION}" > + > + if [ -z `echo ${PV} | grep -E "${reg}"` ]; then > + bbfatal "Package Version (${PV}) does not match of kernel being built (${vers}). Please update the PV variable to match the kernel source." My only 'nit is that this is a fairly long line. Would it be worth splitting it into two ? Otherwise, I don't see anything obviously wrong (I looked at the regexs but didn't study them in detail) .. and it looks sane to me. A good balance between checking and not needing the entire kernel to be built and exported to work-shared. Cheers, Bruce > + fi > + exit 0 > +} > + > addtask shared_workdir after do_compile before do_compile_kernelmodules > addtask shared_workdir_setscene > > diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc > index 98a48ec..d979662 100644 > --- a/meta/recipes-kernel/linux/linux-yocto.inc > +++ b/meta/recipes-kernel/linux/linux-yocto.inc > @@ -55,6 +55,7 @@ do_install_append(){ > } > > # extra tasks > +addtask kernel_version_sanity_check after do_kernel_checkout before do_compile > addtask kernel_link_images after do_compile before do_install > addtask validate_branches before do_patch after do_kernel_checkout > addtask kernel_configcheck after do_configure before do_compile > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-19 15:04 ` Bruce Ashfield @ 2016-09-19 15:09 ` Burton, Ross 2016-09-19 16:22 ` Burton, Ross 0 siblings, 1 reply; 16+ messages in thread From: Burton, Ross @ 2016-09-19 15:09 UTC (permalink / raw) To: Bruce Ashfield; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 1268 bytes --] On 19 September 2016 at 16:04, Bruce Ashfield <bruce.ashfield@windriver.com> wrote: > Otherwise, I don't see anything obviously wrong (I looked at the regexs > but didn't study them in detail) .. and it looks sane to me. A good > balance between checking and not needing the entire kernel to be built > and exported to work-shared. > This is being fired on the AB: ERROR: linux-yocto-4.1.32+gitAUTOINC+b30b6b9ef2_d6237b3b24-r0 do_kernel_version_sanity_check: Package Version (4.1.32+gitAUTOINC+b30b6b9ef2_d6237b3b24) does not match of kernel being built (4.1.31). Please update the PV variable to match the kernel source. ERROR: linux-yocto-4.1.32+gitAUTOINC+b30b6b9ef2_d6237b3b24-r0 do_kernel_version_sanity_check: Function failed: do_kernel_version_sanity_check (log file is located at /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-mips-lsb/build/build/tmp/work/qemumips-poky-linux/linux-yocto/4.1.32+gitAUTOINC+b30b6b9ef2_d6237b3b24-r0/temp/log.do_kernel_version_sanity_check.9143) ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-mips-lsb/build/build/tmp/work/qemumips-poky-linux/linux-yocto/4.1.32+gitAUTOINC+b30b6b9ef2_d6237b3b24-r0/temp/log.do_kernel_version_sanity_check.9143 Ross [-- Attachment #2: Type: text/html, Size: 1800 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-19 15:09 ` Burton, Ross @ 2016-09-19 16:22 ` Burton, Ross 2016-09-19 17:05 ` Cal Sullivan 0 siblings, 1 reply; 16+ messages in thread From: Burton, Ross @ 2016-09-19 16:22 UTC (permalink / raw) To: Bruce Ashfield; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 1092 bytes --] On 19 September 2016 at 16:09, Burton, Ross <ross.burton@intel.com> wrote: > This is being fired on the AB: > > ERROR: linux-yocto-4.1.32+gitAUTOINC+b30b6b9ef2_d6237b3b24-r0 > do_kernel_version_sanity_check: Package Version > (4.1.32+gitAUTOINC+b30b6b9ef2_d6237b3b24) does not match of kernel being > built (4.1.31). Please update the PV variable to match the kernel source. > ERROR: linux-yocto-4.1.32+gitAUTOINC+b30b6b9ef2_d6237b3b24-r0 > do_kernel_version_sanity_check: Function failed: > do_kernel_version_sanity_check (log file is located at > /home/pokybuild/yocto-autobuilder/yocto-worker/ > nightly-mips-lsb/build/build/tmp/work/qemumips-poky-linux/ > linux-yocto/4.1.32+gitAUTOINC+b30b6b9ef2_d6237b3b24-r0/temp/ > log.do_kernel_version_sanity_check.9143) > ERROR: Logfile of failure stored in: /home/pokybuild/yocto- > autobuilder/yocto-worker/nightly-mips-lsb/build/build/ > tmp/work/qemumips-poky-linux/linux-yocto/4.1.32+gitAUTOINC+ > b30b6b9ef2_d6237b3b24-r0/temp/log.do_kernel_version_sanity_check.9143 (This has happened for all the LSB builds so far) [-- Attachment #2: Type: text/html, Size: 1490 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-19 16:22 ` Burton, Ross @ 2016-09-19 17:05 ` Cal Sullivan 2016-09-19 18:54 ` Burton, Ross 0 siblings, 1 reply; 16+ messages in thread From: Cal Sullivan @ 2016-09-19 17:05 UTC (permalink / raw) To: Burton, Ross, Bruce Ashfield; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 1408 bytes --] It looks like the function is doing as its supposed to, and we need to update some PVs or SRCREVs to match PVs. E.g., on the error below, SRCREV d6237b3b24 is indeed 4.1.31. --- Cal On 09/19/2016 09:22 AM, Burton, Ross wrote: > > On 19 September 2016 at 16:09, Burton, Ross <ross.burton@intel.com > <mailto:ross.burton@intel.com>> wrote: > > This is being fired on the AB: > > ERROR: linux-yocto-4.1.32+gitAUTOINC+b30b6b9ef2_d6237b3b24-r0 > do_kernel_version_sanity_check: Package Version > (4.1.32+gitAUTOINC+b30b6b9ef2_d6237b3b24) does not match of kernel > being built (4.1.31). Please update the PV variable to match the > kernel source. > ERROR: linux-yocto-4.1.32+gitAUTOINC+b30b6b9ef2_d6237b3b24-r0 > do_kernel_version_sanity_check: Function failed: > do_kernel_version_sanity_check (log file is located at > /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-mips-lsb/build/build/tmp/work/qemumips-poky-linux/linux-yocto/4.1.32+gitAUTOINC+b30b6b9ef2_d6237b3b24-r0/temp/log.do_kernel_version_sanity_check.9143) > ERROR: Logfile of failure stored in: > /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-mips-lsb/build/build/tmp/work/qemumips-poky-linux/linux-yocto/4.1.32+gitAUTOINC+b30b6b9ef2_d6237b3b24-r0/temp/log.do_kernel_version_sanity_check.9143 > > > (This has happened for all the LSB builds so far) [-- Attachment #2: Type: text/html, Size: 2612 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-19 17:05 ` Cal Sullivan @ 2016-09-19 18:54 ` Burton, Ross 2016-09-19 19:53 ` Cal Sullivan 0 siblings, 1 reply; 16+ messages in thread From: Burton, Ross @ 2016-09-19 18:54 UTC (permalink / raw) To: Cal Sullivan; +Cc: Bruce Ashfield, OE-core [-- Attachment #1: Type: text/plain, Size: 1490 bytes --] On 19 September 2016 at 18:05, Cal Sullivan <california.l.sullivan@intel.com > wrote: > It looks like the function is doing as its supposed to, and we need to > update some PVs or SRCREVs to match PVs. > > E.g., on the error below, SRCREV d6237b3b24 is indeed 4.1.31. > And some more builders failed with 4.4: ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 do_kernel_version_sanity_check: Package Version (4.4.20+gitAUTOINC+e66032e2d9_628bf62756) does not match of kernel being built (4.4.11). Please update the PV variable to match the kernel source. ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 do_kernel_version_sanity_check: Function failed: do_kernel_version_sanity_check (log file is located at /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux-yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0/temp/log.do_kernel_version_sanity_check.30210) NOTE: recipe usbutils-008-r0: task do_fetch: Started ERROR: Logfile of failure stored in: /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux-yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0/temp/log.do_kernel_version_sanity_check.30210 ERROR: Task (/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-arm/build/meta/recipes-kernel/linux/linux-yocto_4.4.bb:do_kernel_version_sanity_check) failed with exit code '1' (ditto for ppc and x86) Ross [-- Attachment #2: Type: text/html, Size: 1939 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-19 18:54 ` Burton, Ross @ 2016-09-19 19:53 ` Cal Sullivan 2016-09-19 19:55 ` Bruce Ashfield 0 siblings, 1 reply; 16+ messages in thread From: Cal Sullivan @ 2016-09-19 19:53 UTC (permalink / raw) To: Burton, Ross; +Cc: Bruce Ashfield, OE-core [-- Attachment #1: Type: text/plain, Size: 1912 bytes --] Yep, these all have incorrect PVs. 628bf62756 Merge tag 'v4.4.11' into standard/base The problem seems fairly wide spread. Bruce, do you suggest updating PVs or updating the SRCREVs (is there a good reason to keep using old SRCREVs?)? --- Cal On 09/19/2016 11:54 AM, Burton, Ross wrote: > > On 19 September 2016 at 18:05, Cal Sullivan > <california.l.sullivan@intel.com > <mailto:california.l.sullivan@intel.com>> wrote: > > It looks like the function is doing as its supposed to, and we > need to update some PVs or SRCREVs to match PVs. > > E.g., on the error below, SRCREV d6237b3b24 is indeed 4.1.31. > > > And some more builders failed with 4.4: > > ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 > do_kernel_version_sanity_check: Package Version > (4.4.20+gitAUTOINC+e66032e2d9_628bf62756) does not match of kernel > being built (4.4.11). Please update the PV variable to match the > kernel source. > ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 > do_kernel_version_sanity_check: Function failed: > do_kernel_version_sanity_check (log file is located at > /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux-yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0/temp/log.do_kernel_version_sanity_check.30210) > NOTE: recipe usbutils-008-r0: task do_fetch: Started > ERROR: Logfile of failure stored in: > /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux-yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0/temp/log.do_kernel_version_sanity_check.30210 > ERROR: Task > (/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-arm/build/meta/recipes-kernel/linux/linux-yocto_4.4.bb:do_kernel_version_sanity_check) > failed with exit code '1' > > (ditto for ppc and x86) > > Ross [-- Attachment #2: Type: text/html, Size: 3249 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-19 19:53 ` Cal Sullivan @ 2016-09-19 19:55 ` Bruce Ashfield 2016-09-19 20:49 ` Saul Wold 0 siblings, 1 reply; 16+ messages in thread From: Bruce Ashfield @ 2016-09-19 19:55 UTC (permalink / raw) To: Cal Sullivan, Burton, Ross; +Cc: OE-core On 2016-09-19 03:53 PM, Cal Sullivan wrote: > Yep, these all have incorrect PVs. > 628bf62756 Merge tag 'v4.4.11' into standard/base > The problem seems fairly wide spread. > > Bruce, do you suggest updating PVs or updating the SRCREVs (is there a > good reason to keep using old SRCREVs?)? Updating the SRCREVs is the right thing to do to sync them up now. but .. at the same time, they should probably have their own PVs, since next time up update 4.4.x, they'll fall out of sync and fail again. We want them to be aligned with the latest -stable, but we also don't need failures every time I push a new SRCREV and update the PV of the base recipe. Bruce > > --- > Cal > > > On 09/19/2016 11:54 AM, Burton, Ross wrote: >> >> On 19 September 2016 at 18:05, Cal Sullivan >> <california.l.sullivan@intel.com >> <mailto:california.l.sullivan@intel.com>> wrote: >> >> It looks like the function is doing as its supposed to, and we >> need to update some PVs or SRCREVs to match PVs. >> >> E.g., on the error below, SRCREV d6237b3b24 is indeed 4.1.31. >> >> >> And some more builders failed with 4.4: >> >> ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 >> do_kernel_version_sanity_check: Package Version >> (4.4.20+gitAUTOINC+e66032e2d9_628bf62756) does not match of kernel >> being built (4.4.11). Please update the PV variable to match the >> kernel source. >> ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 >> do_kernel_version_sanity_check: Function failed: >> do_kernel_version_sanity_check (log file is located at >> /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux-yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0/temp/log.do_kernel_version_sanity_check.30210) >> NOTE: recipe usbutils-008-r0: task do_fetch: Started >> ERROR: Logfile of failure stored in: >> /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux-yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0/temp/log.do_kernel_version_sanity_check.30210 >> ERROR: Task >> (/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-arm/build/meta/recipes-kernel/linux/linux-yocto_4.4.bb:do_kernel_version_sanity_check) >> failed with exit code '1' >> >> (ditto for ppc and x86) >> >> Ross > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-19 19:55 ` Bruce Ashfield @ 2016-09-19 20:49 ` Saul Wold 2016-09-19 22:02 ` Cal Sullivan 0 siblings, 1 reply; 16+ messages in thread From: Saul Wold @ 2016-09-19 20:49 UTC (permalink / raw) To: Bruce Ashfield, Cal Sullivan, Burton, Ross; +Cc: OE-core On Mon, 2016-09-19 at 15:55 -0400, Bruce Ashfield wrote: > On 2016-09-19 03:53 PM, Cal Sullivan wrote: > > > > Yep, these all have incorrect PVs. > > 628bf62756 Merge tag 'v4.4.11' into standard/base > > The problem seems fairly wide spread. > > > > Bruce, do you suggest updating PVs or updating the SRCREVs (is > > there a > > good reason to keep using old SRCREVs?)? > > Updating the SRCREVs is the right thing to do to sync them up now. > > but .. > > at the same time, they should probably have their own PVs, since > next time up update 4.4.x, they'll fall out of sync and fail again. > +1, I think that these need their own PV since they also don't update as fast as the base qemu recipes do. Sau! > We want them to be aligned with the latest -stable, but we also > don't need failures every time I push a new SRCREV and update the > PV of the base recipe. > > Bruce > > > > > > > --- > > Cal > > > > > > On 09/19/2016 11:54 AM, Burton, Ross wrote: > > > > > > > > > On 19 September 2016 at 18:05, Cal Sullivan > > > <california.l.sullivan@intel.com > > > <mailto:california.l.sullivan@intel.com>> wrote: > > > > > > It looks like the function is doing as its supposed to, and > > > we > > > need to update some PVs or SRCREVs to match PVs. > > > > > > E.g., on the error below, SRCREV d6237b3b24 is indeed 4.1.31. > > > > > > > > > And some more builders failed with 4.4: > > > > > > ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 > > > do_kernel_version_sanity_check: Package Version > > > (4.4.20+gitAUTOINC+e66032e2d9_628bf62756) does not match of > > > kernel > > > being built (4.4.11). Please update the PV variable to match the > > > kernel source. > > > ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 > > > do_kernel_version_sanity_check: Function failed: > > > do_kernel_version_sanity_check (log file is located at > > > /home/pokybuild/yocto-autobuilder/yocto-worker/nightly- > > > arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux- > > > yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756- > > > r0/temp/log.do_kernel_version_sanity_check.30210) > > > NOTE: recipe usbutils-008-r0: task do_fetch: Started > > > ERROR: Logfile of failure stored in: > > > /home/pokybuild/yocto-autobuilder/yocto-worker/nightly- > > > arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux- > > > yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756- > > > r0/temp/log.do_kernel_version_sanity_check.30210 > > > ERROR: Task > > > (/home/pokybuild/yocto-autobuilder/yocto-worker/nightly- > > > arm/build/meta/recipes-kernel/linux/linux- > > > yocto_4.4.bb:do_kernel_version_sanity_check) > > > failed with exit code '1' > > > > > > (ditto for ppc and x86) > > > > > > Ross > > > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-19 20:49 ` Saul Wold @ 2016-09-19 22:02 ` Cal Sullivan 2016-09-19 22:55 ` Bruce Ashfield 0 siblings, 1 reply; 16+ messages in thread From: Cal Sullivan @ 2016-09-19 22:02 UTC (permalink / raw) To: Saul Wold, Bruce Ashfield, Burton, Ross; +Cc: OE-core I don't have time to smoke test a SRCREV update for so many machines right now, so I think for now I will just set the correct PV in the various linux-yocto recipes so we don't block master-next builds. Is this acceptable? Thanks, Cal On 09/19/2016 01:49 PM, Saul Wold wrote: > On Mon, 2016-09-19 at 15:55 -0400, Bruce Ashfield wrote: >> On 2016-09-19 03:53 PM, Cal Sullivan wrote: >>> Yep, these all have incorrect PVs. >>> 628bf62756 Merge tag 'v4.4.11' into standard/base >>> The problem seems fairly wide spread. >>> >>> Bruce, do you suggest updating PVs or updating the SRCREVs (is >>> there a >>> good reason to keep using old SRCREVs?)? >> Updating the SRCREVs is the right thing to do to sync them up now. >> >> but .. >> >> at the same time, they should probably have their own PVs, since >> next time up update 4.4.x, they'll fall out of sync and fail again. >> > +1, I think that these need their own PV since they also don't update > as fast as the base qemu recipes do. > > Sau! > >> We want them to be aligned with the latest -stable, but we also >> don't need failures every time I push a new SRCREV and update the >> PV of the base recipe. >> >> Bruce >> >>> >>> --- >>> Cal >>> >>> >>> On 09/19/2016 11:54 AM, Burton, Ross wrote: >>>> >>>> On 19 September 2016 at 18:05, Cal Sullivan >>>> <california.l.sullivan@intel.com >>>> <mailto:california.l.sullivan@intel.com>> wrote: >>>> >>>> It looks like the function is doing as its supposed to, and >>>> we >>>> need to update some PVs or SRCREVs to match PVs. >>>> >>>> E.g., on the error below, SRCREV d6237b3b24 is indeed 4.1.31. >>>> >>>> >>>> And some more builders failed with 4.4: >>>> >>>> ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 >>>> do_kernel_version_sanity_check: Package Version >>>> (4.4.20+gitAUTOINC+e66032e2d9_628bf62756) does not match of >>>> kernel >>>> being built (4.4.11). Please update the PV variable to match the >>>> kernel source. >>>> ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 >>>> do_kernel_version_sanity_check: Function failed: >>>> do_kernel_version_sanity_check (log file is located at >>>> /home/pokybuild/yocto-autobuilder/yocto-worker/nightly- >>>> arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux- >>>> yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756- >>>> r0/temp/log.do_kernel_version_sanity_check.30210) >>>> NOTE: recipe usbutils-008-r0: task do_fetch: Started >>>> ERROR: Logfile of failure stored in: >>>> /home/pokybuild/yocto-autobuilder/yocto-worker/nightly- >>>> arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux- >>>> yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756- >>>> r0/temp/log.do_kernel_version_sanity_check.30210 >>>> ERROR: Task >>>> (/home/pokybuild/yocto-autobuilder/yocto-worker/nightly- >>>> arm/build/meta/recipes-kernel/linux/linux- >>>> yocto_4.4.bb:do_kernel_version_sanity_check) >>>> failed with exit code '1' >>>> >>>> (ditto for ppc and x86) >>>> >>>> Ross ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-19 22:02 ` Cal Sullivan @ 2016-09-19 22:55 ` Bruce Ashfield 2016-09-19 23:02 ` Cal Sullivan 0 siblings, 1 reply; 16+ messages in thread From: Bruce Ashfield @ 2016-09-19 22:55 UTC (permalink / raw) To: Cal Sullivan; +Cc: OE-core, Saul Wold [-- Attachment #1: Type: text/plain, Size: 3753 bytes --] On Mon, Sep 19, 2016 at 6:02 PM, Cal Sullivan < california.l.sullivan@intel.com> wrote: > I don't have time to smoke test a SRCREV update for so many machines right > now, so I think for now I will just set the correct PV in the various > linux-yocto recipes so we don't block master-next builds. > > Is this acceptable? > In the linux-yocto bbappends of the various layers ? I keep track of the PV's in the core recipes themselves, so they shouldn't need to be modified. Bruce > > Thanks, > Cal > > > On 09/19/2016 01:49 PM, Saul Wold wrote: > >> On Mon, 2016-09-19 at 15:55 -0400, Bruce Ashfield wrote: >> >>> On 2016-09-19 03:53 PM, Cal Sullivan wrote: >>> >>>> Yep, these all have incorrect PVs. >>>> 628bf62756 Merge tag 'v4.4.11' into standard/base >>>> The problem seems fairly wide spread. >>>> >>>> Bruce, do you suggest updating PVs or updating the SRCREVs (is >>>> there a >>>> good reason to keep using old SRCREVs?)? >>>> >>> Updating the SRCREVs is the right thing to do to sync them up now. >>> >>> but .. >>> >>> at the same time, they should probably have their own PVs, since >>> next time up update 4.4.x, they'll fall out of sync and fail again. >>> >>> +1, I think that these need their own PV since they also don't update >> as fast as the base qemu recipes do. >> >> Sau! >> >> We want them to be aligned with the latest -stable, but we also >>> don't need failures every time I push a new SRCREV and update the >>> PV of the base recipe. >>> >>> Bruce >>> >>> >>>> --- >>>> Cal >>>> >>>> >>>> On 09/19/2016 11:54 AM, Burton, Ross wrote: >>>> >>>>> >>>>> On 19 September 2016 at 18:05, Cal Sullivan >>>>> <california.l.sullivan@intel.com >>>>> <mailto:california.l.sullivan@intel.com>> wrote: >>>>> >>>>> It looks like the function is doing as its supposed to, and >>>>> we >>>>> need to update some PVs or SRCREVs to match PVs. >>>>> >>>>> E.g., on the error below, SRCREV d6237b3b24 is indeed 4.1.31. >>>>> >>>>> >>>>> And some more builders failed with 4.4: >>>>> >>>>> ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 >>>>> do_kernel_version_sanity_check: Package Version >>>>> (4.4.20+gitAUTOINC+e66032e2d9_628bf62756) does not match of >>>>> kernel >>>>> being built (4.4.11). Please update the PV variable to match the >>>>> kernel source. >>>>> ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 >>>>> do_kernel_version_sanity_check: Function failed: >>>>> do_kernel_version_sanity_check (log file is located at >>>>> /home/pokybuild/yocto-autobuilder/yocto-worker/nightly- >>>>> arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux- >>>>> yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756- >>>>> r0/temp/log.do_kernel_version_sanity_check.30210) >>>>> NOTE: recipe usbutils-008-r0: task do_fetch: Started >>>>> ERROR: Logfile of failure stored in: >>>>> /home/pokybuild/yocto-autobuilder/yocto-worker/nightly- >>>>> arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux- >>>>> yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756- >>>>> r0/temp/log.do_kernel_version_sanity_check.30210 >>>>> ERROR: Task >>>>> (/home/pokybuild/yocto-autobuilder/yocto-worker/nightly- >>>>> arm/build/meta/recipes-kernel/linux/linux- >>>>> yocto_4.4.bb:do_kernel_version_sanity_check) >>>>> failed with exit code '1' >>>>> >>>>> (ditto for ppc and x86) >>>>> >>>>> Ross >>>>> >>>> > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" [-- Attachment #2: Type: text/html, Size: 5523 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-19 22:55 ` Bruce Ashfield @ 2016-09-19 23:02 ` Cal Sullivan 2016-09-20 0:03 ` Bruce Ashfield 0 siblings, 1 reply; 16+ messages in thread From: Cal Sullivan @ 2016-09-19 23:02 UTC (permalink / raw) To: Bruce Ashfield; +Cc: OE-core, Saul Wold [-- Attachment #1: Type: text/plain, Size: 5394 bytes --] On 09/19/2016 03:55 PM, Bruce Ashfield wrote: > > > On Mon, Sep 19, 2016 at 6:02 PM, Cal Sullivan > <california.l.sullivan@intel.com > <mailto:california.l.sullivan@intel.com>> wrote: > > I don't have time to smoke test a SRCREV update for so many > machines right now, so I think for now I will just set the correct > PV in the various linux-yocto recipes so we don't block > master-next builds. > > Is this acceptable? > > > In the linux-yocto bbappends of the various layers ? I keep track of > the PV's in the > core recipes themselves, so they shouldn't need to be modified. You're right. Only the linux-yocto bbappends in meta-yocto-bsp need MACHINE-specific PVs right now. The issue with 4.1 (used by lsb right now) in oe-core is that LINUX_VERSION was bumped to 4.1.32 rather than 4.1.31 in error. --- Cal > > Bruce > > > Thanks, > Cal > > > On 09/19/2016 01:49 PM, Saul Wold wrote: > > On Mon, 2016-09-19 at 15:55 -0400, Bruce Ashfield wrote: > > On 2016-09-19 03:53 PM, Cal Sullivan wrote: > > Yep, these all have incorrect PVs. > 628bf62756 Merge tag 'v4.4.11' into standard/base > The problem seems fairly wide spread. > > Bruce, do you suggest updating PVs or updating the > SRCREVs (is > there a > good reason to keep using old SRCREVs?)? > > Updating the SRCREVs is the right thing to do to sync them > up now. > > but .. > > at the same time, they should probably have their own PVs, > since > next time up update 4.4.x, they'll fall out of sync and > fail again. > > +1, I think that these need their own PV since they also don't > update > as fast as the base qemu recipes do. > > Sau! > > We want them to be aligned with the latest -stable, but we > also > don't need failures every time I push a new SRCREV and > update the > PV of the base recipe. > > Bruce > > > --- > Cal > > > On 09/19/2016 11:54 AM, Burton, Ross wrote: > > > On 19 September 2016 at 18:05, Cal Sullivan > <california.l.sullivan@intel.com > <mailto:california.l.sullivan@intel.com> > <mailto:california.l.sullivan@intel.com > <mailto:california.l.sullivan@intel.com>>> wrote: > > It looks like the function is doing as its > supposed to, and > we > need to update some PVs or SRCREVs to match PVs. > > E.g., on the error below, SRCREV d6237b3b24 > is indeed 4.1.31. > > > And some more builders failed with 4.4: > > ERROR: > linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 > do_kernel_version_sanity_check: Package Version > (4.4.20+gitAUTOINC+e66032e2d9_628bf62756) does not > match of > kernel > being built (4.4.11). Please update the PV > variable to match the > kernel source. > ERROR: > linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 > do_kernel_version_sanity_check: Function failed: > do_kernel_version_sanity_check (log file is located at > /home/pokybuild/yocto-autobuilder/yocto-worker/nightly- > arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux- > yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756- > r0/temp/log.do_kernel_version_sanity_check.30210) > NOTE: recipe usbutils-008-r0: task do_fetch: Started > ERROR: Logfile of failure stored in: > /home/pokybuild/yocto-autobuilder/yocto-worker/nightly- > arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux- > yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756- > r0/temp/log.do_kernel_version_sanity_check.30210 > ERROR: Task > (/home/pokybuild/yocto-autobuilder/yocto-worker/nightly- > arm/build/meta/recipes-kernel/linux/linux- > yocto_4.4.bb:do_kernel_version_sanity_check) > failed with exit code '1' > > (ditto for ppc and x86) > > Ross > > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > <mailto:Openembedded-core@lists.openembedded.org> > http://lists.openembedded.org/mailman/listinfo/openembedded-core > <http://lists.openembedded.org/mailman/listinfo/openembedded-core> > > > > > -- > "Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end" [-- Attachment #2: Type: text/html, Size: 10440 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-19 23:02 ` Cal Sullivan @ 2016-09-20 0:03 ` Bruce Ashfield 2016-09-20 3:54 ` Bruce Ashfield 0 siblings, 1 reply; 16+ messages in thread From: Bruce Ashfield @ 2016-09-20 0:03 UTC (permalink / raw) To: Cal Sullivan; +Cc: OE-core, Saul Wold [-- Attachment #1: Type: text/plain, Size: 4549 bytes --] On Mon, Sep 19, 2016 at 7:02 PM, Cal Sullivan < california.l.sullivan@intel.com> wrote: > > > On 09/19/2016 03:55 PM, Bruce Ashfield wrote: > > > > On Mon, Sep 19, 2016 at 6:02 PM, Cal Sullivan < > california.l.sullivan@intel.com> wrote: > >> I don't have time to smoke test a SRCREV update for so many machines >> right now, so I think for now I will just set the correct PV in the various >> linux-yocto recipes so we don't block master-next builds. >> >> Is this acceptable? >> > > In the linux-yocto bbappends of the various layers ? I keep track of the > PV's in the > core recipes themselves, so they shouldn't need to be modified. > > You're right. Only the linux-yocto bbappends in meta-yocto-bsp need > MACHINE-specific PVs right now. > The issue with 4.1 (used by lsb right now) in oe-core is that > LINUX_VERSION was bumped to 4.1.32 rather than 4.1.31 in error. > I'll take care of that part in a few hours. Since I've been testing the SRCREVs, I'll double check and tweak it as need be. Bruce > > --- > Cal > > > > Bruce > > >> >> Thanks, >> Cal >> >> >> On 09/19/2016 01:49 PM, Saul Wold wrote: >> >>> On Mon, 2016-09-19 at 15:55 -0400, Bruce Ashfield wrote: >>> >>>> On 2016-09-19 03:53 PM, Cal Sullivan wrote: >>>> >>>>> Yep, these all have incorrect PVs. >>>>> 628bf62756 Merge tag 'v4.4.11' into standard/base >>>>> The problem seems fairly wide spread. >>>>> >>>>> Bruce, do you suggest updating PVs or updating the SRCREVs (is >>>>> there a >>>>> good reason to keep using old SRCREVs?)? >>>>> >>>> Updating the SRCREVs is the right thing to do to sync them up now. >>>> >>>> but .. >>>> >>>> at the same time, they should probably have their own PVs, since >>>> next time up update 4.4.x, they'll fall out of sync and fail again. >>>> >>>> +1, I think that these need their own PV since they also don't update >>> as fast as the base qemu recipes do. >>> >>> Sau! >>> >>> We want them to be aligned with the latest -stable, but we also >>>> don't need failures every time I push a new SRCREV and update the >>>> PV of the base recipe. >>>> >>>> Bruce >>>> >>>> >>>>> --- >>>>> Cal >>>>> >>>>> >>>>> On 09/19/2016 11:54 AM, Burton, Ross wrote: >>>>> >>>>>> >>>>>> On 19 September 2016 at 18:05, Cal Sullivan >>>>>> <california.l.sullivan@intel.com >>>>>> <mailto:california.l.sullivan@intel.com>> wrote: >>>>>> >>>>>> It looks like the function is doing as its supposed to, and >>>>>> we >>>>>> need to update some PVs or SRCREVs to match PVs. >>>>>> >>>>>> E.g., on the error below, SRCREV d6237b3b24 is indeed 4.1.31. >>>>>> >>>>>> >>>>>> And some more builders failed with 4.4: >>>>>> >>>>>> ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 >>>>>> do_kernel_version_sanity_check: Package Version >>>>>> (4.4.20+gitAUTOINC+e66032e2d9_628bf62756) does not match of >>>>>> kernel >>>>>> being built (4.4.11). Please update the PV variable to match the >>>>>> kernel source. >>>>>> ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 >>>>>> do_kernel_version_sanity_check: Function failed: >>>>>> do_kernel_version_sanity_check (log file is located at >>>>>> /home/pokybuild/yocto-autobuilder/yocto-worker/nightly- >>>>>> arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux- >>>>>> yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756- >>>>>> r0/temp/log.do_kernel_version_sanity_check.30210) >>>>>> NOTE: recipe usbutils-008-r0: task do_fetch: Started >>>>>> ERROR: Logfile of failure stored in: >>>>>> /home/pokybuild/yocto-autobuilder/yocto-worker/nightly- >>>>>> arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux- >>>>>> yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756- >>>>>> r0/temp/log.do_kernel_version_sanity_check.30210 >>>>>> ERROR: Task >>>>>> (/home/pokybuild/yocto-autobuilder/yocto-worker/nightly- >>>>>> arm/build/meta/recipes-kernel/linux/linux- >>>>>> yocto_4.4.bb:do_kernel_version_sanity_check) >>>>>> failed with exit code '1' >>>>>> >>>>>> (ditto for ppc and x86) >>>>>> >>>>>> Ross >>>>>> >>>>> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > > > > -- > "Thou shalt not follow the NULL pointer, for chaos and madness await thee > at its end" > > > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" [-- Attachment #2: Type: text/html, Size: 10527 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-20 0:03 ` Bruce Ashfield @ 2016-09-20 3:54 ` Bruce Ashfield 0 siblings, 0 replies; 16+ messages in thread From: Bruce Ashfield @ 2016-09-20 3:54 UTC (permalink / raw) To: Cal Sullivan; +Cc: OE-core, Saul Wold [-- Attachment #1: Type: text/plain, Size: 5172 bytes --] On Mon, Sep 19, 2016 at 8:03 PM, Bruce Ashfield <bruce.ashfield@gmail.com> wrote: > > > On Mon, Sep 19, 2016 at 7:02 PM, Cal Sullivan < > california.l.sullivan@intel.com> wrote: > >> >> >> On 09/19/2016 03:55 PM, Bruce Ashfield wrote: >> >> >> >> On Mon, Sep 19, 2016 at 6:02 PM, Cal Sullivan < >> california.l.sullivan@intel.com> wrote: >> >>> I don't have time to smoke test a SRCREV update for so many machines >>> right now, so I think for now I will just set the correct PV in the various >>> linux-yocto recipes so we don't block master-next builds. >>> >>> Is this acceptable? >>> >> >> In the linux-yocto bbappends of the various layers ? I keep track of the >> PV's in the >> core recipes themselves, so they shouldn't need to be modified. >> >> You're right. Only the linux-yocto bbappends in meta-yocto-bsp need >> MACHINE-specific PVs right now. >> The issue with 4.1 (used by lsb right now) in oe-core is that >> LINUX_VERSION was bumped to 4.1.32 rather than 4.1.31 in error. >> > > I'll take care of that part in a few hours. Since I've been testing the > SRCREVs, I'll double > check and tweak it as need be. > Strangely I had merged 4.1.32 (the tag was present), but I didn't update the machine SRCREVs to match. I was integrating 4.8-rc7 (and preempt-rt) today, so I've merged the 4.1.32 tag, and will send it along with my series on Tuesday morning. Bruce > > Bruce > > >> >> --- >> Cal >> >> >> >> Bruce >> >> >>> >>> Thanks, >>> Cal >>> >>> >>> On 09/19/2016 01:49 PM, Saul Wold wrote: >>> >>>> On Mon, 2016-09-19 at 15:55 -0400, Bruce Ashfield wrote: >>>> >>>>> On 2016-09-19 03:53 PM, Cal Sullivan wrote: >>>>> >>>>>> Yep, these all have incorrect PVs. >>>>>> 628bf62756 Merge tag 'v4.4.11' into standard/base >>>>>> The problem seems fairly wide spread. >>>>>> >>>>>> Bruce, do you suggest updating PVs or updating the SRCREVs (is >>>>>> there a >>>>>> good reason to keep using old SRCREVs?)? >>>>>> >>>>> Updating the SRCREVs is the right thing to do to sync them up now. >>>>> >>>>> but .. >>>>> >>>>> at the same time, they should probably have their own PVs, since >>>>> next time up update 4.4.x, they'll fall out of sync and fail again. >>>>> >>>>> +1, I think that these need their own PV since they also don't update >>>> as fast as the base qemu recipes do. >>>> >>>> Sau! >>>> >>>> We want them to be aligned with the latest -stable, but we also >>>>> don't need failures every time I push a new SRCREV and update the >>>>> PV of the base recipe. >>>>> >>>>> Bruce >>>>> >>>>> >>>>>> --- >>>>>> Cal >>>>>> >>>>>> >>>>>> On 09/19/2016 11:54 AM, Burton, Ross wrote: >>>>>> >>>>>>> >>>>>>> On 19 September 2016 at 18:05, Cal Sullivan >>>>>>> <california.l.sullivan@intel.com >>>>>>> <mailto:california.l.sullivan@intel.com>> wrote: >>>>>>> >>>>>>> It looks like the function is doing as its supposed to, and >>>>>>> we >>>>>>> need to update some PVs or SRCREVs to match PVs. >>>>>>> >>>>>>> E.g., on the error below, SRCREV d6237b3b24 is indeed 4.1.31. >>>>>>> >>>>>>> >>>>>>> And some more builders failed with 4.4: >>>>>>> >>>>>>> ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 >>>>>>> do_kernel_version_sanity_check: Package Version >>>>>>> (4.4.20+gitAUTOINC+e66032e2d9_628bf62756) does not match of >>>>>>> kernel >>>>>>> being built (4.4.11). Please update the PV variable to match the >>>>>>> kernel source. >>>>>>> ERROR: linux-yocto-4.4.20+gitAUTOINC+e66032e2d9_628bf62756-r0 >>>>>>> do_kernel_version_sanity_check: Function failed: >>>>>>> do_kernel_version_sanity_check (log file is located at >>>>>>> /home/pokybuild/yocto-autobuilder/yocto-worker/nightly- >>>>>>> arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux- >>>>>>> yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756- >>>>>>> r0/temp/log.do_kernel_version_sanity_check.30210) >>>>>>> NOTE: recipe usbutils-008-r0: task do_fetch: Started >>>>>>> ERROR: Logfile of failure stored in: >>>>>>> /home/pokybuild/yocto-autobuilder/yocto-worker/nightly- >>>>>>> arm/build/build/tmp/work/beaglebone-poky-linux-gnueabi/linux- >>>>>>> yocto/4.4.20+gitAUTOINC+e66032e2d9_628bf62756- >>>>>>> r0/temp/log.do_kernel_version_sanity_check.30210 >>>>>>> ERROR: Task >>>>>>> (/home/pokybuild/yocto-autobuilder/yocto-worker/nightly- >>>>>>> arm/build/meta/recipes-kernel/linux/linux- >>>>>>> yocto_4.4.bb:do_kernel_version_sanity_check) >>>>>>> failed with exit code '1' >>>>>>> >>>>>>> (ditto for ppc and x86) >>>>>>> >>>>>>> Ross >>>>>>> >>>>>> >>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> Openembedded-core@lists.openembedded.org >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >>> >> >> >> >> -- >> "Thou shalt not follow the NULL pointer, for chaos and madness await thee >> at its end" >> >> >> > > > -- > "Thou shalt not follow the NULL pointer, for chaos and madness await thee > at its end" > -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" [-- Attachment #2: Type: text/html, Size: 11788 bytes --] ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-16 23:48 [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function California Sullivan 2016-09-19 15:04 ` Bruce Ashfield @ 2016-09-21 3:11 ` Robert Yang 2016-09-21 16:27 ` Cal Sullivan 1 sibling, 1 reply; 16+ messages in thread From: Robert Yang @ 2016-09-21 3:11 UTC (permalink / raw) To: California Sullivan, openembedded-core; +Cc: bruce.ashfield Hi, There is an error on autobuilder related to this patch: http://autobuilder.yocto.io:8010/builders/nightly-x86-64-lsb/builds/60/steps/BuildImages_1/logs/stdio // Robert On 09/17/2016 07:48 AM, California Sullivan wrote: > The kernel being built should match what the recipe claims it is > building. This function ensures that happens by comparing the version > information in the kernel's Makefile to the PV the recipe is using. > > v2 changes: > * Match against PV instead of LINUX_VERSION > * Match against EXTRAVERSION as well (e.g., -rc4) > * Cleaned up version string building > > Fixes [YOCTO #6767]. > > Signed-off-by: California Sullivan <california.l.sullivan@intel.com> > --- > meta/classes/kernel.bbclass | 30 ++++++++++++++++++++++++++++++ > meta/recipes-kernel/linux/linux-yocto.inc | 1 + > 2 files changed, 31 insertions(+) > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > index a6112e8..f894795 100644 > --- a/meta/classes/kernel.bbclass > +++ b/meta/classes/kernel.bbclass > @@ -327,6 +327,36 @@ kernel_do_install() { > } > do_install[prefuncs] += "package_get_auto_pr" > > +# Must be ran no earlier than after do_kernel_checkout or else Makefile won't be in ${S}/Makefile > +do_kernel_version_sanity_check() { > + # The Makefile determines the kernel version shown at runtime > + # Don't use KERNEL_VERSION because the headers it grabs the version from aren't generated until do_compile > + VERSION=$(grep "^VERSION =" ${S}/Makefile | sed s/.*=\ *//) > + PATCHLEVEL=$(grep "^PATCHLEVEL =" ${S}/Makefile | sed s/.*=\ *//) > + SUBLEVEL=$(grep "^SUBLEVEL =" ${S}/Makefile | sed s/.*=\ *//) > + EXTRAVERSION=$(grep "^EXTRAVERSION =" ${S}/Makefile | sed s/.*=\ *//) > + > + # Build a string for regex and a plain version string > + reg="^${VERSION}\.${PATCHLEVEL}" > + vers="${VERSION}.${PATCHLEVEL}" > + if [ -n "${SUBLEVEL}" ]; then > + # Ignoring a SUBLEVEL of zero is fine > + if [ "${SUBLEVEL}" = "0" ]; then > + reg="${reg}(\.${SUBLEVEL})?" > + else > + reg="${reg}\.${SUBLEVEL}" > + vers="${vers}.${SUBLEVEL}" > + fi > + fi > + vers="${vers}${EXTRAVERSION}" > + reg="${reg}${EXTRAVERSION}" > + > + if [ -z `echo ${PV} | grep -E "${reg}"` ]; then > + bbfatal "Package Version (${PV}) does not match of kernel being built (${vers}). Please update the PV variable to match the kernel source." > + fi > + exit 0 > +} > + > addtask shared_workdir after do_compile before do_compile_kernelmodules > addtask shared_workdir_setscene > > diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc > index 98a48ec..d979662 100644 > --- a/meta/recipes-kernel/linux/linux-yocto.inc > +++ b/meta/recipes-kernel/linux/linux-yocto.inc > @@ -55,6 +55,7 @@ do_install_append(){ > } > > # extra tasks > +addtask kernel_version_sanity_check after do_kernel_checkout before do_compile > addtask kernel_link_images after do_compile before do_install > addtask validate_branches before do_patch after do_kernel_checkout > addtask kernel_configcheck after do_configure before do_compile > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function 2016-09-21 3:11 ` Robert Yang @ 2016-09-21 16:27 ` Cal Sullivan 0 siblings, 0 replies; 16+ messages in thread From: Cal Sullivan @ 2016-09-21 16:27 UTC (permalink / raw) To: Robert Yang, openembedded-core; +Cc: bruce.ashfield Yes, the PV is set incorrectly here. In b5e7625, the kernel's source was updated to 4.1.32 for genericx86-64, but the LINUX_VERSION variable (which is used to set PV) was not. --- Cal On 09/20/2016 08:11 PM, Robert Yang wrote: > > Hi, > > There is an error on autobuilder related to this patch: > > http://autobuilder.yocto.io:8010/builders/nightly-x86-64-lsb/builds/60/steps/BuildImages_1/logs/stdio > > > // Robert > > On 09/17/2016 07:48 AM, California Sullivan wrote: >> The kernel being built should match what the recipe claims it is >> building. This function ensures that happens by comparing the version >> information in the kernel's Makefile to the PV the recipe is using. >> >> v2 changes: >> * Match against PV instead of LINUX_VERSION >> * Match against EXTRAVERSION as well (e.g., -rc4) >> * Cleaned up version string building >> >> Fixes [YOCTO #6767]. >> >> Signed-off-by: California Sullivan <california.l.sullivan@intel.com> >> --- >> meta/classes/kernel.bbclass | 30 >> ++++++++++++++++++++++++++++++ >> meta/recipes-kernel/linux/linux-yocto.inc | 1 + >> 2 files changed, 31 insertions(+) >> >> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass >> index a6112e8..f894795 100644 >> --- a/meta/classes/kernel.bbclass >> +++ b/meta/classes/kernel.bbclass >> @@ -327,6 +327,36 @@ kernel_do_install() { >> } >> do_install[prefuncs] += "package_get_auto_pr" >> >> +# Must be ran no earlier than after do_kernel_checkout or else >> Makefile won't be in ${S}/Makefile >> +do_kernel_version_sanity_check() { >> + # The Makefile determines the kernel version shown at runtime >> + # Don't use KERNEL_VERSION because the headers it grabs the >> version from aren't generated until do_compile >> + VERSION=$(grep "^VERSION =" ${S}/Makefile | sed s/.*=\ *//) >> + PATCHLEVEL=$(grep "^PATCHLEVEL =" ${S}/Makefile | sed s/.*=\ *//) >> + SUBLEVEL=$(grep "^SUBLEVEL =" ${S}/Makefile | sed s/.*=\ *//) >> + EXTRAVERSION=$(grep "^EXTRAVERSION =" ${S}/Makefile | sed s/.*=\ >> *//) >> + >> + # Build a string for regex and a plain version string >> + reg="^${VERSION}\.${PATCHLEVEL}" >> + vers="${VERSION}.${PATCHLEVEL}" >> + if [ -n "${SUBLEVEL}" ]; then >> + # Ignoring a SUBLEVEL of zero is fine >> + if [ "${SUBLEVEL}" = "0" ]; then >> + reg="${reg}(\.${SUBLEVEL})?" >> + else >> + reg="${reg}\.${SUBLEVEL}" >> + vers="${vers}.${SUBLEVEL}" >> + fi >> + fi >> + vers="${vers}${EXTRAVERSION}" >> + reg="${reg}${EXTRAVERSION}" >> + >> + if [ -z `echo ${PV} | grep -E "${reg}"` ]; then >> + bbfatal "Package Version (${PV}) does not match of kernel >> being built (${vers}). Please update the PV variable to match the >> kernel source." >> + fi >> + exit 0 >> +} >> + >> addtask shared_workdir after do_compile before do_compile_kernelmodules >> addtask shared_workdir_setscene >> >> diff --git a/meta/recipes-kernel/linux/linux-yocto.inc >> b/meta/recipes-kernel/linux/linux-yocto.inc >> index 98a48ec..d979662 100644 >> --- a/meta/recipes-kernel/linux/linux-yocto.inc >> +++ b/meta/recipes-kernel/linux/linux-yocto.inc >> @@ -55,6 +55,7 @@ do_install_append(){ >> } >> >> # extra tasks >> +addtask kernel_version_sanity_check after do_kernel_checkout before >> do_compile >> addtask kernel_link_images after do_compile before do_install >> addtask validate_branches before do_patch after do_kernel_checkout >> addtask kernel_configcheck after do_configure before do_compile >> ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2016-09-21 16:27 UTC | newest] Thread overview: 16+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-09-16 23:48 [PATCH V2 1/1] kernel.bbclass: Add kernel_version_sanity_check function California Sullivan 2016-09-19 15:04 ` Bruce Ashfield 2016-09-19 15:09 ` Burton, Ross 2016-09-19 16:22 ` Burton, Ross 2016-09-19 17:05 ` Cal Sullivan 2016-09-19 18:54 ` Burton, Ross 2016-09-19 19:53 ` Cal Sullivan 2016-09-19 19:55 ` Bruce Ashfield 2016-09-19 20:49 ` Saul Wold 2016-09-19 22:02 ` Cal Sullivan 2016-09-19 22:55 ` Bruce Ashfield 2016-09-19 23:02 ` Cal Sullivan 2016-09-20 0:03 ` Bruce Ashfield 2016-09-20 3:54 ` Bruce Ashfield 2016-09-21 3:11 ` Robert Yang 2016-09-21 16:27 ` Cal Sullivan
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.