[PATCH 1/2] manuals: Remove unnecessary \n from SSTATE_MIRRORS examples

[PATCH 1/2] manuals: Remove unnecessary \n from SSTATE_MIRRORS examples

[Peter Kjellerstedt]

Since commit 044fb04d in bitbake (fetch2: Allow whitespace only mirror
entries) there is no need to separate the entries in SSTATE_MIRRORS
with "\n".

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 documentation/overview-manual/concepts.rst | 2 +-
 documentation/ref-manual/variables.rst     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/documentation/overview-manual/concepts.rst b/documentation/overview-manual/concepts.rst
index 5698d93759..a6bd32a987 100644
--- a/documentation/overview-manual/concepts.rst
+++ b/documentation/overview-manual/concepts.rst
@@ -1904,7 +1904,7 @@ Behind the scenes, the shared state code works by looking in
 shared state files. Here is an example::
 
    SSTATE_MIRRORS ?= "\
-       file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
+       file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \
        file://.* file:///some/local/dir/sstate/PATH"
 
 .. note::
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst
index b0621168ae..456d9ce098 100644
--- a/documentation/ref-manual/variables.rst
+++ b/documentation/ref-manual/variables.rst
@@ -7198,7 +7198,7 @@ system and gives an overview of their function and contents.
       following maps the local search path ``universal-4.9`` to the
       server-provided path server_url_sstate_path::
 
-         SSTATE_MIRRORS ?= "file://universal-4.9/(.*) http://server_url_sstate_path/universal-4.8/\1 \n"
+         SSTATE_MIRRORS ?= "file://universal-4.9/(.*) http://server_url_sstate_path/universal-4.8/\1"
 
       If a mirror uses the same structure as
       :term:`SSTATE_DIR`, you need to add "PATH" at the
@@ -7207,7 +7207,7 @@ system and gives an overview of their function and contents.
       ::
 
          SSTATE_MIRRORS ?= "\
-             file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
+             file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \
              file://.* file:///some-local-dir/sstate/PATH"
 
    :term:`SSTATE_SCAN_FILES`

[PATCH 2/2] test-manual: Correct two references to BB_SKIP_NETTESTS

[Peter Kjellerstedt]

The environment variable used to disable network tests when running
bitbake-selftest was incorrectly referred to as BB_SKIP_NETTEST.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 documentation/test-manual/intro.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/test-manual/intro.rst b/documentation/test-manual/intro.rst
index 4a3a97e29a..9c1a93cd40 100644
--- a/documentation/test-manual/intro.rst
+++ b/documentation/test-manual/intro.rst
@@ -178,10 +178,10 @@ Tests map into the codebase as follows:
 
       $ bitbake-selftest
 
-   To skip tests that access the Internet, use the ``BB_SKIP_NETTEST``
+   To skip tests that access the Internet, use the ``BB_SKIP_NETTESTS``
    variable when running "bitbake-selftest" as follows::
 
-      $ BB_SKIP_NETTEST=yes bitbake-selftest
+      $ BB_SKIP_NETTESTS=yes bitbake-selftest
 
    The default output is quiet and just prints a summary of what was
    run. To see more information, there is a verbose option::

Re: [docs] [PATCH 2/2] test-manual: Correct two references to BB_SKIP_NETTESTS

[Quentin Schulz]

Hi Peter,

On 1/29/22 03:26, Peter Kjellerstedt wrote:
> The environment variable used to disable network tests when running
> bitbake-selftest was incorrectly referred to as BB_SKIP_NETTEST.
> 
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>

Nice catch!

Reviewed-by: Quentin Schulz <foss+yocto@0leil.net>

Thanks!
Quentin

Re: [docs] [PATCH 2/2] test-manual: Correct two references to BB_SKIP_NETTESTS

[Michael Opdenacker]

Peter, Quentin,

On 1/31/22 10:21, Quentin Schulz wrote:
> Hi Peter,
>
> On 1/29/22 03:26, Peter Kjellerstedt wrote:
>> The environment variable used to disable network tests when running
>> bitbake-selftest was incorrectly referred to as BB_SKIP_NETTEST.
>>
>> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
>
> Nice catch!
>
> Reviewed-by: Quentin Schulz <foss+yocto@0leil.net>


Thanks for the patch and review.
Reviewed-by: Michael Opdenacker <michael.opdenacker@bootlin.com>

Merged into master-next.
Michael.

-- 
Michael Opdenacker, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com