opkg-collateral: Simplify source files

Instead of having the source files 'opkg.conf.comments', 'dest' and 'src', we
simply have one 'opkg.conf' file containing all the necessary configuration.

This does mean that replacing 'src' in a bbappend to define distro-specific
package feeds is no longer supported, but these feed configurations should be
packaged separately from the rest of the opkg configuration anyway so that
things can be updated independently. The best recipe to use for managing feed
configs is currently distro-feed-config in the meta-oe layer.

(From OE-Core rev: f7c591df37493e8f3cde9c19bb0d1edc370eca1c)

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

meta/recipes-devtools/opkg/opkg-collateral.bb

@@ -4,17 +4,12 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 PR = "r2"
 
-SRC_URI = "file://opkg.conf.comments \
-	   file://dest \
-	   file://src "
+SRC_URI = "file://opkg.conf"
 
 S = "${WORKDIR}"
 
 OPKGLIBDIR = "${localstatedir}/lib"
 do_compile () {
-	cat ${WORKDIR}/opkg.conf.comments >${WORKDIR}/opkg.conf
-	cat ${WORKDIR}/src	>>${WORKDIR}/opkg.conf
-	cat ${WORKDIR}/dest	>>${WORKDIR}/opkg.conf
 	echo "option lists_dir ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf
 }
 

meta/recipes-devtools/opkg/opkg-collateral/dest

@@ -1 +0,0 @@
-dest root /

meta/recipes-devtools/opkg/opkg-collateral/opkg.conf

@@ -24,3 +24,5 @@
 # Offline mode (for use in constructing flash images offline)
 #option offline_root target
 
+# Default destination for installed packages
+dest root /