Fixes for doc-related build failures, v2

PATCH Applied Scott Garman 2 participants 5 messages Apr 4, 2011

lore

Share & tools

lore

Scott Garman

author

2011-04-04 22:30 UTC #0 lore raw

cover Fixes for doc-related build failures, v2

From: Scott Garman <[email protected]>

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 <[email protected]>
---

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(-)

Scott Garman

author

2011-04-04 22:30 UTC #1 lore raw

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

From: Scott Garman <[email protected]>

Signed-off-by Scott Garman <[email protected]>

---
 .../docbook-sgml-dtd/docbook-sgml-dtd-native.inc   |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc +8 -5

index 83cedbc..ede7bb1 100644
@@ -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
 }

Signature · 1 line

1.7.1

Scott Garman

author

2011-04-04 22:31 UTC #2 lore raw

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

In reply to Scott Garman

From: Scott Garman <[email protected]>

Signed-off-by Scott Garman <[email protected]>

---
 .../openjade/openjade-native_1.3.2.bb              |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +8 -5

index 5c1037a..1c672e1 100644
@@ -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
 }

Signature · 1 line

1.7.1

Scott Garman

author

2011-04-04 22:31 UTC #3 lore raw

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

In reply to Scott Garman

From: Scott Garman <[email protected]>

Signed-off-by Scott Garman <[email protected]>

---
 .../docbook-dsssl-stylesheets-native_1.79.bb       |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb +8 -5

index fc4d266..88d24dd 100644
@@ -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
 }

Signature · 1 line

1.7.1

Richard Purdie

Applied

2011-04-04 22:46 UTC #4 lore raw

In reply to Scott Garman

Quoted 24 lines · Scott Garman

From: Scott Garman <[email protected]>
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 <[email protected]>
---

Quoted 6 lines

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