[PATCH 0/2] sstate relocation patches

[PATCH 0/2] sstate relocation patches

[Saul Wold]

This fixese 2 issues for doc generation discovered in the 
new autobuilder infrastruture with shared state.  opensp and 
groff both had hard coded locations to look for data files.

Sau!

The following changes since commit 0616557a8c29b42bae0ffd5fd665a046810047e4:

  populate_sdk: We need to ensure that the SDK sysroot reflects PACKAGE_ARCH (2011-09-02 23:38:00 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/oe-fix2
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/oe-fix2

Saul Wold (2):
  groff: Fix sstate relocation issue
  opensp: Fix sstate relocation issue

 meta/recipes-devtools/opensp/opensp_1.5.bb  |    9 ++++++++-
 meta/recipes-extended/groff/groff_1.20.1.bb |    9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

-- 
1.7.6

[PATCH 1/2] groff: Fix sstate relocation issue

[Saul Wold]

[YOCTO #1439]

This fixes a problem where the native groff has a path hard coded into
it, therefor add a wrapper to set the command line with the correct
paths for fonts and tmac directories.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/groff/groff_1.20.1.bb |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb b/meta/recipes-extended/groff/groff_1.20.1.bb
index 7085911..3e24253 100644
--- a/meta/recipes-extended/groff/groff_1.20.1.bb
+++ b/meta/recipes-extended/groff/groff_1.20.1.bb
@@ -4,7 +4,7 @@ formatting commands and produces formatted output."
 SECTION = "base"
 HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"
 LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
@@ -34,4 +34,11 @@ do_configure_prepend() {
 	fi
 }
 
+do_install_append_virtclass-native() {
+	create_cmdline_wrapper ${D}/${bindir}/groff \
+		-F${STAGING_DIR_NATIVE}/usr/share/groff/${PV}/font \
+		-M${STAGING_DIR_NATIVE}/usr/share/groff/${PV}/tmac
+}
+
+
 BBCLASSEXTEND = "native"
-- 
1.7.6

Re: [PATCH 1/2] groff: Fix sstate relocation issue

[Phil Blundell]

On Sat, 2011-09-03 at 21:19 -0700, Saul Wold wrote:
> +	create_cmdline_wrapper ${D}/${bindir}/groff \
> +		-F${STAGING_DIR_NATIVE}/usr/share/groff/${PV}/font \
> +		-M${STAGING_DIR_NATIVE}/usr/share/groff/${PV}/tmac
> +}

Shouldn't that be ${datadir}?

p.

Re: [PATCH 1/2] groff: Fix sstate relocation issue

[Richard Purdie]

On Sun, 2011-09-04 at 18:58 +0100, Phil Blundell wrote:
> On Sat, 2011-09-03 at 21:19 -0700, Saul Wold wrote:
> > +	create_cmdline_wrapper ${D}/${bindir}/groff \
> > +		-F${STAGING_DIR_NATIVE}/usr/share/groff/${PV}/font \
> > +		-M${STAGING_DIR_NATIVE}/usr/share/groff/${PV}/tmac
> > +}
> 
> Shouldn't that be ${datadir}?

or datadir_native :)

I'll pull and amend the patch with that change.

Cheers,

Richard

[PATCH 2/2] opensp: Fix sstate relocation issue

[Saul Wold]

[YOCTO #1439]

This fixes a problem where the native nsgmls has a path hard coded into
it, therefor add a wrapper to set the environment with the correct
paths for catalog files.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/opensp/opensp_1.5.bb |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/opensp/opensp_1.5.bb b/meta/recipes-devtools/opensp/opensp_1.5.bb
index a402d11..0269c87 100644
--- a/meta/recipes-devtools/opensp/opensp_1.5.bb
+++ b/meta/recipes-devtools/opensp/opensp_1.5.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
 
-PR = "r1"
+PR = "r2"
 
 # At -Os it encounters calls to some inline functions which are then
 # not found in any other objects with gcc 4.5
@@ -42,6 +42,13 @@ do_install_append() {
 	ln -sf osx sgml2xml
 }
 
+do_install_append_virtclass-native() {
+	for util in nsgmls sgmlnorm spam spcat spent sx; do
+		create_wrapper ${D}/${bindir}/$util \
+		    SGML_CATALOG_FILES=${sysconfdir}/sgml/catalog 
+	done
+}
+
 FILES_${PN} += "${datadir}/OpenSP/"
 
 BBCLASSEXTEND = "native"
-- 
1.7.6

Re: [PATCH 2/2] opensp: Fix sstate relocation issue

[Saul Wold]

On 09/03/2011 09:19 PM, Saul Wold wrote:
> [YOCTO #1439]
>
> This fixes a problem where the native nsgmls has a path hard coded into
> it, therefor add a wrapper to set the environment with the correct
> paths for catalog files.
>
> Signed-off-by: Saul Wold<sgw@linux.intel.com>
> ---
>   meta/recipes-devtools/opensp/opensp_1.5.bb |    9 ++++++++-
>   1 files changed, 8 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-devtools/opensp/opensp_1.5.bb b/meta/recipes-devtools/opensp/opensp_1.5.bb
> index a402d11..0269c87 100644
> --- a/meta/recipes-devtools/opensp/opensp_1.5.bb
> +++ b/meta/recipes-devtools/opensp/opensp_1.5.bb
> @@ -5,7 +5,7 @@ SECTION = "libs"
>   LICENSE = "BSD"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
>
> -PR = "r1"
> +PR = "r2"
>
>   # At -Os it encounters calls to some inline functions which are then
>   # not found in any other objects with gcc 4.5
> @@ -42,6 +42,13 @@ do_install_append() {
>   	ln -sf osx sgml2xml
>   }
>
> +do_install_append_virtclass-native() {
> +	for util in nsgmls sgmlnorm spam spcat spent sx; do
> +		create_wrapper ${D}/${bindir}/$util \
> +		    SGML_CATALOG_FILES=${sysconfdir}/sgml/catalog
> +	done
> +}
> +
>   FILES_${PN} += "${datadir}/OpenSP/"
>
>   BBCLASSEXTEND = "native"

I found an issue with this patch, as it stands right now the 
linuxdoc-tools-native failes to build with this patch.

If I change the pass the catalog directory via -D, then the iputils goes 
back to failing!  It seems that some more work might be needed and 
possibly a patch to the opensp catalog search mode.  What I saw 
happening is it seems to pick up the command line path for the index.db 
and incorporates it with the catalog search path.

More digging is needed.

Sau!