* [PATCH 0/3] Fixes for doc-related build failures, v2
@ 2011-04-04 22:30 Scott Garman
2011-04-04 22:30 ` [PATCH 1/3] docbook-sgml-dtd-native.inc: run install-catalog only during do_populate_sysroot Scott Garman
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Scott Garman @ 2011-04-04 22:30 UTC (permalink / raw)
To: poky
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(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/3] docbook-sgml-dtd-native.inc: run install-catalog only during do_populate_sysroot
2011-04-04 22:30 [PATCH 0/3] Fixes for doc-related build failures, v2 Scott Garman
@ 2011-04-04 22:30 ` Scott Garman
2011-04-04 22:30 ` [PATCH 2/3] openjade-native: " Scott Garman
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Scott Garman @ 2011-04-04 22:30 UTC (permalink / raw)
To: poky
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] openjade-native: run install-catalog only during do_populate_sysroot
2011-04-04 22:30 [PATCH 0/3] Fixes for doc-related build failures, v2 Scott Garman
2011-04-04 22:30 ` [PATCH 1/3] docbook-sgml-dtd-native.inc: run install-catalog only during do_populate_sysroot Scott Garman
@ 2011-04-04 22:30 ` Scott Garman
2011-04-04 22:30 ` [PATCH 3/3] docbook-dsssl-stylesheets-native: " Scott Garman
2011-04-04 22:45 ` [PATCH 0/3] Fixes for doc-related build failures, v2 Richard Purdie
3 siblings, 0 replies; 5+ messages in thread
From: Scott Garman @ 2011-04-04 22:30 UTC (permalink / raw)
To: poky
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] docbook-dsssl-stylesheets-native: run install-catalog only during do_populate_sysroot
2011-04-04 22:30 [PATCH 0/3] Fixes for doc-related build failures, v2 Scott Garman
2011-04-04 22:30 ` [PATCH 1/3] docbook-sgml-dtd-native.inc: run install-catalog only during do_populate_sysroot Scott Garman
2011-04-04 22:30 ` [PATCH 2/3] openjade-native: " Scott Garman
@ 2011-04-04 22:30 ` Scott Garman
2011-04-04 22:45 ` [PATCH 0/3] Fixes for doc-related build failures, v2 Richard Purdie
3 siblings, 0 replies; 5+ messages in thread
From: Scott Garman @ 2011-04-04 22:30 UTC (permalink / raw)
To: poky
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] Fixes for doc-related build failures, v2
2011-04-04 22:30 [PATCH 0/3] Fixes for doc-related build failures, v2 Scott Garman
` (2 preceding siblings ...)
2011-04-04 22:30 ` [PATCH 3/3] docbook-dsssl-stylesheets-native: " Scott Garman
@ 2011-04-04 22:45 ` Richard Purdie
3 siblings, 0 replies; 5+ messages in thread
From: Richard Purdie @ 2011-04-04 22:45 UTC (permalink / raw)
To: Scott Garman; +Cc: poky
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-04-04 22:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-04 22:30 [PATCH 0/3] Fixes for doc-related build failures, v2 Scott Garman
2011-04-04 22:30 ` [PATCH 1/3] docbook-sgml-dtd-native.inc: run install-catalog only during do_populate_sysroot Scott Garman
2011-04-04 22:30 ` [PATCH 2/3] openjade-native: " Scott Garman
2011-04-04 22:30 ` [PATCH 3/3] docbook-dsssl-stylesheets-native: " Scott Garman
2011-04-04 22:45 ` [PATCH 0/3] Fixes for doc-related build failures, v2 Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox