[oe-commits] Gary Thomas : opkg: Fix error when recompiled

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 40a4f83d3791658789da8559c554b93b50db81c0
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=40a4f83d3791658789da8559c554b93b50db81c0

Author: Gary Thomas <gary at mlbassoc.com>
Date:   Thu Mar  5 08:48:51 2015 -0700

opkg: Fix error when recompiled

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

Signed-off-by: Gary Thomas <gary at mlbassoc.com>
Signed-off-by: Ross Burton <ross.burton at intel.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