bitbake: bitbake-setup: Rename bb-layers-relative to bb-layers-file-relative

The difference between bb-layers and bb-layers-relative is unclear as both
are relative paths. Rename one to "file-relative" which makes it clear it
is relative to the current file, without becomming a long name.

https://lists.openembedded.org/g/bitbake-devel/message/18296

Based on a patch from Alexander Kanavin <alex@linutronix.de> but
with different naming.

(Bitbake rev: dcb17758b99767ab6da4172cf60eabc9269082dd)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/bitbake/lib/bb/tests/setup.py b/bitbake/lib/bb/tests/setup.py
index ba2a90009d..6e9bf03654 100644
--- a/bitbake/lib/bb/tests/setup.py
+++ b/bitbake/lib/bb/tests/setup.py
@@ -148,10 +148,10 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
                 "oe-fragments": ["test-fragment-2"]
             },
             {
-                "name": "gizmo-notemplate-with-relative-layers",
-                "description": "Gizmo notemplate configuration using relative layers",
+                "name": "gizmo-notemplate-with-filerelative-layers",
+                "description": "Gizmo notemplate configuration using filerelative layers",
                 "bb-layers": ["layerC","layerD/meta-layer"],
-                "bb-layers-relative": ["layerE/meta-layer"],
+                "bb-layers-file-relative": ["layerE/meta-layer"],
                 "oe-fragments": ["test-fragment-2"]
             }
         ]
@@ -206,12 +206,12 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
                 bblayers = f.read()
                 for l in bitbake_config["bb-layers"]:
                     self.assertIn(os.path.join(setuppath, "layers", l), bblayers)
-                for l in bitbake_config.get("bb-layers-relative") or []:
-                    relative_layer = os.path.join(
+                for l in bitbake_config.get("bb-layers-file-relative") or []:
+                    filerelative_layer = os.path.join(
                             os.path.dirname(config_upstream["path"]),
                             l,
                         )
-                    self.assertIn(relative_layer, bblayers)
+                    self.assertIn(filerelative_layer, bblayers)
 
         if 'oe-fragment' in bitbake_config.keys():
             for f in bitbake_config["oe-fragments"]:
@@ -298,7 +298,7 @@ print("BBPATH is {{}}".format(os.environ["BBPATH"]))
                                                                   'gizmo-env-passthrough',
                                                                   'gizmo-no-fragment',
                                                                   'gadget-notemplate','gizmo-notemplate',
-                                                                  'gizmo-notemplate-with-relative-layers')}
+                                                                  'gizmo-notemplate-with-filerelative-layers')}
                                }
         for cf, v in test_configurations.items():
             for c in v['buildconfigs']: