From 6ee8c498d8087daea51a256a0216eb085a770d34 Mon Sep 17 00:00:00 2001 From: Matt Madison Date: Mon, 21 Oct 2024 14:32:42 -0700 Subject: [PATCH] gcc-for-nvcc: rename gcc-for-nvcc-source -> gcc-source-for-nvcc to take advantage of the automatic license whitelisting buried in base.bbclass that checks for PN starting with 'gcc-source-', and avoid the issue mentioned in #1711. Signed-off-by: Matt Madison --- .../gcc-for-nvcc/gcc-for-nvcc-shared-source.inc | 6 +++--- .../{gcc-for-nvcc-source.inc => gcc-source-for-nvcc.inc} | 2 +- ...-for-nvcc-source_10.3.bb => gcc-source-for-nvcc_10.3.bb} | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename recipes-devtools/gcc-for-nvcc/{gcc-for-nvcc-source.inc => gcc-source-for-nvcc.inc} (97%) rename recipes-devtools/gcc-for-nvcc/{gcc-for-nvcc-source_10.3.bb => gcc-source-for-nvcc_10.3.bb} (64%) diff --git a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-shared-source.inc b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-shared-source.inc index 32d44842..1a510718 100644 --- a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-shared-source.inc +++ b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-shared-source.inc @@ -7,9 +7,9 @@ deltask do_patch SRC_URI = "" -do_configure[depends] += "gcc-for-nvcc-source-${PV}:do_preconfigure" -do_populate_lic[depends] += "gcc-for-nvcc-source-${PV}:do_unpack" -do_deploy_source_date_epoch[depends] += "gcc-for-nvcc-source-${PV}:do_deploy_source_date_epoch" +do_configure[depends] += "gcc-source-for-nvcc-${PV}:do_preconfigure" +do_populate_lic[depends] += "gcc-source-for-nvcc-${PV}:do_unpack" +do_deploy_source_date_epoch[depends] += "gcc-source-for-nvcc-${PV}:do_deploy_source_date_epoch" # Copy the SDE from the shared workdir to the recipe workdir do_deploy_source_date_epoch () { diff --git a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-source.inc b/recipes-devtools/gcc-for-nvcc/gcc-source-for-nvcc.inc similarity index 97% rename from recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-source.inc rename to recipes-devtools/gcc-for-nvcc/gcc-source-for-nvcc.inc index 7b306ccc..732edfe9 100644 --- a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-source.inc +++ b/recipes-devtools/gcc-for-nvcc/gcc-source-for-nvcc.inc @@ -7,7 +7,7 @@ RM_WORK_EXCLUDE += "${PN}" inherit nopackages -PN = "gcc-for-nvcc-source-${PV}" +PN = "gcc-source-for-nvcc-${PV}" WORKDIR = "${TMPDIR}/work-shared/gcc-${PV}-${PR}" SSTATE_SWSPEC = "sstate:gcc::${PV}:${PR}::${SSTATE_VERSION}:" diff --git a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-source_10.3.bb b/recipes-devtools/gcc-for-nvcc/gcc-source-for-nvcc_10.3.bb similarity index 64% rename from recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-source_10.3.bb rename to recipes-devtools/gcc-for-nvcc/gcc-source-for-nvcc_10.3.bb index f1f50a1a..14a35b59 100644 --- a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-source_10.3.bb +++ b/recipes-devtools/gcc-for-nvcc/gcc-source-for-nvcc_10.3.bb @@ -1,4 +1,4 @@ require gcc-for-nvcc-${PV}.inc -require gcc-for-nvcc-source.inc +require gcc-source-for-nvcc.inc EXCLUDE_FROM_WORLD = "1"