Revised patch set for fixing owners/groups (V2)

Misunderstood nativesdk. I thought it was not running under fakeroot control. No reason to intercept chown for nativesdk, revert that hunt.

Also removed an errant debug statement.

---

This is a revised patch set for fixing the owners/groups. It adds a local intercrepter routine for "chown" that runs only with native and nativesdk packages.

Also update the rejected python patch to fix only the gobject item.

The following changes since commit ad098e40e8c57727892819e131bf18308bf244d2:

packagedata.py: Fix read_subpkgdata_dict() (2011-06-23 16:01:20 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/recipe-fixup
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/recipe-fixup

Mark Hatle (9):
native.bbclass: Add a simple chown intercept command
resolveconf: Fix file owners
base-passwd: Fix owners/groups
ghostscript: Fix owner/group of /etc/cups
libtirpc: Fix owner/group of /etc/netconfig
tzdata: Ensure all files are owned by root:root
gnome-doc-utils: Fix the owner/group on select files
db: Fix file ownership
python: Add python to the dependency to pygobject

 meta/classes/native.bbclass                        |    2 ++
 .../resolvconf/resolvconf_1.48.bb                  |    3 ++-
 .../recipes-core/base-passwd/base-passwd_3.5.22.bb |   10 +++++-----
 .../python/python-pygobject_2.27.91.bb             |    4 ++--
 .../ghostscript/ghostscript_9.02.bb                |    4 +++-
 meta/recipes-extended/libtirpc/libtirpc_0.2.1.bb   |    6 +++++-
 meta/recipes-extended/tzdata/tzdata_2011g.bb       |    4 ++--
 meta/recipes-gnome/gnome/gnome-doc-utils.inc       |    2 ++
 meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |    2 +-
 meta/recipes-support/db/db_5.1.19.bb               |    2 ++
 scripts/native-intercept/chown                     |    2 ++
 11 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100755 scripts/native-intercept/chown

1.7.3.4

During native recipe processing we want to intercept any calls to chown and do nothing. This prevents errors and allows the same recipes to be used for both native and target recipes.

---
 meta/classes/native.bbclass    |    2 ++
 scripts/native-intercept/chown |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)
 create mode 100755 scripts/native-intercept/chown

index 90fcd13..11ec6dc 100644
@@ -85,6 +85,8 @@ EXTRA_NATIVE_PKGCONFIG_PATH ?= ""
 PKG_CONFIG_PATH .= "${EXTRA_NATIVE_PKGCONFIG_PATH}"
 PKG_CONFIG_SYSROOT_DIR = ""
 
+PATH =. "${COREBASE}/scripts/native-intercept:"
+
 python native_virtclass_handler () {
     if not isinstance(e, bb.event.RecipePreFinalise):
         return

new file mode 100755
index 0000000..4f43271
@@ -0,0 +1,2 @@
+#! /bin/sh
+echo "Intercept $0: $@ -- do nothing"

1.7.3.4

All of the files in ${datadir}/xml/gnome/xslt were being given the uid/gid of the build user. Fix this for the target case, avoid it in the native.

---
 meta/recipes-gnome/gnome/gnome-doc-utils.inc       |    2 ++
 meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

index b541753..32fcf7a 100644
@@ -9,6 +9,8 @@ EXTRA_OECONF = "--disable-scrollkeeper"
 do_install_append() {
 	mkdir -p  ${D}${datadir}/xml/gnome/xslt/
 	cp -pPr ${S}/xslt/* ${D}${datadir}/xml/gnome/xslt/
+
+	chown -R root:root ${D}
 }
 
 FILES_${PN} += "${datadir}/xml*"

index e7bf6e9..d85697f 100644
@@ -1,7 +1,7 @@
 require gnome-doc-utils.inc
 LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \
 		    file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343"
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://xsltproc_nonet.patch"
 

1.7.3.4

Thanks for the tweaks, this is much neater now :)

Merged to master, thanks.

Richard