mpich: Add new directory modules/hwloc/config to search path
PATCH 1/3 mpich: Add new directory modules/hwloc/config to search path
This ensures that config.guess and config.sub are installed in for all directories where its needed.
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-devtools/mpich/mpich_4.0.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-devtools/mpich/mpich_4.0.2.bb +2 -2
@@ -40,8 +40,8 @@ inherit autotools gettext pkgconfig do_configure() { for d in confdb test/mpi test/mpi/confdb src/pm/hydra/confdb \ src/pm/hydra/tools/topo/hwloc/hwloc/config src/pm/hydra/mpl/confdb \ - modules/yaksa/m4 modules/json-c modules/ucx test/mpi/dtpools/confdb \ - src/mpl/confdb src/mpi/romio/confdb; do + modules/yaksa/m4 modules/json-c modules/ucx modules/hwloc/config \ + test/mpi/dtpools/confdb src/mpl/confdb src/mpi/romio/confdb; do install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/$d install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/$d done
Signature · 1 line
2.35.2
PATCH 2/3 gnulib: Do not use git operations to install the sources
git operations have started to fail with errors like
| fatal: unsafe repository ('/mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux-musl/gnulib/2018-03-07.03-r0/git' is owned by someon e else)
| To add an exception for this directory, call: | | git config --global --add safe.directory /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux-musl/gnulib/2018-03-07.03-r0/git
This is after git has fixed a CVE in 2.35+ see [1]
[1] https://github.com/actions/checkout/issues/760
Signed-off-by Khem Raj <[email protected]>
--- .../recipes-support/gnulib/gnulib_2018-03-07.03.bb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb +4 -7
@@ -13,18 +13,15 @@ LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=56a22a6e5bcce45e2c8ac184f81412b5" SRCREV = "0d6e3307bbdb8df4d56043d5f373eeeffe4cbef3" -SRC_URI = "git://git.sv.gnu.org/gnulib.git;branch=master \ +SRC_URI = "git://git.savannah.gnu.org/git/gnulib.git;branch=master \ " S = "${WORKDIR}/git" -inherit utils - do_install () { - cd ${S} - check_git_config - git checkout master - git clone ${S} ${D}/${datadir}/gnulib + install -d ${D}/${datadir}/gnulib + cp --no-preserve=ownership --recursive ${S}/* ${D}/${datadir}/gnulib/ + cp --no-preserve=ownership --recursive ${S}/.git ${D}/${datadir}/gnulib/ } do_patch[noexec] = "1"
Signature · 1 line
2.35.2