mbox series

[meta-zephyr,0/4] Add script for version upgrades

Message ID 20220916090318.1293922-1-peter.hoyes@arm.com
Headers show
Series Add script for version upgrades | expand

Message

Peter Hoyes Sept. 16, 2022, 9:03 a.m. UTC 
From: Peter Hoyes <Peter.Hoyes@arm.com>

This patch chain has been developed on top of the 2.7.3 upgrade patch.

Add a script, generate-version.py, which can be used to automatically 
generate configuration for new Zephyr versions. Regenerate
configuration for 2.7.3 and 3.1.0 using this script.

This script includes a constant version-specific declaration of
ZEPHYR_MODULES, so the build-time logic to extract ZEPHYR_MODULES is no
longer required. Remove the do_get_zmods task and the West recipe.

Peter Hoyes (4):
  zephyr-core/scripts: Introduce script to generate new versions
  zephyr-core/zephyr-kernel: Migrate to script-driven version files
  zephyr-core/classes: Remove West-based logic from zephyr.bbclass
  zephyr-core/zephyr-kernel: Update dtc.patch Upstream-Status

 README.txt                                    |  17 ++
 meta-zephyr-core/classes/zephyr.bbclass       |  32 +--
 .../recipes-devtools/west/west_0.12.99.bb     |  22 --
 ...y-generation-issue-in-cross-compila.patch} |   0
 .../zephyr-kernel/files/dtc.patch             |   2 +-
 .../zephyr-kernel/zephyr-kernel-src-2.7.3.inc | 202 +++++++++++++---
 .../zephyr-kernel/zephyr-kernel-src-3.1.0.inc | 220 +++++++++++++++---
 .../zephyr-kernel/zephyr-kernel-src.inc       |  43 ----
 meta-zephyr-core/scripts/generate-version.py  |  73 ++++++
 .../scripts/zephyr-kernel-src.inc.jinja       |  35 +++
 10 files changed, 474 insertions(+), 172 deletions(-)
 delete mode 100644 meta-zephyr-core/recipes-devtools/west/west_0.12.99.bb
 rename meta-zephyr-core/recipes-kernel/zephyr-kernel/files/{0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch => 0001-2.7-x86-fix-efi-binary-generation-issue-in-cross-compila.patch} (100%)
 create mode 100755 meta-zephyr-core/scripts/generate-version.py
 create mode 100644 meta-zephyr-core/scripts/zephyr-kernel-src.inc.jinja

Comments

Jon Mason Sept. 20, 2022, 10:33 p.m. UTC | #1 
On Fri, Sep 16, 2022 at 10:03:14AM +0100, Peter Hoyes wrote:
> From: Peter Hoyes <Peter.Hoyes@arm.com>
> 
> This patch chain has been developed on top of the 2.7.3 upgrade patch.
> 
> Add a script, generate-version.py, which can be used to automatically 
> generate configuration for new Zephyr versions. Regenerate
> configuration for 2.7.3 and 3.1.0 using this script.
> 
> This script includes a constant version-specific declaration of
> ZEPHYR_MODULES, so the build-time logic to extract ZEPHYR_MODULES is no
> longer required. Remove the do_get_zmods task and the West recipe.
> 
> Peter Hoyes (4):
>   zephyr-core/scripts: Introduce script to generate new versions
>   zephyr-core/zephyr-kernel: Migrate to script-driven version files
>   zephyr-core/classes: Remove West-based logic from zephyr.bbclass
>   zephyr-core/zephyr-kernel: Update dtc.patch Upstream-Status

Series passes CI (on top of the v2.7.3 patch).  See
https://gitlab.com/jonmason00/meta-zephyr/-/pipelines/645914527

Tested-by: Jon Mason <jon.mason@arm.com>

