diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-07-31 19:00:54 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-07-31 19:00:54 +0000 |
| commit | dd802fd2aa4238db6f39b760930660118f996392 (patch) | |
| tree | 60c56d6f047003674efdbfb27679060862c0607f | |
| parent | c53c5bb8f78707f1b2b3ef89121e3925cf356222 (diff) | |
| parent | 54a9e6c3a9aa83d7d2beac5a9bfbadfa3a70b7d9 (diff) | |
merge of '4fe1dea49ed06e807afde9b963aafccb124edd4d'
and 'aaffbdee48dde7a080e15c0f4d608f013c10a6ae'
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | packages/freesmartphone/frameworkd_git.bb | 10 | ||||
| -rw-r--r-- | packages/images/fso-image-console.bb | 13 |
3 files changed, 5 insertions, 20 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 8e48ba407b..1cf02d7145 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -37,7 +37,7 @@ SRCREV_pn-ezxd ?= "2074" SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7837" SRCREV_pn-fbgrab-viewer-native ?= "1943" -SRCREV_pn-frameworkd ?= "f4e22aeeeeab16eee5f13151f184da4f899d7ff1" +SRCREV_pn-frameworkd ?= "5b0878b69037b68e64f4048a51003416c9b1261b" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index 08c43f907a..040c483c76 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -4,8 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al." SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -PV = "0.8.1+gitr${SRCREV}" -PR = "r12" +PV = "0.8.2+gitr${SRCREV}" +PR = "r0" inherit distutils update-rc.d @@ -21,8 +21,6 @@ do_install_append() { install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/frameworkd ${D}${sysconfdir}/init.d/ install -m 0644 ${WORKDIR}/frameworkd.conf ${D}${sysconfdir} - install -d ${D}${sysconfdir}/dbus-1/system.d/ - mv -f ${D}${datadir}/etc/dbus-1/system.d/frameworkd.conf ${D}${sysconfdir}/dbus-1/system.d/ } RDEPENDS_${PN} += "\ @@ -42,8 +40,8 @@ RDEPENDS_${PN} += "\ PACKAGES =+ "${PN}-config" PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}" -FILES_${PN}-config = "${sysconfdir}" +FILES_${PN}-config = "${sysconfdir}/frameworkd.conf" PACKAGE_ARCH_${PN} = "${BASE_PACKAGE_ARCH}" -FILES_${PN} += "${datadir}" +FILES_${PN} += "${sysconfdir}/dbus-1 ${sysconfdir}/freesmartphone ${sysconfdir}/init.d ${datadir}" FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/framework/subsystems/*/.debug" diff --git a/packages/images/fso-image-console.bb b/packages/images/fso-image-console.bb deleted file mode 100644 index 8e0e360f9c..0000000000 --- a/packages/images/fso-image-console.bb +++ /dev/null @@ -1,13 +0,0 @@ -#------------------------------------------------------ -# freesmartphone.org Console Image Recipe -#------------------------------------------------------ - -require fso-image.bb - -IMAGE_INSTALL = "\ - ${BASE_INSTALL} \ - ${AUDIO_INSTALL} \ - ${TOOLS_INSTALL} \ - ${PYTHON_INSTALL} \ -" - |