From 64f1a95dca828b2b498b999200380f6a638ba1b2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 25 Feb 2016 17:38:29 +0100 Subject: recipes: Replace "cp -a" with "cp -R --no-dereference --preserve=mode,links" * Using "cp -a" leaks UID of user running the builds, causing many QA warnings. * See this thread for details: http://lists.openembedded.org/pipermail/openembedded-core/2015-November/112904.html Signed-off-by: Martin Jansa --- meta/recipes-core/coreutils/coreutils_8.26.bb | 2 +- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb | 4 ++-- meta/recipes-extended/mdadm/mdadm_4.0.bb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/coreutils/coreutils_8.26.bb b/meta/recipes-core/coreutils/coreutils_8.26.bb index 52ef1013ca..ac1ca9bd16 100644 --- a/meta/recipes-core/coreutils/coreutils_8.26.bb +++ b/meta/recipes-core/coreutils/coreutils_8.26.bb @@ -99,7 +99,7 @@ do_install_append() { install -t ${D}/${mandir}/man1 ${S}/man/*.1 # prebuilt man pages don't do a separate man page for [ vs test. # see comment above r.e. sed and update-alternatives - cp -a ${D}${mandir}/man1/test.1 ${D}${mandir}/man1/lbracket.1.${BPN} + cp -R --no-dereference --preserve=mode,links -v ${D}${mandir}/man1/test.1 ${D}${mandir}/man1/lbracket.1.${BPN} } inherit update-alternatives diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb index 7aa73a15ed..6b932c8b7c 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.4.bb @@ -107,7 +107,7 @@ do_compile_ptest() { } do_install_ptest() { - cp -a ${B}/tests ${D}${PTEST_PATH}/test - cp -a ${S}/tests/* ${D}${PTEST_PATH}/test + cp -R --no-dereference --preserve=mode,links -v ${B}/tests ${D}${PTEST_PATH}/test + cp -R --no-dereference --preserve=mode,links -v ${S}/tests/* ${D}${PTEST_PATH}/test sed -e 's!../e2fsck/e2fsck!e2fsck!g' -i ${D}${PTEST_PATH}/test/*/expect* } diff --git a/meta/recipes-extended/mdadm/mdadm_4.0.bb b/meta/recipes-extended/mdadm/mdadm_4.0.bb index 62614f060f..eced5b8c2b 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.0.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.0.bb @@ -50,7 +50,7 @@ do_compile_ptest() { } do_install_ptest() { - cp -a ${S}/tests ${D}${PTEST_PATH}/tests + cp -R --no-dereference --preserve=mode,links -v ${S}/tests ${D}${PTEST_PATH}/tests cp ${S}/test ${D}${PTEST_PATH} sed -e 's!sleep 0.*!sleep 1!g; s!/var/tmp!/!g' -i ${D}${PTEST_PATH}/test ln -s ${base_sbindir}/mdadm ${D}${PTEST_PATH}/mdadm -- cgit 1.2.3-korg