diff options
author | 2024-06-24 13:10:55 -0600 | |
---|---|---|
committer | 2024-06-27 13:03:32 +0100 | |
commit | 812c114a8a872ad59b19c7ffb8c1f230fc64c823 (patch) | |
tree | 5ea7016922146b9ffb08a873d77eaabf09cf6105 | |
parent | 9a2ed52473a3e4eb662509824ef8e59520ebdefb (diff) | |
download | openembedded-core-812c114a8a872ad59b19c7ffb8c1f230fc64c823.tar.gz |
binutils-cross-testsuite: Rename to binutils-testsuite
This recipe needs to be renamed because the "-cross-" substring in the
name triggers the cross architecture detection in sstate, but this
recipe is not actually a cross recipe.
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes-global/mirrors.bbclass | 2 | ||||
-rw-r--r-- | meta/conf/distro/include/maintainers.inc | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/binutils.py | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-testsuite_2.42.bb (renamed from meta/recipes-devtools/binutils/binutils-cross-testsuite_2.42.bb) | 3 |
4 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes-global/mirrors.bbclass b/meta/classes-global/mirrors.bbclass index 862648eec5..d68d30b0f2 100644 --- a/meta/classes-global/mirrors.bbclass +++ b/meta/classes-global/mirrors.bbclass @@ -88,7 +88,7 @@ git://.*/.* git://HOST/git/PATH;protocol=https \ BB_GIT_SHALLOW:pn-binutils = "1" BB_GIT_SHALLOW:pn-binutils-cross-${TARGET_ARCH} = "1" BB_GIT_SHALLOW:pn-binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "1" -BB_GIT_SHALLOW:pn-binutils-cross-testsuite = "1" +BB_GIT_SHALLOW:pn-binutils-testsuite = "1" BB_GIT_SHALLOW:pn-binutils-crosssdk-${SDK_SYS} = "1" BB_GIT_SHALLOW:pn-binutils-native = "1" BB_GIT_SHALLOW:pn-nativesdk-binutils = "1" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 7294088727..37ad293e32 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -64,7 +64,7 @@ RECIPE_MAINTAINER:pn-bind = "Unassigned <unassigned@yoctoproject.org>" RECIPE_MAINTAINER:pn-binutils = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER:pn-binutils-cross-${TARGET_ARCH} = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER:pn-binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <raj.khem@gmail.com>" -RECIPE_MAINTAINER:pn-binutils-cross-testsuite = "Khem Raj <raj.khem@gmail.com>" +RECIPE_MAINTAINER:pn-binutils-testsuite = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER:pn-binutils-crosssdk-${SDK_SYS} = "Khem Raj <raj.khem@gmail.com>" RECIPE_MAINTAINER:pn-bison = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER:pn-blktool = "Yi Zhao <yi.zhao@windriver.com>" diff --git a/meta/lib/oeqa/selftest/cases/binutils.py b/meta/lib/oeqa/selftest/cases/binutils.py index 1688eabe4e..5ff263d342 100644 --- a/meta/lib/oeqa/selftest/cases/binutils.py +++ b/meta/lib/oeqa/selftest/cases/binutils.py @@ -33,7 +33,7 @@ class BinutilsCrossSelfTest(OESelftestTestCase, OEPTestResultTestCase): features.append('CHECK_TARGETS = "{0}"'.format(suite)) self.write_config("\n".join(features)) - recipe = "binutils-cross-testsuite" + recipe = "binutils-testsuite" bb_vars = get_bb_vars(["B", "TARGET_SYS", "T"], recipe) builddir, target_sys, tdir = bb_vars["B"], bb_vars["TARGET_SYS"], bb_vars["T"] diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.42.bb b/meta/recipes-devtools/binutils/binutils-testsuite_2.42.bb index 630815c7a3..f2facd52c3 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.42.bb +++ b/meta/recipes-devtools/binutils/binutils-testsuite_2.42.bb @@ -1,3 +1,6 @@ +# NOTE: This recipe cannot have -cross- in the file name because it triggers +# the cross build detection in sstate which causes it to use the wrong +# architecture require binutils.inc require binutils-${PV}.inc |