Module: meta-angstrom
Branch: master
Commit: 67b74456b7c6420399fd7222e4c9f24c1173e858
Author: Koen Kooi <k...@dominion.thruhere.net>
Date: Mon Jan 16 11:19:36 2012 +0100
angstrom-feed-configs: get rid of opkg-collateral
Signed-off-by: Koen Kooi <k...@dominion.thruhere.net>
---
recipes-angstrom/angstrom/angstrom-feed-configs.bb | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/recipes-angstrom/angstrom/angstrom-feed-configs.bb
b/recipes-angstrom/angstrom/angstrom-feed-configs.bb
index be253ed..a857d1d 100644
--- a/recipes-angstrom/angstrom/angstrom-feed-configs.bb
+++ b/recipes-angstrom/angstrom/angstrom-feed-configs.bb
@@ -2,10 +2,8 @@ DESCRIPTION = "Configuration files for online package
repositories aka feeds"
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-RRECOMMENDS_${PN} += "opkg"
-
#PV = "${DISTRO_VERSION}"
-PR = "r15"
+PR = "r16"
PACKAGE_ARCH = "${MACHINE_ARCH}"
FEED_BASEPATH ?= "unstable/feed/"
@@ -61,6 +59,13 @@ CONFFILES_${PN} += "${sysconfdir}/opkg/base-feed.conf \
${sysconfdir}/opkg/sdk-feed.conf \
"
+# Get rid of opkg-collateral
+RCONFLICTS_${PN} = "opkg-collateral"
+RREPLACES_${PN} = "opkg-collateral"
+RPROVIDES_${PN} = "opkg-collateral"
+
+RRECOMMENDS_${PN} += "opkg"
+
python populate_packages_prepend () {
etcdir = bb.data.expand('${sysconfdir}/opkg', d)
do_split_packages(d, etcdir, '^locale-(.*)\.conf$',
'angstrom-locale-%s-config', 'Angstrom feed config for the %s locale',
extra_depends='', allow_links=True)
_______________________________________________
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
