Fix for share state native binary issue

PATCH In review Saul Wold 2 participants 7 messages Jul 22, 2011 – Jul 25, 2011

lore

Share & tools

lore

Saul Wold

author

2011-07-22 23:58 UTC #0 lore raw

cover Fix for share state native binary issue

Richard,

This fixes the install-catalog issue with shared state native dependencies. This is the point fix, it does not address the underlying issue which will take more work and time.

Sau!

The following changes since commit b4c23fce3eadaff8fc621d38759d493cd03cc131:

consolekit 0.4.5: fix PAM installation dir (2011-07-22 11:56:42 +0100)

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

Saul Wold (3):
openjade-native: Add SYSROOT_PREPROCESS_FUNC
docbook-sgml-dtd-native: Add SYSROOT_PREPROCESS_FUNC docbook-dsssl-stylesheets-native: Add SYSROOT_PREPROCESS_FUNC

 .../docbook-dsssl-stylesheets-native_1.79.bb       |   12 ++++++++++--
 .../docbook-sgml-dtd/docbook-sgml-dtd-native.inc   |   11 +++++++++--
 .../openjade/openjade-native_1.3.2.bb              |   12 ++++++++++--
 3 files changed, 29 insertions(+), 6 deletions(-)

Signature · 1 line

1.7.3.4

Saul Wold

author

2011-07-22 23:58 UTC #1 lore raw

PATCH 1/3 openjade-native: Add SYSROOT_PREPROCESS_FUNC

