From: Grazvydas Ignotas <notasas@gmail.com>
Date: Tue, 5 Mar 2013 01:06:19 +0000 (+0200)
Subject: angstrom-feed-configs.bb: hack to make it always overwrite configs
X-Git-Tag: sz_154~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6a535a6c9cce28445a8a0de039b580342c6fabc;p=openembedded.git

angstrom-feed-configs.bb: hack to make it always overwrite configs
---

diff --git a/recipes/angstrom/angstrom-feed-configs.bb b/recipes/angstrom/angstrom-feed-configs.bb
index 46809990b1..0781e064cf 100644
--- a/recipes/angstrom/angstrom-feed-configs.bb
+++ b/recipes/angstrom/angstrom-feed-configs.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Configuration files for online package repositories aka feeds"
 RRECOMMENDS_${PN} += "opkg-nogpg-nocurl"
 
 #PV = "${DISTRO_VERSION}"
-PR = "r11"
+PR = "r100"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 FEED_BASEPATH ?= "unstable/feed/"
@@ -63,16 +63,20 @@ FILES_${PN} = "${sysconfdir}/opkg/base-feed.conf \
 					${sysconfdir}/opkg/openpandora.org-feed.conf \
 					"
 
-CONFFILES_${PN} += "${sysconfdir}/opkg/base-feed.conf \
-					${sysconfdir}/opkg/debug-feed.conf \
-					${sysconfdir}/opkg/perl-feed.conf \
-					${sysconfdir}/opkg/python-feed.conf \
-					${sysconfdir}/opkg/gstreamer-feed.conf \
+# HACK:
+# there are too many users with angstrom feeds still in their configs,
+# and it messes up real bad if angstrom feeds are mixed with pandora ones,
+# so don't mark them as conffiles and always overwrite instead.
+#CONFFILES_${PN} += "${sysconfdir}/opkg/base-feed.conf \
+#					${sysconfdir}/opkg/debug-feed.conf \
+#					${sysconfdir}/opkg/perl-feed.conf \
+#					${sysconfdir}/opkg/python-feed.conf \
+#					${sysconfdir}/opkg/gstreamer-feed.conf \
 #					${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf \
-					${sysconfdir}/opkg/noarch-feed.conf \
-					${sysconfdir}/opkg/arch.conf \
-					${sysconfdir}/opkg/openpandora.org-feed.conf \
-					"
+#					${sysconfdir}/opkg/noarch-feed.conf \
+#					${sysconfdir}/opkg/arch.conf \
+#					${sysconfdir}/opkg/openpandora.org-feed.conf \
+#					"
 
 python populate_packages_prepend () {
 	etcdir = bb.data.expand('${sysconfdir}/opkg', d)