[PATCH v2] opkg: Fix error when recompiled

[PATCH v2] opkg: Fix error when recompiled

[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".

v2: Move the update of the opkg.conf file into 'do_install' which
will prevent any erroneous [multiple] options to be added to 'opkg.conf'

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
 meta/recipes-devtools/opkg/opkg_0.2.4.bb | 5 +----
 1 file changed, 1 insertion(+), 4 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..447f3f6 100644
--- a/meta/recipes-devtools/opkg/opkg_0.2.4.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.2.4.bb
@@ -47,13 +47,10 @@ do_configure_prepend() {
 	sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am
 }
 
-do_compile_append () {
-	echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf
-}
-
 do_install_append () {
 	install -d ${D}${sysconfdir}/opkg
 	install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
+	echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${D}${sysconfdir}/opkg/opkg.conf
 
 	# We need to create the lock directory
 	install -d ${D}${OPKGLIBDIR}/opkg
-- 
1.9.1

Re: [PATCH v2] opkg: Fix error when recompiled

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 386 bytes --]

Hi Gary,

On 5 March 2015 at 15:48, Gary Thomas <gary@mlbassoc.com> wrote:

> v2: Move the update of the opkg.conf file into 'do_install' which
> will prevent any erroneous [multiple] options to be added to 'opkg.conf'
>

Don't put commentary about v2 in the commit message, as when it's merged
the content of v1 isn't relevant.

(I've removed it and merged to mut)

Ross

[-- Attachment #2: Type: text/html, Size: 908 bytes --]

Re: [PATCH v2] opkg: Fix error when recompiled

[Gary Thomas]

On 2015-03-05 08:52, Burton, Ross wrote:
> Hi Gary,
>
> On 5 March 2015 at 15:48, Gary Thomas <gary@mlbassoc.com <mailto:gary@mlbassoc.com>> wrote:
>
>     v2: Move the update of the opkg.conf file into 'do_install' which
>     will prevent any erroneous [multiple] options to be added to 'opkg.conf'
>
>
> Don't put commentary about v2 in the commit message, as when it's merged the content of v1 isn't relevant.

Noted.

> (I've removed it and merged to mut)

Thanks

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

Re: [PATCH v2] opkg: Fix error when recompiled

[Anders Darander]

* Gary Thomas <gary@mlbassoc.com> [150305 17:15]:
> On 2015-03-05 08:52, Burton, Ross wrote:
> >On 5 March 2015 at 15:48, Gary Thomas <gary@mlbassoc.com
> ><mailto:gary@mlbassoc.com>> wrote:

> >    v2: Move the update of the opkg.conf file into 'do_install' which
> >    will prevent any erroneous [multiple] options to be added to
> >    'opkg.conf'


> >Don't put commentary about v2 in the commit message, as when it's
> >merged the content of v1 isn't relevant.

> Noted.

But for single patches, please keep it in the e-mail by putting it below
the first --- line. I.e. just before the list of all changed files.

It's really nice to see a changelog together with a v2, v3, v... patch.

Cheers,
Anders

-- 
Anders Darander
ChargeStorm AB / eStorm AB