Patchwork [1/1] opensp: Fix hard path in native nsgmls.

login
register
mail settings
Submitter Zhai, Edwin
Date Sept. 9, 2011, 2:53 a.m.
Message ID <e7bb01a01d1fdf5262436e16b118583b5956e4b9.1315536041.git.edwin.zhai@intel.com>
Download mbox | patch
Permalink /patch/11251/
State New, archived
Headers show

Comments

Zhai, Edwin - Sept. 9, 2011, 2:53 a.m.
From: Zhai Edwin <edwin.zhai@intel.com>

This relocation issues caused following bug and introduce one partial fix bb024d:
[YOCTO #1440]

But the environment val hacking is not working all the time, as nsgmsl may
append wrong path in some case. This fix use search directory "-D" as solution.
It's better if got fixed from opensp side when next upgrade.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
CC: Saul Would <sgw@linux.intel.com>
---
 meta/recipes-devtools/opensp/opensp_1.5.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Saul Wold - Sept. 9, 2011, 4:49 a.m.
On 09/08/2011 07:53 PM, edwin.zhai@intel.com wrote:
> From: Zhai Edwin<edwin.zhai@intel.com>
>
> This relocation issues caused following bug and introduce one partial fix bb024d:
> [YOCTO #1440]
>
> But the environment val hacking is not working all the time, as nsgmsl may
> append wrong path in some case. This fix use search directory "-D" as solution.
> It's better if got fixed from opensp side when next upgrade.
>
> Signed-off-by: Zhai Edwin<edwin.zhai@intel.com>
> CC: Saul Would<sgw@linux.intel.com>
> ---
>   meta/recipes-devtools/opensp/opensp_1.5.bb |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/opensp/opensp_1.5.bb b/meta/recipes-devtools/opensp/opensp_1.5.bb
> index 0269c87..d692137 100644
> --- a/meta/recipes-devtools/opensp/opensp_1.5.bb
> +++ b/meta/recipes-devtools/opensp/opensp_1.5.bb
> @@ -44,8 +44,8 @@ do_install_append() {
>
>   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
> +		create_cmdline_wrapper ${D}/${bindir}/$util \
> +		    -D ${sysconfdir}/sgml
>   	done
>   }
>
Have you tested this with iputils?  When I tried this, it did not work 
correctly for me, can you give me more of idea of how you tested this.

Sau!
Zhai, Edwin - Sept. 9, 2011, 2:16 p.m.
On 2011/9/9 12:49, Saul Wold wrote:
> On 09/08/2011 07:53 PM, edwin.zhai@intel.com wrote:
>> From: Zhai Edwin<edwin.zhai@intel.com>
>>
>> This relocation issues caused following bug and introduce one partial fix bb024d:
>> [YOCTO #1440]
>>
>> But the environment val hacking is not working all the time, as nsgmsl may
>> append wrong path in some case. This fix use search directory "-D" as solution.
>> It's better if got fixed from opensp side when next upgrade.
>>
>> Signed-off-by: Zhai Edwin<edwin.zhai@intel.com>
>> CC: Saul Would<sgw@linux.intel.com>
>> ---
>>    meta/recipes-devtools/opensp/opensp_1.5.bb |    4 ++--
>>    1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/opensp/opensp_1.5.bb b/meta/recipes-devtools/opensp/opensp_1.5.bb
>> index 0269c87..d692137 100644
>> --- a/meta/recipes-devtools/opensp/opensp_1.5.bb
>> +++ b/meta/recipes-devtools/opensp/opensp_1.5.bb
>> @@ -44,8 +44,8 @@ do_install_append() {
>>
>>    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
>> +		create_cmdline_wrapper ${D}/${bindir}/$util \
>> +		    -D ${sysconfdir}/sgml
>>    	done
>>    }
>>
> Have you tested this with iputils?  When I tried this, it did not work
> correctly for me, can you give me more of idea of how you tested this.

Sorry, I forgot to rename the tmp to make sysroot unavailable:( After 
renaming, the bug still exist.
Upgrading to 1.5.2 doesn't help. After debug with strace, I found nsgmls 
append ".." to other paths when inputting "../index.db" as you said. 
It's reasonable for entity such as ping.sgml, as they usually sit in 
same dir as index.db. But catalog should not do this.

I have tried "-c" to specify catalog path, and found it works.  Could 
you pls. have a try on the same contrib tree?
contrib/gzhai/master2

Thanks,
Edwin

>
> Sau!
>
Saul Wold - Sept. 9, 2011, 3:11 p.m.
On 09/09/2011 07:16 AM, Zhai, Edwin wrote:
> On 2011/9/9 12:49, Saul Wold wrote:
>> On 09/08/2011 07:53 PM, edwin.zhai@intel.com wrote:
>>> From: Zhai Edwin<edwin.zhai@intel.com>
>>>
>>> This relocation issues caused following bug and introduce one partial
>>> fix bb024d:
>>> [YOCTO #1440]
>>>
>>> But the environment val hacking is not working all the time, as
>>> nsgmsl may
>>> append wrong path in some case. This fix use search directory "-D" as
>>> solution.
>>> It's better if got fixed from opensp side when next upgrade.
>>>
>>> Signed-off-by: Zhai Edwin<edwin.zhai@intel.com>
>>> CC: Saul Would<sgw@linux.intel.com>
>>> ---
>>> meta/recipes-devtools/opensp/opensp_1.5.bb | 4 ++--
>>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/meta/recipes-devtools/opensp/opensp_1.5.bb
>>> b/meta/recipes-devtools/opensp/opensp_1.5.bb
>>> index 0269c87..d692137 100644
>>> --- a/meta/recipes-devtools/opensp/opensp_1.5.bb
>>> +++ b/meta/recipes-devtools/opensp/opensp_1.5.bb
>>> @@ -44,8 +44,8 @@ do_install_append() {
>>>
>>> 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
>>> + create_cmdline_wrapper ${D}/${bindir}/$util \
>>> + -D ${sysconfdir}/sgml
>>> done
>>> }
>>>
>> Have you tested this with iputils? When I tried this, it did not work
>> correctly for me, can you give me more of idea of how you tested this.
>
> Sorry, I forgot to rename the tmp to make sysroot unavailable:( After
> renaming, the bug still exist.
> Upgrading to 1.5.2 doesn't help. After debug with strace, I found nsgmls
> append ".." to other paths when inputting "../index.db" as you said.
> It's reasonable for entity such as ping.sgml, as they usually sit in
> same dir as index.db. But catalog should not do this.
>
> I have tried "-c" to specify catalog path, and found it works. Could you
> pls. have a try on the same contrib tree?
> contrib/gzhai/master2
>
Edwin,

Did you try the -c with the linuxdoc-tools-native recipe also?  I found 
that when I used -c option with that recipe I then get a failure, so as 
I have mentioned before I think the problem maybe in the opensp code 
itself and it should not append the ".." to the catalog search patch.

Sau!

> Thanks,
> Edwin
>
>>
>> Sau!
>>
>
>
Zhai, Edwin - Sept. 10, 2011, 1 a.m.
On 2011/9/9 23:11, Saul Wold wrote:
> On 09/09/2011 07:16 AM, Zhai, Edwin wrote:
>> On 2011/9/9 12:49, Saul Wold wrote:
>>> On 09/08/2011 07:53 PM, edwin.zhai@intel.com wrote:
>>>> From: Zhai Edwin<edwin.zhai@intel.com>
>>>>
>>>> This relocation issues caused following bug and introduce one partial
>>>> fix bb024d:
>>>> [YOCTO #1440]
>>>>
>>>> But the environment val hacking is not working all the time, as
>>>> nsgmsl may
>>>> append wrong path in some case. This fix use search directory "-D" as
>>>> solution.
>>>> It's better if got fixed from opensp side when next upgrade.
>>>>
>>>> Signed-off-by: Zhai Edwin<edwin.zhai@intel.com>
>>>> CC: Saul Would<sgw@linux.intel.com>
>>>> ---
>>>> meta/recipes-devtools/opensp/opensp_1.5.bb | 4 ++--
>>>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/meta/recipes-devtools/opensp/opensp_1.5.bb
>>>> b/meta/recipes-devtools/opensp/opensp_1.5.bb
>>>> index 0269c87..d692137 100644
>>>> --- a/meta/recipes-devtools/opensp/opensp_1.5.bb
>>>> +++ b/meta/recipes-devtools/opensp/opensp_1.5.bb
>>>> @@ -44,8 +44,8 @@ do_install_append() {
>>>>
>>>> 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
>>>> + create_cmdline_wrapper ${D}/${bindir}/$util \
>>>> + -D ${sysconfdir}/sgml
>>>> done
>>>> }
>>>>
>>> Have you tested this with iputils? When I tried this, it did not work
>>> correctly for me, can you give me more of idea of how you tested this.
>> Sorry, I forgot to rename the tmp to make sysroot unavailable:( After
>> renaming, the bug still exist.
>> Upgrading to 1.5.2 doesn't help. After debug with strace, I found nsgmls
>> append ".." to other paths when inputting "../index.db" as you said.
>> It's reasonable for entity such as ping.sgml, as they usually sit in
>> same dir as index.db. But catalog should not do this.
>>
>> I have tried "-c" to specify catalog path, and found it works. Could you
>> pls. have a try on the same contrib tree?
>> contrib/gzhai/master2
>>
> Edwin,
>
> Did you try the -c with the linuxdoc-tools-native recipe also?  I found
> that when I used -c option with that recipe I then get a failure,

No. You have mentioned focus on iputils. Seems this fix is same as the 
one in poky.

> so as
> I have mentioned before I think the problem maybe in the opensp code
> itself and it should not append the ".." to the catalog search patch.

Agree with you.  but hack in the source code need some time.


>> Thanks,
>> Edwin
>>
>>> Sau!
>>>
>>

Patch

diff --git a/meta/recipes-devtools/opensp/opensp_1.5.bb b/meta/recipes-devtools/opensp/opensp_1.5.bb
index 0269c87..d692137 100644
--- a/meta/recipes-devtools/opensp/opensp_1.5.bb
+++ b/meta/recipes-devtools/opensp/opensp_1.5.bb
@@ -44,8 +44,8 @@  do_install_append() {
 
 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 
+		create_cmdline_wrapper ${D}/${bindir}/$util \
+		    -D ${sysconfdir}/sgml
 	done
 }