[PATCH 0/3] Fixes for doc-related build failures, v2

[PATCH 0/3] Fixes for doc-related build failures, v2

[Scott Garman]

From: Scott Garman <scott.a.garman@intel.com>

Hi Saul,

Paul identified the root cause of the build failures occurring with
the documentation related packages. The problem is that functions
appended to SSTATEPOSTINSTFUNCS can now be run for *all* tasks.
These commits ensure the sysroot-related operations only happen
during the do_populate_sysroot tasks.

This fixes [YOCTO #948] (Thank you Dexuan for the bug report).

v2 of this pull request - tested for both builds from scratch and
from sstate.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: sgarman/docbook-fix
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/docbook-fix

Thanks,
    Scott Garman <scott.a.garman@intel.com>
---


Scott Garman (3):
  docbook-sgml-dtd-native.inc: run install-catalog only during
    do_populate_sysroot
  openjade-native: run install-catalog only during do_populate_sysroot
  docbook-dsssl-stylesheets-native: run install-catalog only during
    do_populate_sysroot

 .../docbook-dsssl-stylesheets-native_1.79.bb       |   13 ++++++++-----
 .../docbook-sgml-dtd/docbook-sgml-dtd-native.inc   |   13 ++++++++-----
 .../openjade/openjade-native_1.3.2.bb              |   13 ++++++++-----
 3 files changed, 24 insertions(+), 15 deletions(-)

[PATCH 1/3] docbook-sgml-dtd-native.inc: run install-catalog only during do_populate_sysroot

[Scott Garman]

From: Scott Garman <scott.a.garman@intel.com>

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 .../docbook-sgml-dtd/docbook-sgml-dtd-native.inc   |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
index 83cedbc..ede7bb1 100644
--- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
+++ b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
@@ -39,9 +39,12 @@ do_install () {
 }
 
 docbook_sgml_dtd_sstate_postinst () {
-	# Ensure that the catalog file sgml-docbook.cat is properly
-	# updated when the package is installed from sstate cache.
-	install-catalog \
-		--add ${sysconfdir}/sgml/sgml-docbook.cat \
-		${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat
+	if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
+	then
+		# Ensure that the catalog file sgml-docbook.cat is properly
+		# updated when the package is installed from sstate cache.
+		install-catalog \
+			--add ${sysconfdir}/sgml/sgml-docbook.cat \
+			${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat
+	fi
 }
-- 
1.7.1

[PATCH 2/3] openjade-native: run install-catalog only during do_populate_sysroot

[Scott Garman]

From: Scott Garman <scott.a.garman@intel.com>

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 .../openjade/openjade-native_1.3.2.bb              |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index 5c1037a..1c672e1 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -62,9 +62,12 @@ do_install() {
 }
 
 openjade_sstate_postinst() {
-	# Ensure that the catalog file sgml-docbook.cat is properly
-	# updated when the package is installed from sstate cache.
-	install-catalog \
-		--add ${sysconfdir}/sgml/sgml-docbook.cat \
-		${sysconfdir}/sgml/openjade-${PV}.cat
+	if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
+	then
+		# Ensure that the catalog file sgml-docbook.cat is properly
+		# updated when the package is installed from sstate cache.
+		install-catalog \
+			--add ${sysconfdir}/sgml/sgml-docbook.cat \
+			${sysconfdir}/sgml/openjade-${PV}.cat
+	fi
 }
-- 
1.7.1

[PATCH 3/3] docbook-dsssl-stylesheets-native: run install-catalog only during do_populate_sysroot

[Scott Garman]

From: Scott Garman <scott.a.garman@intel.com>

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 .../docbook-dsssl-stylesheets-native_1.79.bb       |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
index fc4d266..88d24dd 100644
--- a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
+++ b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
@@ -38,9 +38,12 @@ do_install () {
 }
 
 docbook_dsssl_stylesheets_sstate_postinst () {
-	# Ensure that the catalog file sgml-docbook.cat is properly
-	# updated when the package is installed from sstate cache.
-	install-catalog \
-		--add ${sysconfdir}/sgml/sgml-docbook.cat \
-		${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
+	if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
+	then
+		# Ensure that the catalog file sgml-docbook.cat is properly
+		# updated when the package is installed from sstate cache.
+		install-catalog \
+			--add ${sysconfdir}/sgml/sgml-docbook.cat \
+			${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
+	fi
 }
-- 
1.7.1

Re: [PATCH 0/3] Fixes for doc-related build failures, v2

[Richard Purdie]

On Mon, 2011-04-04 at 15:30 -0700, Scott Garman wrote:
> From: Scott Garman <scott.a.garman@intel.com>
> 
> Hi Saul,
> 
> Paul identified the root cause of the build failures occurring with
> the documentation related packages. The problem is that functions
> appended to SSTATEPOSTINSTFUNCS can now be run for *all* tasks.
> These commits ensure the sysroot-related operations only happen
> during the do_populate_sysroot tasks.
> 
> This fixes [YOCTO #948] (Thank you Dexuan for the bug report).
> 
> v2 of this pull request - tested for both builds from scratch and
> from sstate.
> 
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>   Branch: sgarman/docbook-fix
>   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/docbook-fix
> 
> Thanks,
>     Scott Garman <scott.a.garman@intel.com>
> ---
> 
> 
> Scott Garman (3):
>   docbook-sgml-dtd-native.inc: run install-catalog only during
>     do_populate_sysroot
>   openjade-native: run install-catalog only during do_populate_sysroot
>   docbook-dsssl-stylesheets-native: run install-catalog only during
>     do_populate_sysroot

Merged to master, thanks!

Richard