--- conf/distro/shr.conf | 2 ++ recipes/freesmartphone/fso-apm_git.bb | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index e396566..7f490f4 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -48,6 +48,7 @@ INHERIT += "angstrom" ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4" ANGSTROM_BLACKLIST_pn-atd = "atd has been replaced by atd-over-fso" +ANGSTROM_BLACKLIST_pn-apmd = "apmd has been replaced by fso-apm" CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"; @@ -93,6 +94,7 @@ PREFERRED_PROVIDER_opkg = "opkg" PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" PREFERRED_PROVIDER_atd = "atd-over-fso" PREFERRED_PROVIDER_qt4x11 = "qt4-x11-free" +PREFERRED_PROVIDER_apmd = "fso-apm" # Helper to say what image we built SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version" diff --git a/recipes/freesmartphone/fso-apm_git.bb b/recipes/freesmartphone/fso-apm_git.bb index 4239709..6512089 100644 --- a/recipes/freesmartphone/fso-apm_git.bb +++ b/recipes/freesmartphone/fso-apm_git.bb @@ -3,13 +3,16 @@ AUTHOR = "Michael 'Mickey' Lauer <mla...@vanille-media.de>" HOMEPAGE = "http://www.freesmartphone.org"; SECTION = "console" LICENSE = "GPLv2" + PV = "0.1.0+gitr${SRCPV}" PE = "1" -PR = "r0" +PR = "r1" SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master" S = "${WORKDIR}/git/tools/apm2" inherit autotools -RCONFLICTS_${PN} = "apm" +PROVIDES_${PN} = "apm apmd" +RCONFLICTS_${PN} = "apm apmd" +RREPLACES_${PN} = "apm apmd" \ No newline at end of file -- 1.6.5.3 _______________________________________________ Shr-devel mailing list Shr-devel@lists.shr-project.org http://lists.shr-project.org/mailman/listinfo/shr-devel
