[meta-oe][PATCH 0/4 v2] host-user-contaminated fixes for meta-oe

[meta-oe][PATCH 0/4 v2] host-user-contaminated fixes for meta-oe

[Yi Zhao]

Changes from V1: 

Instruct the "cp" command to preserve ownership instead of using "chown". Thanks Mike Looijmans for the suggestion.
Rebase to lastest master branch

The following changes since commit 5ec0bd998e6fe4d7bf5f7ca30c431447adf5e8b5:

  gnome-desktop: don't try to copy omf.make (2016-01-14 11:30:16 +0100)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib yzhao/4-fixes
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=yzhao/4-fixes

Yi Zhao (4):
  debootstrap: fix host-user-contaminated
  espeak: fix host-user-contaminated
  orrery: fix host-user-contaminated
  logwatch: fix host-user-contaminated

 .../debootstrap/debootstrap_1.0.67.bb              |    1 +
 .../recipes-extended/logwatch/logwatch_7.4.1.bb    |    1 +
 meta-oe/recipes-navigation/orrery/orrery_2.7.bb    |    3 ++-
 meta-oe/recipes-support/espeak/espeak_1.37.bb      |    2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

-- 
1.7.9.5

[meta-oe][PATCH 1/4 v2] debootstrap: fix host-user-contaminated

[Yi Zhao]

Fix QA warning:
WARNING: QA Issue: debootstrap: /debootstrap/usr/share/debootstrap/scripts/gutsy is owned by uid 1000,
which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../debootstrap/debootstrap_1.0.67.bb              |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb
index 73dea9b..62b2796 100644
--- a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb
+++ b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.67.bb
@@ -31,4 +31,5 @@ do_compile_prepend() {
 
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
+    chown -R root:root ${D}${datadir}/debootstrap
 }
-- 
1.7.9.5

[meta-oe][PATCH 2/4 v2] espeak: fix host-user-contaminated

[Yi Zhao]

Fix QA warning:
WARNING: QA Issue: espeak: /espeak/usr/share/espeak-data/mbrola_ph/de6_phtrans is owned by uid 1000,
which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-support/espeak/espeak_1.37.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/espeak/espeak_1.37.bb b/meta-oe/recipes-support/espeak/espeak_1.37.bb
index 86f2c7a..73aff55 100644
--- a/meta-oe/recipes-support/espeak/espeak_1.37.bb
+++ b/meta-oe/recipes-support/espeak/espeak_1.37.bb
@@ -39,5 +39,5 @@ do_install() {
         rm -f ${S}/espeak-data/phon*
     fi
 
-    cp -prf ${S}/espeak-data/* ${D}${datadir}/espeak-data
+    cp -rf --preserve=mode,links ${S}/espeak-data/* ${D}${datadir}/espeak-data
 }
-- 
1.7.9.5

[meta-oe][PATCH 3/4 v2] orrery: fix host-user-contaminated

[Yi Zhao]

Fix QA warning:
WARNING: QA Issue: orrery: /orrery/usr/share/orrery/deepSky/messier is owned by uid 1000,
which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-navigation/orrery/orrery_2.7.bb |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
index b3372b1..4785f69 100644
--- a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
+++ b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb
@@ -21,9 +21,10 @@ do_configure_prepend() {
     # fix DSO issue with binutils-2.22
     sed -i 's/ -lrt/ -lrt -lm/g' ${S}/Makefile.am
 }
+
 do_install_append() {
     install -d ${D}${datadir}/orrery
-    cp -a ${S}/data/* ${D}${datadir}/orrery
+    cp -R --no-dereference --preserve=mode,links ${S}/data/* ${D}${datadir}/orrery
     install -d ${D}${datadir}/icons
     install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons
 }
-- 
1.7.9.5

[meta-oe][PATCH 4/4 v2] logwatch: fix host-user-contaminated

[Yi Zhao]

Fix QA warning:
WARNING: QA Issue: logwatch: /logwatch/usr/share/logwatch/scripts/services/resolver is owned by uid 1000,
which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../recipes-extended/logwatch/logwatch_7.4.1.bb    |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-extended/logwatch/logwatch_7.4.1.bb b/meta-oe/recipes-extended/logwatch/logwatch_7.4.1.bb
index 001b3de..b121522 100644
--- a/meta-oe/recipes-extended/logwatch/logwatch_7.4.1.bb
+++ b/meta-oe/recipes-extended/logwatch/logwatch_7.4.1.bb
@@ -23,6 +23,7 @@ do_install() {
     mv conf/ ${D}${datadir}/logwatch/default.conf
     mv scripts/ ${D}${datadir}/logwatch/scripts
     mv lib ${D}${datadir}/logwatch/lib
+    chown -R root:root ${D}${datadir}/logwatch
 
     install -m 0755 -d ${D}${mandir}/man1
     install -m 0755 -d ${D}${mandir}/man5
-- 
1.7.9.5