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)

diff --git a/packages/freesmartphone/frameworkd-devel_git.bb b/packages/freesmartphone/frameworkd-devel_git.bb
index d38f594..0024f95 100644 (file)
--- 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 2a91853..e21f150 100644 (file)
--- 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}"