diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-08 15:14:41 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-01-08 15:34:02 +0100 |
| commit | a68cd2893f3c64678f25d7bbc840cf0eb75da708 (patch) | |
| tree | 98a36e3419ef647309e31ab0beb8eefd9d846f00 | |
| parent | 8d811cca024dd522a4778c498898b42dd3efb07f (diff) | |
frameworkd[-devel]: catch up with upstream stabilization phase work in master
frameworkd now builds from master, frameworkd-devel will build from devel
(once it has been launched)
| -rw-r--r-- | packages/freesmartphone/frameworkd-devel_git.bb | 4 | ||||
| -rw-r--r-- | packages/freesmartphone/frameworkd_git.bb | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/packages/freesmartphone/frameworkd-devel_git.bb b/packages/freesmartphone/frameworkd-devel_git.bb index d38f594210..0024f95b48 100644 --- a/packages/freesmartphone/frameworkd-devel_git.bb +++ b/packages/freesmartphone/frameworkd-devel_git.bb @@ -2,10 +2,12 @@ require frameworkd_git.bb FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/frameworkd', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" PROVIDES = "frameworkd" RPROVIDES = "frameworkd" -PV = "0.8.4.9+gitr${SRCREV}" +PV = "0.8.5.x+gitr${SRCREV}" PR = "r0" DEFAULT_PREFERENCE = "-1" +# skip this package +COMPATIBLE_MACHINE = "" SRC_URI = "\ ${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \ diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index 2a9185364a..e21f150f5b 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -1,10 +1,10 @@ DESCRIPTION = "The reference implementation of the freesmartphone.org framework APIs" HOMEPAGE = "http://www.freesmartphone.org" -AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al." +AUTHOR = "FreeSmartphone.Org Development Team" SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -PV = "0.8.4.5+gitr${SRCREV}" +PV = "0.8.4.9+gitr${SRCREV}" PR = "r0" inherit distutils update-rc.d @@ -12,7 +12,7 @@ inherit distutils update-rc.d INITSCRIPT_NAME = "frameworkd" INITSCRIPT_PARAMS = "defaults 29" -SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=stabilization/milestone4 \ +SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \ file://frameworkd \ file://frameworkd.conf" S = "${WORKDIR}/git" @@ -57,7 +57,7 @@ PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}" FILES_${PN}-config = "\ ${sysconfdir}/frameworkd.conf \ ${sysconfdir}/freesmartphone \ -" + " CONFFILES_${PN}-config = "\ ${sysconfdir}/frameworkd.conf \ ${sysconfdir}/freesmartphone/opreferences/conf/phone/silent.yaml \ @@ -66,7 +66,8 @@ CONFFILES_${PN}-config = "\ ${sysconfdir}/freesmartphone/opreferences/conf/rules/silent.yaml \ ${sysconfdir}/freesmartphone/opreferences/conf/rules/default.yaml \ ${sysconfdir}/freesmartphone/oevents/rules.yaml \ -" + ${sysconfdir}/freesmartphone/ogsmd/networks.tab \ + " PACKAGE_ARCH_${PN} = "${BASE_PACKAGE_ARCH}" FILES_${PN} += "${sysconfdir}/dbus-1 ${sysconfdir}/freesmartphone ${sysconfdir}/init.d ${datadir}" |