diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2024-10-12 15:18:44 +0800 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-11-26 05:37:09 -0800 |
| commit | f808d877a97dfd39c91de2f825ca61550ed8a0c9 (patch) | |
| tree | 4e7f83a150a862e2c9b95c9da6c1ab2036ed3273 | |
| parent | 1df725e6536d8e4478b843cf7e7a570f8304634c (diff) | |
| download | poky-f808d877a97dfd39c91de2f825ca61550ed8a0c9.tar.gz | |
gcc-source: Fix racing on building gcc-source-14.2.0 and lib32-gcc-source-14.2.0
While enabling multilib, build gcc-source-14.2.0 and lib32-gcc-source-14.2.0
at the same time:
$ MACHINE = "qemux86-64"
$ require conf/multilib.conf
$ MULTILIBS = "multilib:lib32"
$ DEFAULTTUNE:virtclass-multilib-lib32 = "x86"
$ bitbake gcc-source-14.2.0 lib32-gcc-source-14.2.0
...
$ cat tmp-glibc/work-shared/gcc-14.2.0-r0.vr2401/temp/log.task_order
20241012-064533.415426 do_recipe_qa (2688052): log.do_recipe_qa.2688052
20241012-064533.463783 do_recipe_qa (2688051): log.do_recipe_qa.2688051
20241012-064533.805164 do_fetch (2688257): log.do_fetch.2688257
20241012-064533.852955 do_fetch (2688256): log.do_fetch.2688256
20241012-064617.823714 do_unpack (2698542): log.do_unpack.2698542
20241012-064617.871730 do_unpack (2698541): log.do_unpack.2698541
...
There are two tasks for do_fetch, do_unpack and others, so there are race issues.
Both of them have the same hardcode 'gcc' prefix in ${WORKDIR} and
${S}, explicitly disable lib32-gcc-source-14.2.0 for multilib
Set gcc-source as BPN of gcc-source-14.2.0
(From OE-Core rev: 9609a7c9c6d809cc02480c3f12f8dd7c6f3fe9fc)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 901c47877e0710af50639f688e0bfdb851b762b5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/conf/multilib.conf | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-source_14.2.bb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index 09546315b8..7bdfcd56aa 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf | |||
| @@ -24,4 +24,4 @@ OPKG_ARGS:append = " --force-maintainer --force-overwrite" | |||
| 24 | 24 | ||
| 25 | # These recipes don't need multilib variants, the ${BPN} PROVDES/RPROVDES | 25 | # These recipes don't need multilib variants, the ${BPN} PROVDES/RPROVDES |
| 26 | # ${MLPREFIX}${BPN} | 26 | # ${MLPREFIX}${BPN} |
| 27 | NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts ovmf u-boot" | 27 | NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts ovmf u-boot gcc-source" |
diff --git a/meta/recipes-devtools/gcc/gcc-source_14.2.bb b/meta/recipes-devtools/gcc/gcc-source_14.2.bb index b890fa33ea..be11fa2fcc 100644 --- a/meta/recipes-devtools/gcc/gcc-source_14.2.bb +++ b/meta/recipes-devtools/gcc/gcc-source_14.2.bb | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | require recipes-devtools/gcc/gcc-${PV}.inc | 1 | require recipes-devtools/gcc/gcc-${PV}.inc |
| 2 | require recipes-devtools/gcc/gcc-source.inc | 2 | require recipes-devtools/gcc/gcc-source.inc |
| 3 | 3 | ||
| 4 | BPN = "gcc-source" | ||
| 4 | EXCLUDE_FROM_WORLD = "1" | 5 | EXCLUDE_FROM_WORLD = "1" |
