From 33083dd825d8c44ad25450d03e6319aac18443f6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 18 Mar 2022 12:00:08 +0000 Subject: [PATCH] poky.yaml: Drop POKYVERSION and YOCTO_POKY references We don't publish tarballs using this version any more, it has been removed everywhere. Remove the obsolete references in the docs, adapting references accordingly. The tarballs now are just created with their sha256 checksum which we don't want or need to reference in the docs. (From yocto-docs rev: c7a0ac88b01c48f3d9209536542bf43ae7a7937f) Signed-off-by: Richard Purdie Reviewed-by: Michael Opdenacker Signed-off-by: Richard Purdie --- documentation/dev-manual/start.rst | 4 +--- .../overview-manual/development-environment.rst | 2 +- documentation/poky.yaml | 2 -- documentation/ref-manual/terms.rst | 14 +++++++------- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/documentation/dev-manual/start.rst b/documentation/dev-manual/start.rst index 701d3cf4dc..96fabac1aa 100644 --- a/documentation/dev-manual/start.rst +++ b/documentation/dev-manual/start.rst @@ -647,9 +647,7 @@ Follow these steps to locate and download a particular tarball: 3. *Find the Tarball:* Drill down to find the associated tarball. For example, click on ``yocto-&DISTRO;`` to view files associated with the - Yocto Project &DISTRO; release (e.g. - ``&YOCTO_POKY;.tar.bz2``, which is the - released Poky tarball). + Yocto Project &DISTRO; release. 4. *Download the Tarball:* Click the tarball to download and save a snapshot of the given component. diff --git a/documentation/overview-manual/development-environment.rst b/documentation/overview-manual/development-environment.rst index fc193f3135..9c9c8e87a0 100644 --- a/documentation/overview-manual/development-environment.rst +++ b/documentation/overview-manual/development-environment.rst @@ -461,7 +461,7 @@ and clicking on the ``[...]`` link beneath the "Tag" heading. Some key tags for the ``poky`` repository are ``jethro-14.0.3``, ``morty-16.0.1``, ``pyro-17.0.0``, and -``&DISTRO_NAME_NO_CAP;-&POKYVERSION;``. These tags represent Yocto Project +``&DISTRO_NAME_NO_CAP;-&DISTRO;``. These tags represent Yocto Project releases. When you create a local copy of the Git repository, you also have access diff --git a/documentation/poky.yaml b/documentation/poky.yaml index 4f4f3e3a99..c8a890c40a 100644 --- a/documentation/poky.yaml +++ b/documentation/poky.yaml @@ -6,8 +6,6 @@ DISTRO_NAME_NO_CAP_LTS : "dunfell" YOCTO_DOC_VERSION : "3.4.2" YOCTO_DOC_VERSION_MINUS_ONE : "3.3.5" DISTRO_REL_TAG : "yocto-3.4.2" -POKYVERSION : "26.0.2" -YOCTO_POKY : "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;" YOCTO_DL_URL : "https://downloads.yoctoproject.org" YOCTO_AB_URL : "https://autobuilder.yoctoproject.org" YOCTO_RELEASE_DL_URL : "&YOCTO_DL_URL;/releases/yocto/yocto-&DISTRO;" diff --git a/documentation/ref-manual/terms.rst b/documentation/ref-manual/terms.rst index 3f18d3404e..cba514c345 100644 --- a/documentation/ref-manual/terms.rst +++ b/documentation/ref-manual/terms.rst @@ -88,11 +88,11 @@ universal, the list includes them just in case: - Provide a directory path and specifically name the Build Directory. Any intermediate folders in the pathname must exist. This next example creates a Build Directory named - ``YP-&POKYVERSION;`` within the existing directory ``mybuilds``: + ``YP-&DISTRO;`` within the existing directory ``mybuilds``: .. code-block:: shell - $ source poky/oe-init-build-env mybuilds/YP-&POKYVERSION; + $ source poky/oe-init-build-env mybuilds/YP-&DISTRO; .. note:: @@ -357,13 +357,13 @@ universal, the list includes them just in case: repository results in a local Git repository whose top-level folder is also named "poky". - While it is not recommended that you use tarball expansion to set up + While it is not recommended that you use tarball extraction to set up the Source Directory, if you do, the top-level directory name of the Source Directory is derived from the Yocto Project release tarball. - For example, downloading and unpacking - :yocto_dl:`/releases/yocto/&DISTRO_REL_TAG;/&YOCTO_POKY;.tar.bz2` - results in a Source Directory whose root folder is named - ``&YOCTO_POKY;``. + For example, downloading and unpacking poky tarballs from + :yocto_dl:`/releases/yocto/&DISTRO_REL_TAG;/` + results in a Source Directory whose root folder is named poky. + It is important to understand the differences between the Source Directory created by unpacking a released tarball as compared to