[oe-commits] Martin Jansa : cornucopia: move SRCREV to cornucopia. inc and update all recipes using that
git version control
git at git.openembedded.org
Sat May 1 19:51:08 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 41628a4b652a084b9c181163e4315d5292a574ff
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=41628a4b652a084b9c181163e4315d5292a574ff
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Sat May 1 15:50:18 2010 +0200
cornucopia: move SRCREV to cornucopia.inc and update all recipes using that
* remove vars already set in cornucopia.inc
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
conf/distro/include/sane-srcrevs.inc | 1 -
recipes/freesmartphone/cornucopia.inc | 5 ++++-
recipes/freesmartphone/fso-abyss_git.bb | 13 +++++--------
recipes/freesmartphone/fso-alsa_git.bb | 13 ++++++-------
recipes/freesmartphone/fso-apm_git.bb | 8 +++-----
recipes/freesmartphone/libgsm0710mux_git.bb | 9 +++------
recipes/freesmartphone/mdbus2_git.bb | 10 ++++------
recipes/freesmartphone/mkdump_git.bb | 11 ++++-------
recipes/freesmartphone/mterm2_git.bb | 11 ++++-------
9 files changed, 33 insertions(+), 48 deletions(-)
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 5fb5542..40c3d8c 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -3,4 +3,3 @@
OPKG_SRCREV ?= "527"
EFL_SRCREV ?= "48486"
-FSO_CORNUCOPIA_SRCREV ?= "d2189d3f54331fb79a1ca31d6fafe2e8eb2afe46"
diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc
index 4962263..03bac76 100644
--- a/recipes/freesmartphone/cornucopia.inc
+++ b/recipes/freesmartphone/cornucopia.inc
@@ -1,16 +1,19 @@
DESCRIPTION = "The freesmartphone.org API reference implementation (FSO 2.0)"
AUTHOR = "Team FSO"
+HOMEPAGE = "http://www.freesmartphone.org"
LICENSE = "LGPL"
SECTION = "devel"
DEPENDS = "vala-native glib-2.0 dbus dbus-glib libfso-glib libgee"
DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics'.split())]}"
PV = "invalid, please override"
+
+FSO_CORNUCOPIA_SRCREV ?= "d2189d3f54331fb79a1ca31d6fafe2e8eb2afe46"
INC_PR = "r2"
SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master"
S = "${WORKDIR}/git/${PN}"
-inherit autotools_stage pkgconfig vala
+inherit autotools pkgconfig vala
FILES_${PN} += "\
${sysconfdir} \
diff --git a/recipes/freesmartphone/fso-abyss_git.bb b/recipes/freesmartphone/fso-abyss_git.bb
index 0fd88f2..b052e88 100644
--- a/recipes/freesmartphone/fso-abyss_git.bb
+++ b/recipes/freesmartphone/fso-abyss_git.bb
@@ -1,3 +1,5 @@
+require cornucopia.inc
+
DESCRIPTION = "Abyss is a GSM 07.10 muxer userspace daemon"
HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/Abyss"
AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
@@ -7,15 +9,10 @@ LICENSE = "GPL"
SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
PV = "0.9.2+gitr${SRCPV}"
PE = "1"
-PR = "r1"
-
-SRC_URI = "\
- ${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master \
- file://fso-abyss.conf \
-"
-S = "${WORKDIR}/git/tools/fso-abyss"
+PR = "${INC_PR}.0"
-inherit autotools vala
+SRC_URI += " file://fso-abyss.conf"
+S = "${WORKDIR}/git/tools/${PN}"
do_install_append() {
install -d ${D}${sysconfdir}
diff --git a/recipes/freesmartphone/fso-alsa_git.bb b/recipes/freesmartphone/fso-alsa_git.bb
index b83613e..7726172 100644
--- a/recipes/freesmartphone/fso-alsa_git.bb
+++ b/recipes/freesmartphone/fso-alsa_git.bb
@@ -1,14 +1,13 @@
+require cornucopia.inc
+
DESCRIPTION = "Mickey's DBus introspection and calling Program V2"
AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
-HOMEPAGE = "http://www.freesmartphone.org"
SECTION = "console/multimedia"
LICENSE = "GPLv2"
DEPENDS = "fsodeviced glib-2.0 dbus dbus-glib"
SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
-PV = "1.0.0+gitr${SRCREV}"
-PR = "r0"
-
-SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
-S = "${WORKDIR}/git/tools/fso-alsa"
+PV = "1.0.0+gitr${SRCPV}"
+PR = "${INC_PR}.0"
+PE = "1"
-inherit autotools vala
+S = "${WORKDIR}/git/tools/${PN}"
diff --git a/recipes/freesmartphone/fso-apm_git.bb b/recipes/freesmartphone/fso-apm_git.bb
index f04a5b1..0047860 100644
--- a/recipes/freesmartphone/fso-apm_git.bb
+++ b/recipes/freesmartphone/fso-apm_git.bb
@@ -1,15 +1,13 @@
+require cornucopia.inc
+
DESCRIPTION = "freesmartphone.org apm compatibility utility"
AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
-HOMEPAGE = "http://www.freesmartphone.org"
SECTION = "console"
LICENSE = "GPLv2"
PE = "1"
RCONFLICTS = "apm"
SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
PV = "2.0.0+gitr${SRCPV}"
-PR = "r1"
+PR = "${INC_PR}.0"
-SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
S = "${WORKDIR}/git/tools/apm2"
-
-inherit autotools vala
diff --git a/recipes/freesmartphone/libgsm0710mux_git.bb b/recipes/freesmartphone/libgsm0710mux_git.bb
index fe94d21..4c791d7 100644
--- a/recipes/freesmartphone/libgsm0710mux_git.bb
+++ b/recipes/freesmartphone/libgsm0710mux_git.bb
@@ -1,3 +1,5 @@
+require cornucopia.inc
+
DESCRIPTION = "A GSM 07.10 Multiplexing Engine"
AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
LICENSE = "GPL"
@@ -6,9 +8,4 @@ DEPENDS = "glib-2.0 libgsm0710 libfsotransport"
SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
PV = "0.9.2+gitr${SRCPV}"
PE = "1"
-PR = "r0"
-
-SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
-S = "${WORKDIR}/git/libgsm0710mux"
-
-inherit autotools vala
+PR = "${INC_PR}.0"
diff --git a/recipes/freesmartphone/mdbus2_git.bb b/recipes/freesmartphone/mdbus2_git.bb
index dd0336c..cfa6ef3 100644
--- a/recipes/freesmartphone/mdbus2_git.bb
+++ b/recipes/freesmartphone/mdbus2_git.bb
@@ -1,15 +1,13 @@
+require cornucopia.inc
+
DESCRIPTION = "Mickey's DBus introspection and calling Program V2"
AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
-HOMEPAGE = "http://www.freesmartphone.org"
SECTION = "console/network"
LICENSE = "GPLv2"
DEPENDS = "glib-2.0 dbus dbus-glib"
SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
PV = "2.0.0+gitr${SRCPV}"
-PR = "r0"
+PR = "${INC_PR}.0"
PE = "1"
-SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
-S = "${WORKDIR}/git/tools/mdbus2"
-
-inherit autotools vala
+S = "${WORKDIR}/git/tools/${PN}"
diff --git a/recipes/freesmartphone/mkdump_git.bb b/recipes/freesmartphone/mkdump_git.bb
index b31f896..d3171bb 100644
--- a/recipes/freesmartphone/mkdump_git.bb
+++ b/recipes/freesmartphone/mkdump_git.bb
@@ -1,3 +1,5 @@
+require cornucopia.inc
+
DESCRIPTION = "mkdump is a kernel message dumper"
HOMEPAGE = "http://www.freesmartphone.org/index.php/Implementations/mkdump"
AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
@@ -8,11 +10,6 @@ LICENSE = "GPL"
#SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
SRCREV = "696d93d7146adffdb76ddb951a7d8199b3dc8a81"
PV = "1.0.0+gitr${SRCPV}"
-PR = "r0"
-
-SRC_URI = "\
- ${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master \
-"
-S = "${WORKDIR}/git/tools/mkdump"
+PR = "${INC_PR}.0"
-inherit autotools vala
+S = "${WORKDIR}/git/tools/${PN}"
diff --git a/recipes/freesmartphone/mterm2_git.bb b/recipes/freesmartphone/mterm2_git.bb
index a99f848..8615af7 100644
--- a/recipes/freesmartphone/mterm2_git.bb
+++ b/recipes/freesmartphone/mterm2_git.bb
@@ -1,3 +1,5 @@
+require cornucopia.inc
+
DESCRIPTION = "mterm is a versatile muxer-aware terminal program"
HOMEPAGE = "http://www.freesmartphone.org/index.php/Implementations/fso-term"
AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
@@ -7,13 +9,8 @@ LICENSE = "GPL"
SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
PV = "0.1.0+gitr${SRCPV}"
PE = "1"
-PR = "r0"
-
-SRC_URI = "\
- ${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master \
-"
-S = "${WORKDIR}/git/tools/mterm2"
+PR = "${INC_PR}.0"
-inherit autotools vala
+S = "${WORKDIR}/git/tools/${PN}"
FILES_${PN} += "${datadir}"
More information about the Openembedded-commits
mailing list