* [PATCH 1/3] openjade-native: Add SYSROOT_PREPROCESS_FUNC
2011-07-22 23:54 [PATCH 0/3] Fix for share state native binary issue Saul Wold
@ 2011-07-22 23:54 ` Saul Wold
2011-07-22 23:57 ` Joshua Lock
2011-07-22 23:54 ` [PATCH 2/3] docbook-sgml-dtd-native: " Saul Wold
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Saul Wold @ 2011-07-22 23:54 UTC (permalink / raw)
To: openembedded-core
[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 <sgw@linux.intel.com>
---
.../openjade/openjade-native_1.3.2.bb | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 1c672e1..3922968 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -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
+}
+
--
1.7.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 1/3] openjade-native: Add SYSROOT_PREPROCESS_FUNC
2011-07-22 23:54 ` [PATCH 1/3] openjade-native: Add SYSROOT_PREPROCESS_FUNC Saul Wold
@ 2011-07-22 23:57 ` Joshua Lock
2011-07-23 3:25 ` Saul Wold
0 siblings, 1 reply; 7+ messages in thread
From: Joshua Lock @ 2011-07-22 23:57 UTC (permalink / raw)
To: openembedded-core
On Fri, 2011-07-22 at 16:54 -0700, Saul Wold wrote:
> [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 <sgw@linux.intel.com>
> ---
> .../openjade/openjade-native_1.3.2.bb | 12 ++++++++++--
> 1 files changed, 10 insertions(+), 2 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 1c672e1..3922968 100644
> --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
> +++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
> @@ -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 () {
This is not the same function name as above...
> + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
> + install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade
> +}
> +
--
Joshua Lock
Yocto Project "Johannes factotum"
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/3] openjade-native: Add SYSROOT_PREPROCESS_FUNC
2011-07-22 23:57 ` Joshua Lock
@ 2011-07-23 3:25 ` Saul Wold
0 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2011-07-23 3:25 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 07/22/2011 04:57 PM, Joshua Lock wrote:
> On Fri, 2011-07-22 at 16:54 -0700, Saul Wold wrote:
>> [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<sgw@linux.intel.com>
>> ---
>> .../openjade/openjade-native_1.3.2.bb | 12 ++++++++++--
>> 1 files changed, 10 insertions(+), 2 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 1c672e1..3922968 100644
>> --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
>> +++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
>> @@ -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 () {
>
> 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!
>> + install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/
>> + install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade
>> +}
>> +
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/3] docbook-sgml-dtd-native: Add SYSROOT_PREPROCESS_FUNC
2011-07-22 23:54 [PATCH 0/3] Fix for share state native binary issue Saul Wold
2011-07-22 23:54 ` [PATCH 1/3] openjade-native: Add SYSROOT_PREPROCESS_FUNC Saul Wold
@ 2011-07-22 23:54 ` Saul Wold
2011-07-22 23:54 ` [PATCH 3/3] docbook-dsssl-stylesheets-native: " Saul Wold
2011-07-25 15:39 ` [PATCH 0/3] Fix for share state native binary issue Saul Wold
3 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2011-07-22 23:54 UTC (permalink / raw)
To: openembedded-core
[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 <sgw@linux.intel.com>
---
.../docbook-sgml-dtd/docbook-sgml-dtd-native.inc | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 ede7bb1..542600a 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
@@ -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}
+}
+
--
1.7.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/3] docbook-dsssl-stylesheets-native: Add SYSROOT_PREPROCESS_FUNC
2011-07-22 23:54 [PATCH 0/3] Fix for share state native binary issue Saul Wold
2011-07-22 23:54 ` [PATCH 1/3] openjade-native: Add SYSROOT_PREPROCESS_FUNC Saul Wold
2011-07-22 23:54 ` [PATCH 2/3] docbook-sgml-dtd-native: " Saul Wold
@ 2011-07-22 23:54 ` Saul Wold
2011-07-25 15:39 ` [PATCH 0/3] Fix for share state native binary issue Saul Wold
3 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2011-07-22 23:54 UTC (permalink / raw)
To: openembedded-core
[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 <sgw@linux.intel.com>
---
.../docbook-dsssl-stylesheets-native_1.79.bb | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 88d24dd..a776ea5 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
@@ -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
+}
+
--
1.7.3.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 0/3] Fix for share state native binary issue
2011-07-22 23:54 [PATCH 0/3] Fix for share state native binary issue Saul Wold
` (2 preceding siblings ...)
2011-07-22 23:54 ` [PATCH 3/3] docbook-dsssl-stylesheets-native: " Saul Wold
@ 2011-07-25 15:39 ` Saul Wold
3 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2011-07-25 15:39 UTC (permalink / raw)
To: openembedded-core
On 07/22/2011 04:54 PM, Saul Wold wrote:
> 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(-)
>
Corrected version was merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 7+ messages in thread