From be0088da5ab4df6406f3a3fd20ace00dd686a193 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 4 Oct 2023 19:08:36 -0700 Subject: [PATCH] images: Rename ptest images to rhyme with oe-core ptest images Easy to understand for new-comers. Signed-off-by: Khem Raj (cherry picked from commit 7b5cb622b4e40ceb7b150c83ee98c40fd24ab9aa) Signed-off-by: Armin Kuster --- ...{meta-oe-ptest-all-image.bb => meta-oe-image-ptest-all.bb} | 4 ++-- ...eta-oe-ptest-fast-image.bb => meta-oe-image-ptest-fast.bb} | 2 +- .../images/{meta-oe-ptest-image.bb => meta-oe-image-ptest.bb} | 0 ...a-perl-ptest-all-image.bb => meta-perl-image-ptest-all.bb} | 4 ++-- ...perl-ptest-fast-image.bb => meta-perl-image-ptest-fast.bb} | 2 +- .../{meta-perl-ptest-image.bb => meta-perl-image-ptest.bb} | 0 ...thon-ptest-all-image.bb => meta-python-image-ptest-all.bb} | 4 ++-- ...on-ptest-fast-image.bb => meta-python-image-ptest-fast.bb} | 2 +- ...{meta-python-ptest-image.bb => meta-python-image-ptest.bb} | 0 9 files changed, 9 insertions(+), 9 deletions(-) rename meta-oe/recipes-core/images/{meta-oe-ptest-all-image.bb => meta-oe-image-ptest-all.bb} (84%) rename meta-oe/recipes-core/images/{meta-oe-ptest-fast-image.bb => meta-oe-image-ptest-fast.bb} (77%) rename meta-oe/recipes-core/images/{meta-oe-ptest-image.bb => meta-oe-image-ptest.bb} (100%) rename meta-perl/recipes-core/images/{meta-perl-ptest-all-image.bb => meta-perl-image-ptest-all.bb} (84%) rename meta-perl/recipes-core/images/{meta-perl-ptest-fast-image.bb => meta-perl-image-ptest-fast.bb} (77%) rename meta-perl/recipes-core/images/{meta-perl-ptest-image.bb => meta-perl-image-ptest.bb} (100%) rename meta-python/recipes-core/images/{meta-python-ptest-all-image.bb => meta-python-image-ptest-all.bb} (85%) rename meta-python/recipes-core/images/{meta-python-ptest-fast-image.bb => meta-python-image-ptest-fast.bb} (77%) rename meta-python/recipes-core/images/{meta-python-ptest-image.bb => meta-python-image-ptest.bb} (100%) diff --git a/meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb b/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb similarity index 84% rename from meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb rename to meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb index 0ea03dd2e3..e8e1750b0e 100644 --- a/meta-oe/recipes-core/images/meta-oe-ptest-all-image.bb +++ b/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb @@ -12,9 +12,9 @@ require conf/include/ptest-packagelists-meta-oe.inc PTESTS_META_OE = "${PTESTS_FAST_META_OE} ${PTESTS_SLOW_META_OE}" do_testimage[noexec] = "1" -do_testimage[depends] = "${@' '.join(['meta-oe-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_OE').split()])}" +do_testimage[depends] = "${@' '.join(['meta-oe-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_OE').split()])}" -do_build[depends] = "${@' '.join(['meta-oe-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_OE').split()])}" +do_build[depends] = "${@' '.join(['meta-oe-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_OE').split()])}" # normally image.bbclass would do this EXCLUDE_FROM_WORLD = "1" diff --git a/meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb b/meta-oe/recipes-core/images/meta-oe-image-ptest-fast.bb similarity index 77% rename from meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb rename to meta-oe/recipes-core/images/meta-oe-image-ptest-fast.bb index f56e841ff1..46b48d65d6 100644 --- a/meta-oe/recipes-core/images/meta-oe-ptest-fast-image.bb +++ b/meta-oe/recipes-core/images/meta-oe-image-ptest-fast.bb @@ -1,4 +1,4 @@ -require meta-oe-ptest-all-image.bb +require meta-oe-image-ptest-all.bb DESCRIPTION = "Recipe to trigger execution of all fast meta-oe ptest images." diff --git a/meta-oe/recipes-core/images/meta-oe-ptest-image.bb b/meta-oe/recipes-core/images/meta-oe-image-ptest.bb similarity index 100% rename from meta-oe/recipes-core/images/meta-oe-ptest-image.bb rename to meta-oe/recipes-core/images/meta-oe-image-ptest.bb diff --git a/meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb b/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb similarity index 84% rename from meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb rename to meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb index 236043c22a..e2cafa98a5 100644 --- a/meta-perl/recipes-core/images/meta-perl-ptest-all-image.bb +++ b/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb @@ -12,9 +12,9 @@ require conf/include/ptest-packagelists-meta-perl.inc PTESTS_META_PERL = "${PTESTS_FAST_META_PERL} ${PTESTS_SLOW_META_PERL}" do_testimage[noexec] = "1" -do_testimage[depends] = "${@' '.join(['meta-perl-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PERL').split()])}" +do_testimage[depends] = "${@' '.join(['meta-perl-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PERL').split()])}" -do_build[depends] = "${@' '.join(['meta-perl-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_PERL').split()])}" +do_build[depends] = "${@' '.join(['meta-perl-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_PERL').split()])}" # normally image.bbclass would do this EXCLUDE_FROM_WORLD = "1" diff --git a/meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb b/meta-perl/recipes-core/images/meta-perl-image-ptest-fast.bb similarity index 77% rename from meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb rename to meta-perl/recipes-core/images/meta-perl-image-ptest-fast.bb index 5d8afa08e7..1ac78f30b7 100644 --- a/meta-perl/recipes-core/images/meta-perl-ptest-fast-image.bb +++ b/meta-perl/recipes-core/images/meta-perl-image-ptest-fast.bb @@ -1,4 +1,4 @@ -require meta-perl-ptest-all-image.bb +require meta-perl-image-ptest-all.bb DESCRIPTION = "Recipe to trigger execution of all fast meta-perl ptest images." diff --git a/meta-perl/recipes-core/images/meta-perl-ptest-image.bb b/meta-perl/recipes-core/images/meta-perl-image-ptest.bb similarity index 100% rename from meta-perl/recipes-core/images/meta-perl-ptest-image.bb rename to meta-perl/recipes-core/images/meta-perl-image-ptest.bb diff --git a/meta-python/recipes-core/images/meta-python-ptest-all-image.bb b/meta-python/recipes-core/images/meta-python-image-ptest-all.bb similarity index 85% rename from meta-python/recipes-core/images/meta-python-ptest-all-image.bb rename to meta-python/recipes-core/images/meta-python-image-ptest-all.bb index fd4dc42487..56c392f036 100644 --- a/meta-python/recipes-core/images/meta-python-ptest-all-image.bb +++ b/meta-python/recipes-core/images/meta-python-image-ptest-all.bb @@ -12,9 +12,9 @@ require conf/include/ptest-packagelists-meta-python.inc PTESTS_META_PYTHON = "${PTESTS_FAST_META_PYTHON} ${PTESTS_SLOW_META_PYTHON}" do_testimage[noexec] = "1" -do_testimage[depends] = "${@' '.join(['meta-python-ptest-image-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PYTHON').split()])}" +do_testimage[depends] = "${@' '.join(['meta-python-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PYTHON').split()])}" -do_build[depends] = "${@' '.join(['meta-python-ptest-image-'+x+':do_build' for x in d.getVar('PTESTS_META_PYTHON').split()])}" +do_build[depends] = "${@' '.join(['meta-python-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_PYTHON').split()])}" # normally image.bbclass would do this EXCLUDE_FROM_WORLD = "1" diff --git a/meta-python/recipes-core/images/meta-python-ptest-fast-image.bb b/meta-python/recipes-core/images/meta-python-image-ptest-fast.bb similarity index 77% rename from meta-python/recipes-core/images/meta-python-ptest-fast-image.bb rename to meta-python/recipes-core/images/meta-python-image-ptest-fast.bb index 4f93a15959..bb6e8213fe 100644 --- a/meta-python/recipes-core/images/meta-python-ptest-fast-image.bb +++ b/meta-python/recipes-core/images/meta-python-image-ptest-fast.bb @@ -1,4 +1,4 @@ -require meta-python-ptest-all-image.bb +require meta-python-image-ptest-all.bb DESCRIPTION = "Recipe to trigger execution of all fast meta-python ptest images." diff --git a/meta-python/recipes-core/images/meta-python-ptest-image.bb b/meta-python/recipes-core/images/meta-python-image-ptest.bb similarity index 100% rename from meta-python/recipes-core/images/meta-python-ptest-image.bb rename to meta-python/recipes-core/images/meta-python-image-ptest.bb