diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-01-17 13:54:41 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-01-17 15:12:41 +0100 |
commit | 1f4d72bf332d3e843c42767d3e34f5b953c22c33 (patch) | |
tree | df90a428963f34a5bff2b7fbcb07fd0257271f6c | |
parent | a410a3ea8edabce31b5386c99dce998c78d2ff4c (diff) | |
download | openembedded-1f4d72bf332d3e843c42767d3e34f5b953c22c33.tar.gz |
frameworkd: merge frameworkd-config-shr_git.bb to frameworkd_git.bb and cleanup
* move init.d file and all config files applied in OE to frameworkd repo
* drop PREFERRED_PROVIDER_frameworkd-config as only one provider exists now
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | conf/compatibility-providers.conf | 2 | ||||
-rw-r--r-- | conf/distro/shr.conf | 1 | ||||
-rw-r--r-- | recipes/freesmartphone/frameworkd/a780/frameworkd.conf | 29 | ||||
-rw-r--r-- | recipes/freesmartphone/frameworkd/eten-m800/frameworkd.conf | 46 | ||||
-rw-r--r-- | recipes/freesmartphone/frameworkd/frameworkd | 40 | ||||
-rw-r--r-- | recipes/freesmartphone/frameworkd/frameworkd.conf | 34 | ||||
-rw-r--r-- | recipes/freesmartphone/frameworkd/magician/frameworkd.conf | 31 | ||||
-rw-r--r-- | recipes/freesmartphone/frameworkd/om-gta01/frameworkd.conf | 39 | ||||
-rw-r--r-- | recipes/freesmartphone/frameworkd/om-gta02/frameworkd.conf | 53 | ||||
-rw-r--r-- | recipes/freesmartphone/frameworkd_git.bb | 53 | ||||
-rw-r--r-- | recipes/shr/frameworkd-config-shr_git.bb | 81 |
11 files changed, 26 insertions, 383 deletions
diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf index 9ab1bb9864..befbb80fc5 100644 --- a/conf/compatibility-providers.conf +++ b/conf/compatibility-providers.conf @@ -13,8 +13,6 @@ PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" PREFERRED_PROVIDER_esound ?= "pulseaudio" #PREFERRED_PROVIDER_e-wm-menu ?= "e-wm-menu-shr" PREFERRED_PROVIDER_e-wm-menu ?= "e-wm-menu" -#PREFERRED_PROVIDER_frameworkd-config ?= "frameworkd-config-shr" -PREFERRED_PROVIDER_frameworkd-config ?= "frameworkd-config" PREFERRED_PROVIDER_gconf ?= "gconf" #PREFERRED_PROVIDER_gconf ?= "gconf-dbus" PREFERRED_PROVIDER_gdk-pixbuf-csource-native ?= "gtk+-native" diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index 7670caa491..59ad0be135 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -176,7 +176,6 @@ PREFERRED_PROVIDER_atd = "atd-over-fso" PREFERRED_PROVIDER_opkg = "opkg" # virtual/libgl is used ie in xorg-xserver which is not MACHINE_ARCH so we need to keep it consistent across multiple machines using same xorg-xserver PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" -PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr" ############################################################################# # PREFERRED VERSIONS diff --git a/recipes/freesmartphone/frameworkd/a780/frameworkd.conf b/recipes/freesmartphone/frameworkd/a780/frameworkd.conf deleted file mode 100644 index d50d498ab0..0000000000 --- a/recipes/freesmartphone/frameworkd/a780/frameworkd.conf +++ /dev/null @@ -1,29 +0,0 @@ -[frameworkd] -version = 1 -log_level = DEBUG -log_to = syslog - -[input] -# keys (copied from Openmoko, need to adjust) -report1 = AUX,key,169,1 -report2 = POWER,key,116,1 -report3 = USB,key,356,0 -report4 = HEADSET,switch,2,0 - -[ogsmd] -# A780 has Freescale Neptune LTE -modemtype = freescale_neptune - -[opreferencesd] -rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences - -[oeventsd] -rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml - -[ousaged] -disable = 1 - -[fsousage] -[fsousage.controller] - - diff --git a/recipes/freesmartphone/frameworkd/eten-m800/frameworkd.conf b/recipes/freesmartphone/frameworkd/eten-m800/frameworkd.conf deleted file mode 100644 index 463caf6ae9..0000000000 --- a/recipes/freesmartphone/frameworkd/eten-m800/frameworkd.conf +++ /dev/null @@ -1,46 +0,0 @@ -[frameworkd] -version = 1 -log_level = DEBUG -log_to = syslog - -[odeviced.kernel26] -# set 1 to disable the module -disable = 0 - -[odeviced.idlenotifier] -# set 1 to disable the module -disable = 1 -# add input nodes to ignore for idle activity -ignoreinput = 2,3,4 - -[odeviced.powercontrol-neo] -disable = 1 - -[ogsmd] -disable = 1 -# specify your modemtype here - -[ogpsd] -device = EtenDevice -channel = SerialChannel -path = /dev/ttySAC2 - -[ogpsd.serialchannel] -baudrate = 57600 - -[opreferencesd] -rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences - -[oeventsd] -rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml - -[opimd] -disable = 1 - -[ousaged] -disable = 1 - -[fsousage] -[fsousage.controller] - - diff --git a/recipes/freesmartphone/frameworkd/frameworkd b/recipes/freesmartphone/frameworkd/frameworkd deleted file mode 100644 index 63d6a79475..0000000000 --- a/recipes/freesmartphone/frameworkd/frameworkd +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh -# -# frameworkd -- This shell script starts and stops the freemsmartphone.org framework daemon. -# -# chkconfig: 345 90 20 -# description: frameworkd is the freesmartphone.org framework daemon -# processname: python - -PATH=/bin:/usr/bin:/sbin:/usr/sbin -NAME=frameworkd - -[ -f /etc/default/rcS ] && . /etc/default/rcS - -case "$1" in - start) - echo -n "Starting freesmartphone.org framework daemon: " - start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/frameworkd - if [ $? = 0 ]; then - echo "(ok)" - else - echo "(failed)" - fi - ;; - stop) - echo -n "Stopping freesmartphone.org framework daemon: " - start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo - rm -f /var/run/${NAME}.pid - echo "(done)" - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/frameworkd {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/recipes/freesmartphone/frameworkd/frameworkd.conf b/recipes/freesmartphone/frameworkd/frameworkd.conf deleted file mode 100644 index 7748740b4a..0000000000 --- a/recipes/freesmartphone/frameworkd/frameworkd.conf +++ /dev/null @@ -1,34 +0,0 @@ -[frameworkd] -version = 1 -log_level = DEBUG -log_to = syslog - -[odeviced.kernel26] -# set 1 to disable the module -disable = 0 - -[odeviced.idlenotifier] -# set 1 to disable the module -disable = 0 -# add input nodes to ignore for idle activity -ignoreinput = 2,3,4 - -[odeviced.powercontrol-neo] -disable = 1 - -[ogsmd] -# specify your modemtype here -modemtype = ti_calypso - -[opreferencesd] -rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences - -[oeventsd] -rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml - -[ousaged] -disable = 1 - -[fsousage] -[fsousage.controller] - diff --git a/recipes/freesmartphone/frameworkd/magician/frameworkd.conf b/recipes/freesmartphone/frameworkd/magician/frameworkd.conf deleted file mode 100644 index e8f6606b5b..0000000000 --- a/recipes/freesmartphone/frameworkd/magician/frameworkd.conf +++ /dev/null @@ -1,31 +0,0 @@ -[frameworkd] -version = 1 -log_level = DEBUG -log_to = syslog - -[odeviced.input] -# magician doesn't have AUX, use the CAMERA key for now -# (it's in about the same place as AUX on gta01/02) -report1 = AUX,key,212,1 -report2 = POWER,key,116,1 -# magician doesn't use KEY_POWER2 for the charger, need to fix -report3 = USB,key,356,0 -report4 = HEADSET,switch,2,0 - -[ogsmd] -# Magician has TI Calypso -modemtype = ti_calypso - -[opreferencesd] -rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences - -[oeventsd] -rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml - -[ousaged] -disable = 1 - -[fsousage] -[fsousage.controller] - - diff --git a/recipes/freesmartphone/frameworkd/om-gta01/frameworkd.conf b/recipes/freesmartphone/frameworkd/om-gta01/frameworkd.conf deleted file mode 100644 index 05dec74ff0..0000000000 --- a/recipes/freesmartphone/frameworkd/om-gta01/frameworkd.conf +++ /dev/null @@ -1,39 +0,0 @@ -[frameworkd] -version = 1 -log_level = INFO -log_to = syslog - -[odeviced.audio] -# set default alsa scenario -default_scenario = stereoout -# set path to alsa scenario files -scenario_dir = /usr/share/openmoko/scenarios - -[odeviced.input] -# Keys -report1 = AUX,key,169,1 -report2 = POWER,key,116,1 -report3 = USB,key,356,0 -report4 = HEADSET,switch,2,0 - -[ogsmd] -disable = 1 - -[ogpsd] -device = NMEADevice -channel = GllinChannel -path = /etc/init.d/gllin - -[opreferencesd] -rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences - -[oeventsd] -rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml - -[ousaged] -disable = 1 - -[fsousage] -[fsousage.controller] - - diff --git a/recipes/freesmartphone/frameworkd/om-gta02/frameworkd.conf b/recipes/freesmartphone/frameworkd/om-gta02/frameworkd.conf deleted file mode 100644 index fea36c31a9..0000000000 --- a/recipes/freesmartphone/frameworkd/om-gta02/frameworkd.conf +++ /dev/null @@ -1,53 +0,0 @@ -[frameworkd] -version = 1 -log_level = INFO -log_to = syslog - -[odeviced.audio] -# set default alsa scenario -default_scenario = stereoout -# set path to alsa scenario files -scenario_dir = /usr/share/openmoko/scenarios - -[odeviced.idlenotifier] -# don't read from accellerometers for GTA02 -ignoreinput=2,3 - -[odeviced.input] -# don't read from accellerometers for GTA02 -ignoreinput=2,3 -# keys -report1 = AUX,key,169,1 -report2 = POWER,key,116,1 -report3 = USB,key,356,0 -report4 = HEADSET,switch,2,0 - -# disable accelerometer since it uses LOADS of CPU resources -[odeviced.accelerometer] -disable = 1 -accelerometer_type = gta02 - -[ogsmd] -disable = 1 - -[ogpsd] -device = GTA02Device -channel = SerialChannel -path = /dev/ttySAC1 - -[opreferencesd] -rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences - -[oeventsd] -rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml - -[opimd] -disable = 1 - -[ousaged] -disable = 1 - -[fsousage] -[fsousage.controller] - - diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb index 1e9b769df1..1b34c95a0c 100644 --- a/recipes/freesmartphone/frameworkd_git.bb +++ b/recipes/freesmartphone/frameworkd_git.bb @@ -4,9 +4,9 @@ AUTHOR = "FreeSmartphone.Org Development Team" SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -SRCREV = "c46f3e92c629ead0f9d1a966660bc53c08b50eeb" +SRCREV = "64d40c68c656b7926dfd7eb91101f1f9547a948b" PV = "0.9.5.9+gitr${SRCPV}" -PR = "r7" +PR = "r8" PE = "1" inherit distutils update-rc.d python-dir @@ -15,34 +15,33 @@ INITSCRIPT_NAME = "frameworkd" INITSCRIPT_PARAMS = "defaults 29" SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \ - file://frameworkd \ - file://frameworkd.conf \ - " -SRC_URI_append_shr = "file://oeventsd-use-opimd-signals.patch \ - file://0001-oeventsd-workaround-buggy-kernel-to-get-full-vibrati.patch \ - " + file://oeventsd-use-opimd-signals.patch \ + file://0001-oeventsd-workaround-buggy-kernel-to-get-full-vibrati.patch \ +" S = "${WORKDIR}/git" do_configure_append() { - echo "version=\"${PV}\"" >framework/__version__.py + echo "version=\"${PV}\"" >framework/__version__.py } 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} -} + #Check for machine specific conf. + CONF_PATH="${S}/etc" + CONF_PATH_MACHINE="${CONF_PATH}" + if [ -d "${CONF_PATH}/${MACHINE}" ] ; then + CONF_PATH_MACHINE="${CONF_PATH}/${MACHINE}" + fi + # Install machine specific files + install -m 0644 ${CONF_PATH_MACHINE}/frameworkd.conf ${D}${sysconfdir} -pkg_postinst_${PN} () { - echo "*IMPORTANT NOTICE*: There has been a change in internal opimd database structure as well as in the backend mechanism." - echo " This change is not backwards compatible so a conversion is needed, furthermore, since new opimd does not (and will not) support working with SIM, importing your SIM data is also required." - echo " In order to import SIM contacts, please use PISI." - echo " If you still have old contacts with 'tel:' prefix instead of field types (i.e you haven't upgraded since 26.1.2010) please run the 'remove-tel' script first." - echo " For the database conversion:" - echo " 1) stop frameworkd '/etc/init.d/frameworkd stop'" - echo " 2) use the conversion script, called: 'opimd_convert_db' which is already installed in your system" - echo " 3) restart your device" + #Check for machine specific conf. + CONF_PATH="${S}/etc/freesmartphone/oevents" + CONF_PATH_MACHINE="${CONF_PATH}" + if [ -d "${CONF_PATH}/${MACHINE}" ] ; then + CONF_PATH_MACHINE="${CONF_PATH}/${MACHINE}" + fi + install -m 0644 ${CONF_PATH_MACHINE}/rules.yaml ${D}${sysconfdir}/freesmartphone/oevents/ } RDEPENDS_${PN} += "\ @@ -80,12 +79,9 @@ RRECOMMENDS_${PN} += "\ PACKAGES =+ "${PN}-config" PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}" -# machine specific stuff, should ideally be elsewhere -# - recommend MUXer on platforms that require one, no longer used on om-gta0* -# RDEPENDS_${PN}-config_append_om-gta01 = " fso-abyss" -# RDEPENDS_${PN}-config_append_om-gta02 = " fso-abyss" # - add wmiconfig for wireless configuration RDEPENDS_${PN}-config_append_om-gta02 = " wmiconfig" +RREPLACES_${PN}-config = "frameworkd-config-shr" FILES_${PN}-config = "\ ${sysconfdir}/frameworkd.conf \ @@ -95,11 +91,14 @@ CONFFILES_${PN}-config = "\ ${sysconfdir}/frameworkd.conf \ ${sysconfdir}/freesmartphone/opreferences/conf/phone/silent.yaml \ ${sysconfdir}/freesmartphone/opreferences/conf/phone/default.yaml \ + ${sysconfdir}/freesmartphone/opreferences/conf/phone/vibrate.yaml \ + ${sysconfdir}/freesmartphone/opreferences/conf/phone/ring.yaml \ ${sysconfdir}/freesmartphone/opreferences/conf/profiles/default.yaml \ ${sysconfdir}/freesmartphone/opreferences/conf/rules/silent.yaml \ ${sysconfdir}/freesmartphone/opreferences/conf/rules/default.yaml \ + ${sysconfdir}/freesmartphone/opreferences/conf/rules/vibrate.yaml \ + ${sysconfdir}/freesmartphone/opreferences/conf/rules/ring.yaml \ ${sysconfdir}/freesmartphone/oevents/rules.yaml \ - ${sysconfdir}/freesmartphone/ogsmd/networks.tab \ " PACKAGE_ARCH_${PN} = "${BASE_PACKAGE_ARCH}" diff --git a/recipes/shr/frameworkd-config-shr_git.bb b/recipes/shr/frameworkd-config-shr_git.bb deleted file mode 100644 index e512a556a7..0000000000 --- a/recipes/shr/frameworkd-config-shr_git.bb +++ /dev/null @@ -1,81 +0,0 @@ -DESCRIPTION = "SHR Configuration for frameworkd" -HOMEPAGE = "http://www.freesmartphone.org" -AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al." -SECTION = "console/network" -DEPENDS = "python-cython-native python-pyrex-native" -LICENSE = "GPL" - -SRCREV_pn-frameworkd-config-shr_FSO_REV ?= "cfc0a5c3def2dc2556c86f3dad182181124de006" -SRCREV_pn-frameworkd-config-shr_SHR_REV ?= "766d0cd14680e6cdd1dc89040a7644541f05a21d" - -SRCREV_FORMAT = "FSO_REV-SHR_REV" -PV = "0.9.5.9+gitr${SRCPV}" -PR = "r11" - -SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master;name=FSO_REV \ - git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master;name=SHR_REV" -S = "${WORKDIR}/git" - -PROVIDES_${PN} = "frameworkd-config" -RPROVIDES_${PN} = "frameworkd-config" -CONF_PATH = "${S}/frameworkd/${PN}" - -do_install_append() { - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/freesmartphone/opreferences/schema/ - install -d ${D}${sysconfdir}/freesmartphone/opreferences/conf/profiles/ - install -d ${D}${sysconfdir}/freesmartphone/opreferences/conf/phone/ - install -d ${D}${sysconfdir}/freesmartphone/opreferences/conf/rules/ - install -d ${D}${sysconfdir}/freesmartphone/oevents/ - install -d ${D}${sysconfdir}/freesmartphone/persist/ - install -d ${D}${sysconfdir}/freesmartphone/opim/ - install -m 0644 ${S}/etc/freesmartphone/opreferences/schema/phone.yaml ${D}${sysconfdir}/freesmartphone/opreferences/schema/ - install -m 0644 ${S}/etc/freesmartphone/opreferences/schema/profiles.yaml ${D}${sysconfdir}/freesmartphone/opreferences/schema/ - install -m 0644 ${S}/etc/freesmartphone/opreferences/schema/rules.yaml ${D}${sysconfdir}/freesmartphone/opreferences/schema/ - install -m 0644 ${S}/etc/freesmartphone/persist/README ${D}${sysconfdir}/freesmartphone/persist/ - - #Check for machine specific conf. - CONF_PATH_MACHINE="${CONF_PATH}" - if [ -d "${CONF_PATH}/${MACHINE}" ] ; then - CONF_PATH_MACHINE="${CONF_PATH}/${MACHINE}" - fi - # Install SHR custom files - install -m 0644 ${CONF_PATH_MACHINE}/frameworkd.conf ${D}${sysconfdir} - install -m 0644 ${CONF_PATH_MACHINE}/rules.yaml ${D}${sysconfdir}/freesmartphone/oevents/ - install -m 0644 ${CONF_PATH}/profiles/profiles/default.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/profiles/ - - install -m 0644 ${CONF_PATH}/profiles/phone/default.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/phone/ - install -m 0644 ${CONF_PATH}/profiles/rules/default.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/rules/ - - install -m 0644 ${CONF_PATH}/profiles/phone/ring.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/phone/ - install -m 0644 ${CONF_PATH}/profiles/rules/ring.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/rules/ - - install -m 0644 ${CONF_PATH}/profiles/phone/vibrate.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/phone/ - install -m 0644 ${CONF_PATH}/profiles/rules/vibrate.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/rules/ - - install -m 0644 ${CONF_PATH}/profiles/phone/silent.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/phone/ - install -m 0644 ${CONF_PATH}/profiles/rules/silent.yaml ${D}${sysconfdir}/freesmartphone/opreferences/conf/rules/ - - install -d ${D}${datadir}/sounds - install -m 0644 ${CONF_PATH}/*.wav ${D}${datadir}/sounds/ -} - -PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" - -# - add wmiconfig for wireless configuration -RDEPENDS_${PN}_append_om-gta02 = " wmiconfig" - -FILES_${PN} = "\ - ${sysconfdir}/frameworkd.conf \ - ${sysconfdir}/freesmartphone \ - ${datadir}/sounds \ -" -CONFFILES_${PN} = "\ - ${sysconfdir}/frameworkd.conf \ - ${sysconfdir}/freesmartphone/opreferences/conf/phone/silent.yaml \ - ${sysconfdir}/freesmartphone/opreferences/conf/phone/default.yaml \ - ${sysconfdir}/freesmartphone/opreferences/conf/profiles/default.yaml \ - ${sysconfdir}/freesmartphone/opreferences/conf/rules/silent.yaml \ - ${sysconfdir}/freesmartphone/opreferences/conf/rules/default.yaml \ - ${sysconfdir}/freesmartphone/oevents/rules.yaml \ -" |