From df7242fddb9048738c0cdfaf0c3c227bf78f3da7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 25 Feb 2016 17:37:00 +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-oe/recipes-benchmark/fio/fio_2.2.6.bb | 2 +- meta-oe/recipes-devtools/lua/lua_5.3.2.bb | 2 +- meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb | 2 +- meta-oe/recipes-multimedia/live555/live555.inc | 10 +++++----- meta-oe/recipes-navigation/orrery/orrery_2.7.bb | 2 +- meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb | 4 ++-- meta-oe/recipes-support/tbb/tbb_4.1.bb | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) (limited to 'meta-oe') diff --git a/meta-oe/recipes-benchmark/fio/fio_2.2.6.bb b/meta-oe/recipes-benchmark/fio/fio_2.2.6.bb index 5bf387c3a..db6717300 100644 --- a/meta-oe/recipes-benchmark/fio/fio_2.2.6.bb +++ b/meta-oe/recipes-benchmark/fio/fio_2.2.6.bb @@ -37,5 +37,5 @@ do_configure() { do_install() { oe_runmake install DESTDIR=${D} prefix=${prefix} mandir=${mandir} install -d ${D}/${docdir}/${PN} - cp -a ${S}/examples ${D}/${docdir}/${PN}/ + cp -R --no-dereference --preserve=mode,links -v ${S}/examples ${D}/${docdir}/${PN}/ } diff --git a/meta-oe/recipes-devtools/lua/lua_5.3.2.bb b/meta-oe/recipes-devtools/lua/lua_5.3.2.bb index f97ed509f..07a1a433c 100644 --- a/meta-oe/recipes-devtools/lua/lua_5.3.2.bb +++ b/meta-oe/recipes-devtools/lua/lua_5.3.2.bb @@ -55,7 +55,7 @@ do_install () { } do_install_ptest () { - cp -a ${WORKDIR}/lua-${PV}-tests ${D}${PTEST_PATH}/test + cp -R --no-dereference --preserve=mode,links -v ${WORKDIR}/lua-${PV}-tests ${D}${PTEST_PATH}/test } BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb b/meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb index 85035d9c8..0ac8fad29 100644 --- a/meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb +++ b/meta-oe/recipes-extended/tipcutils/tipcutils_2.0.6.bb @@ -33,7 +33,7 @@ do_install_append() { install ${B}/ptts/tipcTC ${D}/opt/tipcutils/ptts/ install -d ${D}${sysconfdir} - cp -a ${S}/scripts/etc/* ${D}${sysconfdir}/ + cp -R --no-dereference --preserve=mode,links -v ${S}/scripts/etc/* ${D}${sysconfdir}/ chown -R root:root ${D}${sysconfdir} } diff --git a/meta-oe/recipes-multimedia/live555/live555.inc b/meta-oe/recipes-multimedia/live555/live555.inc index 0c8208a22..0d11de904 100644 --- a/meta-oe/recipes-multimedia/live555/live555.inc +++ b/meta-oe/recipes-multimedia/live555/live555.inc @@ -34,11 +34,11 @@ do_install() { install -d ${D}${includedir}/liveMedia install -d ${D}${includedir}/UsageEnvironment install -d ${D}${libdir} - cp -a ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/ - cp -a ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/ - cp -a ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/ - cp -a ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/ - cp -a ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/ + cp -R --no-dereference --preserve=mode,links -v ${S}/BasicUsageEnvironment/include/*.hh ${D}${includedir}/BasicUsageEnvironment/ + cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.h ${D}${includedir}/groupsock/ + cp -R --no-dereference --preserve=mode,links -v ${S}/groupsock/include/*.hh ${D}${includedir}/groupsock/ + cp -R --no-dereference --preserve=mode,links -v ${S}/liveMedia/include/*.hh ${D}${includedir}/liveMedia/ + cp -R --no-dereference --preserve=mode,links -v ${S}/UsageEnvironment/include/*.hh ${D}${includedir}/UsageEnvironment/ # Find all the headers for i in $(find . -name "*.hh") $(find . -name "*.h") ; do install ${i} ${D}${includedir} diff --git a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb index 617afbc99..40a6df3c9 100644 --- a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb +++ b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb @@ -23,7 +23,7 @@ do_configure_prepend() { } do_install_append() { install -d ${D}${datadir}/orrery - cp -a ${S}/data/* ${D}${datadir}/orrery + cp -R --no-dereference --preserve=mode,links -v ${S}/data/* ${D}${datadir}/orrery chown -R root:root ${D}${datadir}/orrery install -d ${D}${datadir}/icons install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons diff --git a/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb b/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb index 18979d574..35c891e7a 100644 --- a/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb +++ b/meta-oe/recipes-support/apcupsd/apcupsd_3.14.10.bb @@ -19,10 +19,10 @@ EXTRA_OECONF = "--without-x \ do_configure() { export topdir=${S} - cp -a ${S}/autoconf/configure.in ${S} + cp -R --no-dereference --preserve=mode,links -v ${S}/autoconf/configure.in ${S} if ! [ -d ${S}/platforms/${DISTRO} ] ; then - cp -a ${S}/platforms/unknown ${S}/platforms/${DISTRO} + cp -R --no-dereference --preserve=mode,links -v ${S}/platforms/unknown ${S}/platforms/${DISTRO} fi gnu-configize --force diff --git a/meta-oe/recipes-support/tbb/tbb_4.1.bb b/meta-oe/recipes-support/tbb/tbb_4.1.bb index 55212dc6c..09ed6ec52 100644 --- a/meta-oe/recipes-support/tbb/tbb_4.1.bb +++ b/meta-oe/recipes-support/tbb/tbb_4.1.bb @@ -26,7 +26,7 @@ do_compile() { do_install() { install -d ${D}${includedir} ${D}${libdir}/pkgconfig rm ${S}/include/tbb/index.html -f - cp -a ${S}/include/tbb ${D}${includedir} + cp -R --no-dereference --preserve=mode,links -v ${S}/include/tbb ${D}${includedir} install -m 0755 ${B}/build/linux_*_release/lib*.so* ${D}${libdir} install -m 0644 ${WORKDIR}/tbb.pc ${D}${libdir}/pkgconfig } -- cgit v1.2.3-54-g00ecf