diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-08 15:49:44 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-02 10:24:50 +0100 |
commit | 9a20fbe23f63d87e30b0291ae1dba863c0f5de31 (patch) | |
tree | cdfaf5f62cae750c98dc86c82490559f74776896 | |
parent | af405613151c730f5d5d3f5c9df25721671e19ba (diff) | |
download | poky-9a20fbe23f63d87e30b0291ae1dba863c0f5de31.tar.gz |
binutils: Drop crosssdk suffix from virtual provides to improve dependency handling
There is little point in having "crosssdk" suffex added to the virtual provider within
binutils since the TARGET_PREFIX or SDK_PREFIX already encapsulates this. Remove it
allowing some of the special case overriding to be removed.
(From OE-Core rev: 6856fc5c848cc2564bebe03a007ef109f46d0adb)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes-global/staging.bbclass | 4 | ||||
-rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 2 | ||||
-rw-r--r-- | meta/lib/oe/classextend.py | 2 | ||||
-rw-r--r-- | meta/recipes-core/glibc/glibc.inc | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-crosssdk_2.40.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-crosssdk.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-crosssdk.inc | 2 |
10 files changed, 11 insertions, 13 deletions
diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass index a058d344fd..6eefba4d73 100644 --- a/meta/classes-global/staging.bbclass +++ b/meta/classes-global/staging.bbclass | |||
@@ -125,8 +125,8 @@ do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" | |||
125 | do_populate_sysroot[vardepsexclude] += "BB_MULTI_PROVIDER_ALLOWED" | 125 | do_populate_sysroot[vardepsexclude] += "BB_MULTI_PROVIDER_ALLOWED" |
126 | 126 | ||
127 | POPULATESYSROOTDEPS = "" | 127 | POPULATESYSROOTDEPS = "" |
128 | POPULATESYSROOTDEPS:class-target = "virtual/${MLPREFIX}${HOST_PREFIX}binutils:do_populate_sysroot" | 128 | POPULATESYSROOTDEPS:class-target = "virtual/${HOST_PREFIX}binutils:do_populate_sysroot" |
129 | POPULATESYSROOTDEPS:class-nativesdk = "virtual/${HOST_PREFIX}binutils-crosssdk:do_populate_sysroot" | 129 | POPULATESYSROOTDEPS:class-nativesdk = "virtual/${HOST_PREFIX}binutils:do_populate_sysroot" |
130 | do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}" | 130 | do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}" |
131 | 131 | ||
132 | SSTATETASKS += "do_populate_sysroot" | 132 | SSTATETASKS += "do_populate_sysroot" |
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index f9e88ca426..7c6399da45 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc | |||
@@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross-${TARGET_ARCH}" | |||
8 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime" | 8 | PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime" |
9 | PREFERRED_PROVIDER_gdb = "gdb" | 9 | PREFERRED_PROVIDER_gdb = "gdb" |
10 | 10 | ||
11 | PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils-crosssdk ?= "binutils-crosssdk-${SDK_SYS}" | 11 | PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils ?= "binutils-crosssdk-${SDK_SYS}" |
12 | PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc = "gcc-crosssdk-${SDK_SYS}" | 12 | PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc = "gcc-crosssdk-${SDK_SYS}" |
13 | PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ = "gcc-crosssdk-${SDK_SYS}" | 13 | PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ = "gcc-crosssdk-${SDK_SYS}" |
14 | PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" | 14 | PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" |
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py index 2013b29711..8d7e428d8a 100644 --- a/meta/lib/oe/classextend.py +++ b/meta/lib/oe/classextend.py | |||
@@ -32,6 +32,8 @@ class ClassExtender(object): | |||
32 | if name.endswith("-" + self.extname): | 32 | if name.endswith("-" + self.extname): |
33 | name = name.replace("-" + self.extname, "") | 33 | name = name.replace("-" + self.extname, "") |
34 | if name.startswith("virtual/"): | 34 | if name.startswith("virtual/"): |
35 | if "binutils" in name: | ||
36 | return name | ||
35 | subs = name.split("/", 1)[1] | 37 | subs = name.split("/", 1)[1] |
36 | if not subs.startswith(self.extname): | 38 | if not subs.startswith(self.extname): |
37 | return "virtual/" + self.extname + "-" + subs | 39 | return "virtual/" + self.extname + "-" + subs |
diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 3b940b8ab2..b08a70aa46 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc | |||
@@ -1,9 +1,7 @@ | |||
1 | require glibc-common.inc | 1 | require glibc-common.inc |
2 | require glibc-ld.inc | 2 | require glibc-ld.inc |
3 | 3 | ||
4 | DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}binutils${BUSUFFIX} libgcc-initial linux-libc-headers" | 4 | DEPENDS = "virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}binutils libgcc-initial linux-libc-headers" |
5 | BUSUFFIX= "" | ||
6 | BUSUFFIX:class-nativesdk = "-crosssdk" | ||
7 | 5 | ||
8 | PROVIDES = "virtual/libc" | 6 | PROVIDES = "virtual/libc" |
9 | PROVIDES += "virtual/libintl virtual/libiconv" | 7 | PROVIDES += "virtual/libintl virtual/libiconv" |
diff --git a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb index ca99e91130..4385343df6 100644 --- a/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb +++ b/meta/recipes-devtools/binutils/binutils-cross-testsuite_2.40.bb | |||
@@ -18,7 +18,7 @@ do_configure() { | |||
18 | } | 18 | } |
19 | 19 | ||
20 | # target depends | 20 | # target depends |
21 | DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}binutils" | 21 | DEPENDS += "virtual/${TARGET_PREFIX}binutils" |
22 | DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}gcc" | 22 | DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}gcc" |
23 | DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs" | 23 | DEPENDS += "virtual/${MLPREFIX}${TARGET_PREFIX}compilerlibs" |
24 | DEPENDS += "virtual/${MLPREFIX}libc" | 24 | DEPENDS += "virtual/${MLPREFIX}libc" |
diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.40.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.40.bb index 5bd036fd46..6752659304 100644 --- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.40.bb +++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.40.bb | |||
@@ -4,8 +4,6 @@ inherit crosssdk | |||
4 | 4 | ||
5 | PN = "binutils-crosssdk-${SDK_SYS}" | 5 | PN = "binutils-crosssdk-${SDK_SYS}" |
6 | 6 | ||
7 | PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" | ||
8 | |||
9 | SRC_URI += "file://0001-binutils-crosssdk-Generate-relocatable-SDKs.patch" | 7 | SRC_URI += "file://0001-binutils-crosssdk-Generate-relocatable-SDKs.patch" |
10 | 8 | ||
11 | do_configure:prepend () { | 9 | do_configure:prepend () { |
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc index c36e4cba81..ebeee9f351 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc | |||
@@ -3,7 +3,7 @@ inherit cross-canadian | |||
3 | SUMMARY = "GNU cc and gcc C compilers (cross-canadian for ${TARGET_ARCH} target)" | 3 | SUMMARY = "GNU cc and gcc C compilers (cross-canadian for ${TARGET_ARCH} target)" |
4 | PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" | 4 | PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" |
5 | 5 | ||
6 | DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-libc nativesdk-gettext flex-native virtual/libc" | 6 | DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils virtual/nativesdk-libc nativesdk-gettext flex-native virtual/libc" |
7 | 7 | ||
8 | GCCMULTILIB = "--enable-multilib" | 8 | GCCMULTILIB = "--enable-multilib" |
9 | 9 | ||
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk.inc b/meta/recipes-devtools/gcc/gcc-crosssdk.inc index bd2e71d63f..4e99c220a4 100644 --- a/meta/recipes-devtools/gcc/gcc-crosssdk.inc +++ b/meta/recipes-devtools/gcc/gcc-crosssdk.inc | |||
@@ -8,5 +8,5 @@ SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" | |||
8 | 8 | ||
9 | GCCMULTILIB = "--disable-multilib" | 9 | GCCMULTILIB = "--disable-multilib" |
10 | 10 | ||
11 | DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native ${NATIVEDEPS}" | 11 | DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}" |
12 | PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk" | 12 | PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-crosssdk" |
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc index 8e926e81e1..6bdfeae5a6 100644 --- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc +++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc | |||
@@ -7,7 +7,7 @@ PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" | |||
7 | BPN = "gdb" | 7 | BPN = "gdb" |
8 | 8 | ||
9 | DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-gmp \ | 9 | DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-gmp \ |
10 | virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils-crosssdk virtual/nativesdk-libc" | 10 | virtual/${HOST_PREFIX}gcc-crosssdk virtual/${HOST_PREFIX}binutils virtual/nativesdk-libc" |
11 | 11 | ||
12 | GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" | 12 | GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'" |
13 | 13 | ||
diff --git a/meta/recipes-devtools/go/go-crosssdk.inc b/meta/recipes-devtools/go/go-crosssdk.inc index 766938670a..7413acb7b3 100644 --- a/meta/recipes-devtools/go/go-crosssdk.inc +++ b/meta/recipes-devtools/go/go-crosssdk.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | inherit crosssdk | 1 | inherit crosssdk |
2 | 2 | ||
3 | DEPENDS = "go-native virtual/${TARGET_PREFIX}gcc-crosssdk virtual/nativesdk-${TARGET_PREFIX}compilerlibs virtual/${TARGET_PREFIX}binutils-crosssdk" | 3 | DEPENDS = "go-native virtual/${TARGET_PREFIX}gcc-crosssdk virtual/nativesdk-${TARGET_PREFIX}compilerlibs virtual/${TARGET_PREFIX}binutils" |
4 | PN = "go-crosssdk-${SDK_SYS}" | 4 | PN = "go-crosssdk-${SDK_SYS}" |
5 | PROVIDES = "virtual/${TARGET_PREFIX}go-crosssdk" | 5 | PROVIDES = "virtual/${TARGET_PREFIX}go-crosssdk" |
6 | 6 | ||