diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-29 10:35:00 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-30 23:04:12 +0100 |
| commit | 7b88042b801403054e76c9bb51419c73acbb1d59 (patch) | |
| tree | 0782726a254e9dba956ff42f43b44f721cc408d1 | |
| parent | 0321760d77070e59b5fbd509a33dd0b34fde628b (diff) | |
| download | openembedded-core-contrib-7b88042b801403054e76c9bb51419c73acbb1d59.tar.gz | |
gcc-shared-source: Add PV to PN
This means you can have one gcc version for some gcc recipes
(e.g. crosssdk/nativesdk) and another gcc version for target code.
Also remove the preferred version entry from the default toolchains
list since the version issue is now handled automatically.
We also need to specifically handle gcc-source in the license handling
code since expanding ${PV} in the base class isn't possible. Since
gcc-source doesn't generate any packages directly this shouldn't be
an issue and whitelisting in this way is easiest (and matches the
rest of the toolchain handling).
(From OE-Core rev: 67db7182faf6742b0d971d61d8c5ba34f69d2e12)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/base.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-shared-source.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-source.inc | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 0032b302cf..c6494e3cea 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -468,6 +468,8 @@ python () { "-cross-canadian-${TRANSLATED_TARGET_ARCH}"]: if pn.endswith(d.expand(t)): check_license = False + if pn.startswith("gcc-source-"): + check_license = False if check_license and bad_licenses: bad_licenses = expand_wildcard_licenses(d, bad_licenses) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index e3df93475f..096bec9fd6 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -38,7 +38,6 @@ PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_ARCH} ?= "${SDKGCCVERSION}" PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-source ?= "${GCCVERSION}" PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${SDKGCCVERSION}" PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" diff --git a/meta/recipes-devtools/gcc/gcc-shared-source.inc b/meta/recipes-devtools/gcc/gcc-shared-source.inc index cb5d9071b6..9acffb1da7 100644 --- a/meta/recipes-devtools/gcc/gcc-shared-source.inc +++ b/meta/recipes-devtools/gcc/gcc-shared-source.inc @@ -5,5 +5,5 @@ do_fetch[noexec] = "1" deltask do_unpack deltask do_patch -do_configure[depends] += "gcc-source:do_preconfigure" -do_populate_lic[depends] += "gcc-source:do_unpack" +do_configure[depends] += "gcc-source-${PV}:do_preconfigure" +do_populate_lic[depends] += "gcc-source-${PV}:do_unpack" diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc index 10e9285c44..a4b27c8fd3 100644 --- a/meta/recipes-devtools/gcc/gcc-source.inc +++ b/meta/recipes-devtools/gcc/gcc-source.inc @@ -11,6 +11,7 @@ deltask do_package_qa deltask do_packagedata deltask do_rm_work +PN = "gcc-source-${PV}" WORKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}" SSTATE_SWSPEC = "sstate:gcc::${PV}:${PR}::${SSTATE_VERSION}:" |