[YOCTO #1250]

This added function will install a private install-catalog binary so that shared state can find the binary as there is not a guarantee.

Signed-off-by Saul Wold <[email protected]>

---
 .../openjade/openjade-native_1.3.2.bb              |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +10 -2

index 1c672e1..3922968 100644
@@ -7,7 +7,7 @@ SECTION = "base"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "opensp-native sgml-common-native"
 RDEPENDS_${PN} = "sgml-common"

@@ -31,6 +31,8 @@ CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS', True).replace('--datadir=${datadi
 CFLAGS =+ "-I${S}/include"
 
 SSTATEPOSTINSTFUNCS += "openjade_sstate_postinst"
+SYSROOT_PREPROCESS_FUNCS += "openjade_sysroot_preprocess"
+
 
 # We need to do this else the source interdependencies aren't generated and
 # build failures can result (e.g. zero size style/Makefile.dep file)

@@ -66,8 +68,14 @@ openjade_sstate_postinst() {
 	then
 		# Ensure that the catalog file sgml-docbook.cat is properly
 		# updated when the package is installed from sstate cache.
-		install-catalog \
+		${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \
 			--add ${sysconfdir}/sgml/sgml-docbook.cat \
 			${sysconfdir}/sgml/openjade-${PV}.cat
 	fi
 }
+
+docbook_sgml_dtd_sysroot_preprocess () {
+    install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
+    install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade
+}
+

Signature · 1 line

1.7.3.4

Joshua Lock

2011-07-23 00:01 UTC #2 lore raw

Re: [PATCH 1/3] openjade-native: Add SYSROOT_PREPROCESS_FUNC

Quoted 34 lines · Saul Wold

[YOCTO #1250]

This added function will install a private install-catalog binary so that shared state can find the binary as there is not a guarantee.

Signed-off-by Saul Wold <[email protected]>

---
 .../openjade/openjade-native_1.3.2.bb              |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +3 -1

index 1c672e1..3922968 100644
@@ -7,7 +7,7 @@ SECTION = "base"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "opensp-native sgml-common-native"
 RDEPENDS_${PN} = "sgml-common"

@@ -31,6 +31,8 @@ CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS', True).replace('--datadir=${datadi
 CFLAGS =+ "-I${S}/include"
 
 SSTATEPOSTINSTFUNCS += "openjade_sstate_postinst"
+SYSROOT_PREPROCESS_FUNCS += "openjade_sysroot_preprocess"
+
 
 # We need to do this else the source interdependencies aren't generated and
 # build failures can result (e.g. zero size style/Makefile.dep file)

@@ -66,8 +68,14 @@ openjade_sstate_postinst() {
 	then

meta/recipes-devtools/openjade/openjade-native_1.3.2.bb openjade_sstate_postinst() { · line 77

Quoted 10 lines

meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +3 -1

 		# Ensure that the catalog file sgml-docbook.cat is properly
 		# updated when the package is installed from sstate cache.
-		install-catalog \
+		${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \
 			--add ${sysconfdir}/sgml/sgml-docbook.cat \
 			${sysconfdir}/sgml/openjade-${PV}.cat
 	fi
 }
+
+docbook_sgml_dtd_sysroot_preprocess () {

This is not the same function name as above...

Quoted 4 lines

meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +4 -0

+    install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
+    install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade
+}
+

Signature · 3 lines

Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre

Saul Wold

author

2011-07-23 03:29 UTC #3 lore raw

Re: [PATCH 1/3] openjade-native: Add SYSROOT_PREPROCESS_FUNC

Quoted 31 lines · Joshua Lock

Quoted 30 lines · Saul Wold

[YOCTO #1250]

This added function will install a private install-catalog binary so that shared state can find the binary as there is not a guarantee.

Signed-off-by Saul Wold<[email protected]>

---
  .../openjade/openjade-native_1.3.2.bb              |   12 ++++++++++--
  1 files changed, 10 insertions(+), 2 deletions(-)

meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +3 -1

index 1c672e1..3922968 100644
@@ -7,7 +7,7 @@ SECTION = "base"
  LICENSE = "BSD"
  LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
 
-PR = "r2"
+PR = "r3"
 
  DEPENDS = "opensp-native sgml-common-native"
  RDEPENDS_${PN} = "sgml-common"

@@ -31,6 +31,8 @@ CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS', True).replace('--datadir=${datadi
  CFLAGS =+ "-I${S}/include"
 
  SSTATEPOSTINSTFUNCS += "openjade_sstate_postinst"
+SYSROOT_PREPROCESS_FUNCS += "openjade_sysroot_preprocess"
+

Quoted 17 lines

Quoted 4 lines

meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +0 -0

  # We need to do this else the source interdependencies aren't generated and
  # build failures can result (e.g. zero size style/Makefile.dep file)

@@ -66,8 +68,14 @@ openjade_sstate_postinst() {
  	then

meta/recipes-devtools/openjade/openjade-native_1.3.2.bb openjade_sstate_postinst() { · line 77

Quoted 10 lines

meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +3 -1

  		# Ensure that the catalog file sgml-docbook.cat is properly
  		# updated when the package is installed from sstate cache.
-		install-catalog \
+		${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \
  			--add ${sysconfdir}/sgml/sgml-docbook.cat \
  			${sysconfdir}/sgml/openjade-${PV}.cat
  	fi
  }
+
+docbook_sgml_dtd_sysroot_preprocess () {

This is not the same function name as above...

Good catch on Johsua's part, Bad on my part for not completing testing before sending this out. I had a build going before I send the pull request.

Thanks
Sau!

Quoted 5 lines

Quoted 4 lines

meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +4 -0

+    install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
+    install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade
+}
+

Saul Wold

author

2011-07-22 23:58 UTC #4 lore raw

PATCH 2/3 docbook-sgml-dtd-native: Add SYSROOT_PREPROCESS_FUNC

In reply to Saul Wold

[YOCTO #1250]

This added function will install a private install-catalog binary so that shared state can find the binary as there is not a guarantee.

Signed-off-by Saul Wold <[email protected]>

---
 .../docbook-sgml-dtd/docbook-sgml-dtd-native.inc   |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc +9 -2

index ede7bb1..542600a 100644
@@ -20,9 +20,10 @@ SRC_URI = "http://www.docbook.org/sgml/${DTD_VERSION}/docbook-${DTD_VERSION}.zip
 # The .zip file extracts to the current dir
 S = "${WORKDIR}"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 SSTATEPOSTINSTFUNCS += "docbook_sgml_dtd_sstate_postinst"
+SYSROOT_PREPROCESS_FUNCS += "docbook_sgml_dtd_sysroot_preprocess"
 
 inherit native

@@ -43,8 +44,14 @@ docbook_sgml_dtd_sstate_postinst () {
 	then
 		# Ensure that the catalog file sgml-docbook.cat is properly
 		# updated when the package is installed from sstate cache.
-		install-catalog \
+		${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-sgml-dtd-${DTD_VERSION} \
 			--add ${sysconfdir}/sgml/sgml-docbook.cat \
 			${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat
 	fi
 }
+
+docbook_sgml_dtd_sysroot_preprocess () {
+    install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
+    install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-sgml-dtd-${DTD_VERSION}
+}
+

Signature · 1 line

1.7.3.4

Saul Wold

author

2011-07-22 23:58 UTC #5 lore raw

PATCH 3/3 docbook-dsssl-stylesheets-native: Add SYSROOT_PREPROCESS_FUNC

In reply to Saul Wold

[YOCTO #1250]

This added function will install a private install-catalog binary so that shared state can find the binary as there is not a guarantee.

Signed-off-by Saul Wold <[email protected]>

---
 .../docbook-dsssl-stylesheets-native_1.79.bb       |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb +10 -2

index 88d24dd..a776ea5 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=41;endline=74;md5=875385159b2ee76ecf
 
 DEPENDS = "sgml-common-native"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-dsssl-${PV}.tar.bz2"

@@ -19,6 +19,8 @@ S = "${WORKDIR}/docbook-dsssl-${PV}"
 inherit native
 
 SSTATEPOSTINSTFUNCS += "docbook_dsssl_stylesheets_sstate_postinst"
+SYSROOT_PREPROCESS_FUNCS += "docbook_dsssl_sysroot_preprocess"
+
 
 do_install () {
 	# Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html

@@ -42,8 +44,14 @@ docbook_dsssl_stylesheets_sstate_postinst () {
 	then
 		# Ensure that the catalog file sgml-docbook.cat is properly
 		# updated when the package is installed from sstate cache.
-		install-catalog \
+		${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl \
 			--add ${sysconfdir}/sgml/sgml-docbook.cat \
 			${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
 	fi
 }
+
+docbook_dsssl_sysroot_preprocess () {
+    install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
+    install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl
+}
+

Signature · 1 line

1.7.3.4

Saul Wold

author

2011-07-25 15:43 UTC #6 lore raw

In reply to Saul Wold

Quoted 22 lines · Saul Wold

Richard,
This fixes the install-catalog issue with shared state native dependencies. This is the point fix, it does not address the underlying issue which will take more work and time.
Sau!
The following changes since commit b4c23fce3eadaff8fc621d38759d493cd03cc131:
   consolekit 0.4.5: fix PAM installation dir (2011-07-22 11:56:42 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
Saul Wold (3):
openjade-native: Add SYSROOT_PREPROCESS_FUNC
docbook-sgml-dtd-native: Add SYSROOT_PREPROCESS_FUNC docbook-dsssl-stylesheets-native: Add SYSROOT_PREPROCESS_FUNC

Quoted 5 lines

  .../docbook-dsssl-stylesheets-native_1.79.bb       |   12 ++++++++++--
  .../docbook-sgml-dtd/docbook-sgml-dtd-native.inc   |   11 +++++++++--
  .../openjade/openjade-native_1.3.2.bb              |   12 ++++++++++--
  3 files changed, 29 insertions(+), 6 deletions(-)

Corrected version was merged into OE-Core

Thanks
Sau!