diff mbox series

[meta-oe,2/3] gnulib: Do not use git operations to install the sources

Message ID 20220413155249.3458236-2-raj.khem@gmail.com
State New
Headers show
Series [meta-oe,1/3] mpich: Add new directory modules/hwloc/config to search path | expand

Commit Message

Khem Raj April 13, 2022, 3:52 p.m. UTC 
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 <raj.khem@gmail.com>
---
 .../recipes-support/gnulib/gnulib_2018-03-07.03.bb    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb b/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb
index 2aab68e6a5..a27968079e 100644
--- a/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb
+++ b/meta-oe/recipes-support/gnulib/gnulib_2018-03-07.03.bb
@@ -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"