[PATCH 0/9] Revised patch set for fixing owners/groups (V2)

[PATCH 0/9] Revised patch set for fixing owners/groups (V2)

[Mark Hatle]

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

[PATCH 1/9] native.bbclass: Add a simple chown intercept command (v2)

[Mark Hatle]

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.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/classes/native.bbclass    |    2 ++
 scripts/native-intercept/chown |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)
 create mode 100755 scripts/native-intercept/chown

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 90fcd13..11ec6dc 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -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
diff --git a/scripts/native-intercept/chown b/scripts/native-intercept/chown
new file mode 100755
index 0000000..4f43271
--- /dev/null
+++ b/scripts/native-intercept/chown
@@ -0,0 +1,2 @@
+#! /bin/sh
+echo "Intercept $0: $@ -- do nothing"
-- 
1.7.3.4

[PATCH 7/9] gnome-doc-utils: Fix the owner/group on select files (v2)

[Mark Hatle]

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.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 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(-)

diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
index b541753..32fcf7a 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils.inc
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc
@@ -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*"
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
index e7bf6e9..d85697f 100644
--- a/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
+++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.20.6.bb
@@ -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

Re: [PATCH 0/9] Revised patch set for fixing owners/groups (V2)

[Richard Purdie]

On Thu, 2011-06-23 at 14:41 -0500, Mark Hatle wrote:
> 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.

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

> 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

Merged to master, thanks.

Richard