> 
>  README.txt                                    |  17 ++
>  meta-zephyr-core/classes/zephyr.bbclass       |  32 +--
>  .../recipes-devtools/west/west_0.12.99.bb     |  22 --
>  ...y-generation-issue-in-cross-compila.patch} |   0
>  .../zephyr-kernel/files/dtc.patch             |   2 +-
>  .../zephyr-kernel/zephyr-kernel-src-2.7.3.inc | 202 +++++++++++++---
>  .../zephyr-kernel/zephyr-kernel-src-3.1.0.inc | 220 +++++++++++++++---
>  .../zephyr-kernel/zephyr-kernel-src.inc       |  43 ----
>  meta-zephyr-core/scripts/generate-version.py  |  73 ++++++
>  .../scripts/zephyr-kernel-src.inc.jinja       |  35 +++
>  10 files changed, 474 insertions(+), 172 deletions(-)
>  delete mode 100644 meta-zephyr-core/recipes-devtools/west/west_0.12.99.bb
>  rename meta-zephyr-core/recipes-kernel/zephyr-kernel/files/{0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch => 0001-2.7-x86-fix-efi-binary-generation-issue-in-cross-compila.patch} (100%)
>  create mode 100755 meta-zephyr-core/scripts/generate-version.py
>  create mode 100644 meta-zephyr-core/scripts/zephyr-kernel-src.inc.jinja
> 
> -- 
> 2.25.1
> 
>
Naveen Saini Sept. 21, 2022, 8:49 a.m. UTC | #2 
Thanks Jon. Merged.

Regards,
Naveen

> -----Original Message-----
> From: yocto@lists.yoctoproject.org <yocto@lists.yoctoproject.org> On
> Behalf Of Jon Mason
> Sent: Wednesday, September 21, 2022 6:34 AM
> To: Peter Hoyes <peter.hoyes@arm.com>
> Cc: yocto@lists.yoctoproject.org; diego.sueiro@arm.com
> Subject: Re: [yocto] [meta-zephyr][PATCH 0/4] Add script for version
> upgrades
> 
> On Fri, Sep 16, 2022 at 10:03:14AM +0100, Peter Hoyes wrote:
> > From: Peter Hoyes <Peter.Hoyes@arm.com>
> >
> > This patch chain has been developed on top of the 2.7.3 upgrade patch.
> >
> > Add a script, generate-version.py, which can be used to automatically
> > generate configuration for new Zephyr versions. Regenerate
> > configuration for 2.7.3 and 3.1.0 using this script.
> >
> > This script includes a constant version-specific declaration of
> > ZEPHYR_MODULES, so the build-time logic to extract ZEPHYR_MODULES is
> > no longer required. Remove the do_get_zmods task and the West recipe.
> >
> > Peter Hoyes (4):
> >   zephyr-core/scripts: Introduce script to generate new versions
> >   zephyr-core/zephyr-kernel: Migrate to script-driven version files
> >   zephyr-core/classes: Remove West-based logic from zephyr.bbclass
> >   zephyr-core/zephyr-kernel: Update dtc.patch Upstream-Status
> 
> Series passes CI (on top of the v2.7.3 patch).  See
> https://gitlab.com/jonmason00/meta-zephyr/-/pipelines/645914527
> 
> Tested-by: Jon Mason <jon.mason@arm.com>
> 
> >
> >  README.txt                                    |  17 ++
> >  meta-zephyr-core/classes/zephyr.bbclass       |  32 +--
> >  .../recipes-devtools/west/west_0.12.99.bb     |  22 --
> >  ...y-generation-issue-in-cross-compila.patch} |   0
> >  .../zephyr-kernel/files/dtc.patch             |   2 +-
> >  .../zephyr-kernel/zephyr-kernel-src-2.7.3.inc | 202 +++++++++++++---
> > .../zephyr-kernel/zephyr-kernel-src-3.1.0.inc | 220 +++++++++++++++---
> >  .../zephyr-kernel/zephyr-kernel-src.inc       |  43 ----
> >  meta-zephyr-core/scripts/generate-version.py  |  73 ++++++
> >  .../scripts/zephyr-kernel-src.inc.jinja       |  35 +++
> >  10 files changed, 474 insertions(+), 172 deletions(-)  delete mode
> > 100644 meta-zephyr-core/recipes-devtools/west/west_0.12.99.bb
> >  rename
> > meta-zephyr-core/recipes-kernel/zephyr-kernel/files/{0001-x86-fix-efi-
> > binary-generation-issue-in-cross-compila.patch =>
> > 0001-2.7-x86-fix-efi-binary-generation-issue-in-cross-compila.patch}
> > (100%)  create mode 100755
> > meta-zephyr-core/scripts/generate-version.py
> >  create mode 100644
> > meta-zephyr-core/scripts/zephyr-kernel-src.inc.jinja
> >
> > --
> > 2.25.1
> >
> >