Skip to contentSkip to conversation

manuals: Remove unnecessary \n from SSTATE_MIRRORS examples

PATCH Applied Peter Kjellerstedt 3 participants 4 messages Jan 29, 2022 – Jan 31, 2022

lore
Share & tools
lore
#0 lore raw

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

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

---
 documentation/overview-manual/concepts.rst | 2 +-
 documentation/ref-manual/variables.rst     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
documentation/overview-manual/concepts.rst +1 -1
index 5698d93759..a6bd32a987 100644
@@ -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::
documentation/ref-manual/variables.rst +2 -2
index b0621168ae..456d9ce098 100644
@@ -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`
#1 lore raw

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

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

---
 documentation/test-manual/intro.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
documentation/test-manual/intro.rst +2 -2
index 4a3a97e29a..9c1a93cd40 100644
@@ -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::
Reviewed-by Applied
#3 lore raw

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

Peter, Quentin,

Quoted 11 lines · Quentin Schulz

Hi Peter,

Quoted 4 lines · Peter Kjellerstedt

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

Nice catch!

Thanks for the patch and review.

Merged into master-next.
Michael.

Signature · 3 lines
Michael Opdenacker, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com