| Message ID | 20230503223456.23985-1-mhalstead@linuxfoundation.org |
|---|---|
| State | Accepted |
| Commit | 5321befbfdc014d469b298bdd5b31d684231b2cb |
| Headers | show |
| Series | docs: add support for mickledore (4.2) release | expand |
Hi Michael, On 04.05.23 at 00:34, Michael Halstead wrote: > This adds support for the Mickledore (4.2) release and update the > current dev branch to Nanbield. > > Signed-off-by: Michael Halstead <mhalstead@linuxfoundation.org> > --- > documentation/poky.yaml.in | 12 ++++++------ > documentation/set_versions.py | 6 ++++-- > 2 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/documentation/poky.yaml.in b/documentation/poky.yaml.in > index 1c072c1d0..b2b6a6330 100644 > --- a/documentation/poky.yaml.in > +++ b/documentation/poky.yaml.in > @@ -1,10 +1,10 @@ > -DISTRO : "4.1" > -DISTRO_NAME_NO_CAP : "langdale" > -DISTRO_NAME : "Langdale" > -DISTRO_NAME_NO_CAP_MINUS_ONE : "kirkstone" > +DISTRO : "4.2" > +DISTRO_NAME_NO_CAP : "mickledore" > +DISTRO_NAME : "Mickledore" > +DISTRO_NAME_NO_CAP_MINUS_ONE : "langdale" > DISTRO_NAME_NO_CAP_LTS : "kirkstone" > -YOCTO_DOC_VERSION : "4.1" > -DISTRO_REL_TAG : "yocto-4.1" > +YOCTO_DOC_VERSION : "4.2" > +DISTRO_REL_TAG : "yocto-4.2" > DOCCONF_VERSION : "dev" > BITBAKE_SERIES : "" > YOCTO_DL_URL : "https://downloads.yoctoproject.org" > diff --git a/documentation/set_versions.py b/documentation/set_versions.py > index efaebe43b..354dabe61 100755 > --- a/documentation/set_versions.py > +++ b/documentation/set_versions.py > @@ -26,8 +26,8 @@ ourversion = None > if len(sys.argv) == 2: > ourversion = sys.argv[1] > > -activereleases = ["langdale", "kirkstone", "dunfell"] > -devbranch = "mickledore" > +activereleases = ["mickledore", "kirkstone", "dunfell"] > +devbranch = "nanbield" > ltsseries = ["kirkstone", "dunfell"] > > # used by run-docs-builds to get the default page > @@ -36,6 +36,7 @@ if ourversion == "getlatest": > sys.exit(0) > > release_series = collections.OrderedDict() > +release_series["nanbield"] = "4.3" > release_series["mickledore"] = "4.2" > release_series["langdale"] = "4.1" > release_series["kirkstone"] = "4.0" > @@ -66,6 +67,7 @@ release_series["laverne"] = "0.9" > > > bitbake_mapping = { > + "nanbield" : "2.6", > "mickledore" : "2.4", > "langdale" : "2.2", > "kirkstone" : "2.0", Thanks for the update! I feel the release coming :) Reviewed-by: Michael Opdenacker <michael.opdenacker@bootlin.com> ... and merged into master-next. Thanks again Michael.
After this patch the docs are labeling both 4.2 and 4.2.999 as Mickledore. Is that correct or should 4.2.999 use the devbranch name? Also it marks 4.1.3 as obsolete already. Is that correct or is it supported until the end of May? On Thu, May 4, 2023 at 12:47 AM Michael Opdenacker < michael.opdenacker@bootlin.com> wrote: > Hi Michael, > > On 04.05.23 at 00:34, Michael Halstead wrote: > > This adds support for the Mickledore (4.2) release and update the > > current dev branch to Nanbield. > > > > Signed-off-by: Michael Halstead <mhalstead@linuxfoundation.org> > > --- > > documentation/poky.yaml.in | 12 ++++++------ > > documentation/set_versions.py | 6 ++++-- > > 2 files changed, 10 insertions(+), 8 deletions(-) > > > > diff --git a/documentation/poky.yaml.in b/documentation/poky.yaml.in > > index 1c072c1d0..b2b6a6330 100644 > > --- a/documentation/poky.yaml.in > > +++ b/documentation/poky.yaml.in > > @@ -1,10 +1,10 @@ > > -DISTRO : "4.1" > > -DISTRO_NAME_NO_CAP : "langdale" > > -DISTRO_NAME : "Langdale" > > -DISTRO_NAME_NO_CAP_MINUS_ONE : "kirkstone" > > +DISTRO : "4.2" > > +DISTRO_NAME_NO_CAP : "mickledore" > > +DISTRO_NAME : "Mickledore" > > +DISTRO_NAME_NO_CAP_MINUS_ONE : "langdale" > > DISTRO_NAME_NO_CAP_LTS : "kirkstone" > > -YOCTO_DOC_VERSION : "4.1" > > -DISTRO_REL_TAG : "yocto-4.1" > > +YOCTO_DOC_VERSION : "4.2" > > +DISTRO_REL_TAG : "yocto-4.2" > > DOCCONF_VERSION : "dev" > > BITBAKE_SERIES : "" > > YOCTO_DL_URL : "https://downloads.yoctoproject.org" > > diff --git a/documentation/set_versions.py > b/documentation/set_versions.py > > index efaebe43b..354dabe61 100755 > > --- a/documentation/set_versions.py > > +++ b/documentation/set_versions.py > > @@ -26,8 +26,8 @@ ourversion = None > > if len(sys.argv) == 2: > > ourversion = sys.argv[1] > > > > -activereleases = ["langdale", "kirkstone", "dunfell"] > > -devbranch = "mickledore" > > +activereleases = ["mickledore", "kirkstone", "dunfell"] > > +devbranch = "nanbield" > > ltsseries = ["kirkstone", "dunfell"] > > > > # used by run-docs-builds to get the default page > > @@ -36,6 +36,7 @@ if ourversion == "getlatest": > > sys.exit(0) > > > > release_series = collections.OrderedDict() > > +release_series["nanbield"] = "4.3" > > release_series["mickledore"] = "4.2" > > release_series["langdale"] = "4.1" > > release_series["kirkstone"] = "4.0" > > @@ -66,6 +67,7 @@ release_series["laverne"] = "0.9" > > > > > > bitbake_mapping = { > > + "nanbield" : "2.6", > > "mickledore" : "2.4", > > "langdale" : "2.2", > > "kirkstone" : "2.0", > > > Thanks for the update! I feel the release coming :) > Reviewed-by: Michael Opdenacker <michael.opdenacker@bootlin.com> > ... and merged into master-next. > > Thanks again > Michael. > > -- > Michael Opdenacker, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > >
On Thu, 2023-05-04 at 12:47 -0700, Michael Halstead wrote: > After this patch the docs are labeling both 4.2 and 4.2.999 as > Mickledore. Is that correct or should 4.2.999 use the > devbranch name? 4.2.999 is confusing but correct as the code stands today, it means "latest unreleased mickledore branch". We really need to do something better. > Also it marks 4.1.3 as obsolete already. Is that correct or is it > supported until the end of May? 4.1 is supported until the end of May. Cheers, Richard
On 04.05.23 at 22:32, Richard Purdie wrote: > On Thu, 2023-05-04 at 12:47 -0700, Michael Halstead wrote: >> After this patch the docs are labeling both 4.2 and 4.2.999 as >> Mickledore. Is that correct or should 4.2.999 use the >> devbranch name? > 4.2.999 is confusing but correct as the code stands today, it means > "latest unreleased mickledore branch". We really need to do something > better. Would 4.2.x be better? It would be less confusing and "4.2.x" > "4.2.999" if we're comparing version strings. Cheers Michael.
diff --git a/documentation/poky.yaml.in b/documentation/poky.yaml.in index 1c072c1d0..b2b6a6330 100644 --- a/documentation/poky.yaml.in +++ b/documentation/poky.yaml.in @@ -1,10 +1,10 @@ -DISTRO : "4.1" -DISTRO_NAME_NO_CAP : "langdale" -DISTRO_NAME : "Langdale" -DISTRO_NAME_NO_CAP_MINUS_ONE : "kirkstone" +DISTRO : "4.2" +DISTRO_NAME_NO_CAP : "mickledore" +DISTRO_NAME : "Mickledore" +DISTRO_NAME_NO_CAP_MINUS_ONE : "langdale" DISTRO_NAME_NO_CAP_LTS : "kirkstone" -YOCTO_DOC_VERSION : "4.1" -DISTRO_REL_TAG : "yocto-4.1" +YOCTO_DOC_VERSION : "4.2" +DISTRO_REL_TAG : "yocto-4.2" DOCCONF_VERSION : "dev" BITBAKE_SERIES : "" YOCTO_DL_URL : "https://downloads.yoctoproject.org" diff --git a/documentation/set_versions.py b/documentation/set_versions.py index efaebe43b..354dabe61 100755 --- a/documentation/set_versions.py +++ b/documentation/set_versions.py @@ -26,8 +26,8 @@ ourversion = None if len(sys.argv) == 2: ourversion = sys.argv[1] -activereleases = ["langdale", "kirkstone", "dunfell"] -devbranch = "mickledore" +activereleases = ["mickledore", "kirkstone", "dunfell"] +devbranch = "nanbield" ltsseries = ["kirkstone", "dunfell"] # used by run-docs-builds to get the default page @@ -36,6 +36,7 @@ if ourversion == "getlatest": sys.exit(0) release_series = collections.OrderedDict() +release_series["nanbield"] = "4.3" release_series["mickledore"] = "4.2" release_series["langdale"] = "4.1" release_series["kirkstone"] = "4.0" @@ -66,6 +67,7 @@ release_series["laverne"] = "0.9" bitbake_mapping = { + "nanbield" : "2.6", "mickledore" : "2.4", "langdale" : "2.2", "kirkstone" : "2.0",
This adds support for the Mickledore (4.2) release and update the current dev branch to Nanbield. Signed-off-by: Michael Halstead <mhalstead@linuxfoundation.org> --- documentation/poky.yaml.in | 12 ++++++------ documentation/set_versions.py | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-)