Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH] opkg: Fix error when recompiled
@ 2015-03-05 15:17 Gary Thomas
  2015-03-05 15:38 ` Otavio Salvador
  0 siblings, 1 reply; 3+ messages in thread
From: Gary Thomas @ 2015-03-05 15:17 UTC (permalink / raw)
  To: openembedded-core; +Cc: Gary Thomas

If this package were ever recompiled, i.e. do_compile is rerun
as a result of a compiler change, etc., the 'opkg.conf' file
would be incorrectly updated, leading to an error:
 * opkg_conf_set_option: Duplicate option lists_dir, using first seen value "/var/lib/opkg".

This change prevents this by not tampering with the original 'opkg.conf'

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
 meta/recipes-devtools/opkg/opkg_0.2.4.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/opkg/opkg_0.2.4.bb b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
index 8455eac..b07d4d4 100644
--- a/meta/recipes-devtools/opkg/opkg_0.2.4.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
@@ -48,12 +48,13 @@ do_configure_prepend() {
 }
 
 do_compile_append () {
-	echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf
+	cp ${WORKDIR}/opkg.conf ${WORKDIR}/opkg.conf-configured
+	echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf-configured
 }
 
 do_install_append () {
 	install -d ${D}${sysconfdir}/opkg
-	install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
+	install -m 0644 ${WORKDIR}/opkg.conf-configured ${D}${sysconfdir}/opkg/opkg.conf
 
 	# We need to create the lock directory
 	install -d ${D}${OPKGLIBDIR}/opkg
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] opkg: Fix error when recompiled
  2015-03-05 15:17 [PATCH] opkg: Fix error when recompiled Gary Thomas
@ 2015-03-05 15:38 ` Otavio Salvador
  2015-03-05 15:40   ` Gary Thomas
  0 siblings, 1 reply; 3+ messages in thread
From: Otavio Salvador @ 2015-03-05 15:38 UTC (permalink / raw)
  To: Gary Thomas; +Cc: Patches and discussions about the oe-core layer

On Thu, Mar 5, 2015 at 12:17 PM, Gary Thomas <gary@mlbassoc.com> wrote:
> If this package were ever recompiled, i.e. do_compile is rerun
> as a result of a compiler change, etc., the 'opkg.conf' file
> would be incorrectly updated, leading to an error:
>  * opkg_conf_set_option: Duplicate option lists_dir, using first seen value "/var/lib/opkg".
>
> This change prevents this by not tampering with the original 'opkg.conf'
>
> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
> ---
>  meta/recipes-devtools/opkg/opkg_0.2.4.bb | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/opkg/opkg_0.2.4.bb b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
> index 8455eac..b07d4d4 100644
> --- a/meta/recipes-devtools/opkg/opkg_0.2.4.bb
> +++ b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
> @@ -48,12 +48,13 @@ do_configure_prepend() {
>  }
>
>  do_compile_append () {
> -       echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf
> +       cp ${WORKDIR}/opkg.conf ${WORKDIR}/opkg.conf-configured
> +       echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf-configured

Ideally this could be done for D (in install) so it does not need to
be preserved.

>  }
>
>  do_install_append () {
>         install -d ${D}${sysconfdir}/opkg
> -       install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
> +       install -m 0644 ${WORKDIR}/opkg.conf-configured ${D}${sysconfdir}/opkg/opkg.conf
>
>         # We need to create the lock directory
>         install -d ${D}${OPKGLIBDIR}/opkg
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core



-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] opkg: Fix error when recompiled
  2015-03-05 15:38 ` Otavio Salvador
@ 2015-03-05 15:40   ` Gary Thomas
  0 siblings, 0 replies; 3+ messages in thread
From: Gary Thomas @ 2015-03-05 15:40 UTC (permalink / raw)
  To: Otavio Salvador; +Cc: Patches and discussions about the oe-core layer

On 2015-03-05 08:38, Otavio Salvador wrote:
> On Thu, Mar 5, 2015 at 12:17 PM, Gary Thomas <gary@mlbassoc.com> wrote:
>> If this package were ever recompiled, i.e. do_compile is rerun
>> as a result of a compiler change, etc., the 'opkg.conf' file
>> would be incorrectly updated, leading to an error:
>>   * opkg_conf_set_option: Duplicate option lists_dir, using first seen value "/var/lib/opkg".
>>
>> This change prevents this by not tampering with the original 'opkg.conf'
>>
>> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
>> ---
>>   meta/recipes-devtools/opkg/opkg_0.2.4.bb | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/opkg/opkg_0.2.4.bb b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
>> index 8455eac..b07d4d4 100644
>> --- a/meta/recipes-devtools/opkg/opkg_0.2.4.bb
>> +++ b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
>> @@ -48,12 +48,13 @@ do_configure_prepend() {
>>   }
>>
>>   do_compile_append () {
>> -       echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf
>> +       cp ${WORKDIR}/opkg.conf ${WORKDIR}/opkg.conf-configured
>> +       echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf-configured
>
> Ideally this could be done for D (in install) so it does not need to
> be preserved.

Sure, that's probably a better way to do it - I was just following the code
that was there (and incorrect).  I'll make a new patch.

>
>>   }
>>
>>   do_install_append () {
>>          install -d ${D}${sysconfdir}/opkg
>> -       install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
>> +       install -m 0644 ${WORKDIR}/opkg.conf-configured ${D}${sysconfdir}/opkg/opkg.conf
>>
>>          # We need to create the lock directory
>>          install -d ${D}${OPKGLIBDIR}/opkg
>> --
>> 1.9.1
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-03-05 15:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-05 15:17 [PATCH] opkg: Fix error when recompiled Gary Thomas
2015-03-05 15:38 ` Otavio Salvador
2015-03-05 15:40   ` Gary Thomas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox