dbus-test: Replace cp -a with portable options

Submitted by Khem Raj on March 9, 2020, 11:47 p.m. | Patch ID: 170931

Details

Message ID 20200309234709.1463471-1-raj.khem@gmail.com
State New
Headers show

Commit Message

Khem Raj March 9, 2020, 11:47 p.m.
-a option is linux specific

Errors like below are fixed when -a is used

bus/connection.h is owned by uid 1000, which is the same as t
he user running bitbake. This may be due to host contamination

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/dbus/dbus-test_1.12.16.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-core/dbus/dbus-test_1.12.16.bb b/meta/recipes-core/dbus/dbus-test_1.12.16.bb
index bea0e74ed0..91e2ba69d2 100644
--- a/meta/recipes-core/dbus/dbus-test_1.12.16.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.12.16.bb
@@ -70,11 +70,11 @@  do_install_ptest() {
 
 	install ${B}/test/test-segfault ${D}${PTEST_PATH}/test
 
-	cp -r ${B}/test/data ${D}${PTEST_PATH}/test
+	cp -R --no-dereference --preserve=mode,links ${B}/test/data ${D}${PTEST_PATH}/test
 	install ${B}/dbus/.libs/test-dbus ${D}${PTEST_PATH}/test
 
 	install -d ${D}${PTEST_PATH}/test/.libs
-	cp -a ${B}/dbus/.libs/*.so* ${D}${PTEST_PATH}/test/.libs
+	cp -R --no-dereference --preserve=mode,links ${B}/dbus/.libs/*.so* ${D}${PTEST_PATH}/test/.libs
 
 	# Remove build host references...
 	find "${D}${PTEST_PATH}/test/data" \( -name *.service -o -name *.conf -o -name "*.aaprofile" \) -type f -exec \

Comments

Andre McCurdy March 10, 2020, midnight
On Mon, Mar 9, 2020 at 4:47 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> -a option is linux specific

Is it?

> Errors like below are fixed when -a is used

Do you mean the errors are fixed when -a is _not_ used ?

Either way, the key fix here looks to be effectively removing
--preserve=ownership from the cp command, not somehow making the cp
command line arguments more portable as the subject implies. There are
many similar fixes already in oe-core and meta-oe.

> bus/connection.h is owned by uid 1000, which is the same as t
> he user running bitbake. This may be due to host contamination
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-core/dbus/dbus-test_1.12.16.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/dbus/dbus-test_1.12.16.bb b/meta/recipes-core/dbus/dbus-test_1.12.16.bb
> index bea0e74ed0..91e2ba69d2 100644
> --- a/meta/recipes-core/dbus/dbus-test_1.12.16.bb
> +++ b/meta/recipes-core/dbus/dbus-test_1.12.16.bb
> @@ -70,11 +70,11 @@ do_install_ptest() {
>
>         install ${B}/test/test-segfault ${D}${PTEST_PATH}/test
>
> -       cp -r ${B}/test/data ${D}${PTEST_PATH}/test
> +       cp -R --no-dereference --preserve=mode,links ${B}/test/data ${D}${PTEST_PATH}/test
>         install ${B}/dbus/.libs/test-dbus ${D}${PTEST_PATH}/test
>
>         install -d ${D}${PTEST_PATH}/test/.libs
> -       cp -a ${B}/dbus/.libs/*.so* ${D}${PTEST_PATH}/test/.libs
> +       cp -R --no-dereference --preserve=mode,links ${B}/dbus/.libs/*.so* ${D}${PTEST_PATH}/test/.libs
>
>         # Remove build host references...
>         find "${D}${PTEST_PATH}/test/data" \( -name *.service -o -name *.conf -o -name "*.aaprofile" \) -type f -exec \
> --
> 2.25.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core