freesmartphone: bump SRCREVs to HEAD, drop configs and use configs provided with source
PATCH 1/1 freesmartphone: bump SRCREVs to HEAD, drop configs and use configs provided with source
Signed-off-by Martin Jansa <[email protected]>
--- conf/distro/include/sane-srcrevs-fso.inc | 20 ++-- recipes/freesmartphone/cornucopia.inc | 2 +- recipes/freesmartphone/fsodatad/fsodatad.conf | 19 ---- recipes/freesmartphone/fsodatad_git.bb | 10 -- recipes/freesmartphone/fsodeviced/fsodeviced.conf | 83 ------------------ .../fsodeviced/om-gta02/fsodeviced.conf | 88 -------------------- recipes/freesmartphone/fsodeviced_git.bb | 14 +--- recipes/freesmartphone/fsogsmd/fsogsmd.conf | 57 ------------- recipes/freesmartphone/fsogsmd_git.bb | 10 -- .../freesmartphone/fsonetworkd/fsonetworkd.conf | 19 ---- recipes/freesmartphone/fsonetworkd_git.bb | 10 -- recipes/freesmartphone/fsotdld/fsotdld.conf | 43 ---------- recipes/freesmartphone/fsotdld_git.bb | 10 -- recipes/freesmartphone/fsousaged/fsousaged.conf | 32 ------- .../fsousaged/om-gta02/fsousaged.conf | 32 ------- recipes/freesmartphone/fsousaged_git.bb | 10 -- 16 files changed, 12 insertions(+), 447 deletions(-) delete mode 100644 recipes/freesmartphone/fsodatad/fsodatad.conf delete mode 100644 recipes/freesmartphone/fsodeviced/fsodeviced.conf delete mode 100644 recipes/freesmartphone/fsodeviced/om-gta02/fsodeviced.conf delete mode 100644 recipes/freesmartphone/fsogsmd/fsogsmd.conf delete mode 100644 recipes/freesmartphone/fsonetworkd/fsonetworkd.conf delete mode 100644 recipes/freesmartphone/fsotdld/fsotdld.conf delete mode 100644 recipes/freesmartphone/fsousaged/fsousaged.conf delete mode 100644 recipes/freesmartphone/fsousaged/om-gta02/fsousaged.conf
conf/distro/include/sane-srcrevs-fso.inc +10 -10
@@ -1,19 +1,19 @@ # To be included from sane-srcrevs.inc # FSO Projects -- Cornucopia -FSO_CORNUCOPIA_SRCREV ?= "70b87d6e8b04f0bf0078702f6467e037eb4fdb28" +FSO_CORNUCOPIA_SRCREV ?= "57d2d93b3472f9d35b09a346dac52cddf6d7c9b6" SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsodeviced ?= "44a4aabf382995c9f3141ec09b202f0e569a484d" +SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsomusicd ?= "3233c80585dfbc0e77ee5549f9d7fb1a60b5a0f9" +SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-libfsoframework ?= "c227502c59f4d1de3b3097b3329c2461d6cfa2a2" +SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-mickeydbus2 ?= "${FSO_CORNUCOPIA_SRCREV}"
@@ -28,13 +28,13 @@ SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6" SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44" SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815" -SRCREV_pn-fso-specs ?= "60580a3fc3e8b2c036f9734c59994a5175bfcc1e" +SRCREV_pn-fso-specs ?= "af3e18e5183ccce29a03eea9fc5f5a0098003cc6" SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8" -SRCREV_pn-libeflvala ?= "707ca862f11feb4fa6945c222a34272b8fd3aebb" -SRCREV_pn-libfso-glib ?= "4016a7ff20cf53403ab22877eef3a706607f25a3" -SRCREV_pn-libframeworkd-glib ?= "bdea2ad33bb5c5aa2b996712b99e8dd9b58aed7d" +SRCREV_pn-libeflvala ?= "294f250f5c20a058f5016aaf674c57d0498070fd" +SRCREV_pn-libfso-glib ?= "d7d9045b806744bdedf409874009cfde16c2de39" +SRCREV_pn-libframeworkd-glib ?= "f68fe525c20aa8ef6c6cff70a80e60b91bed89a9" SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166" -SRCREV_pn-libgsm0710mux ?= "b6793a8191f20adba31b93b2f337cc5451270cf9" +SRCREV_pn-libgsm0710mux ?= "7934196c47eb80e77105a92cb684656b3614a9fc" SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06" FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317" SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
@@ -43,7 +43,7 @@ SRCREV_pn-msmcommd ?= "072226ac1e0f21735cb3bc26cdb87cd87e347afb" SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}" -SRCREV_pn-vala-dbus-binding-tool-native ?= "11e5b817f569e3ce81fa94ed77ed529101368b7f" +SRCREV_pn-vala-dbus-binding-tool-native ?= "8df9b5aab50066d3f5a525518f902dd26f77bbd7" SRCREV_pn-vala-terminal ?= "932285d72e26b965c488f8aa99fe51f7a34231ad" SRCREV_pn-vala-native ?= "a8aa50a80bcdc5f6c8183507f87b6c6fdfac8d9f" SRCREV_pn-zhone ?= "d654b3d15500a56c8e987e4d2cc2f8eef70b78c0"
recipes/freesmartphone/cornucopia.inc +1 -1
@@ -5,7 +5,7 @@ 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" -INC_PR = "r1" +INC_PR = "r2" SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master" S = "${WORKDIR}/git/${PN}"
recipes/freesmartphone/fsodatad/fsodatad.conf deleted +0 -19
@@ -1,19 +0,0 @@ -####################################################################################### -# FSO Data Daemon Configuration File -- for SYSTEM INTEGRATORS only -######################################################################################## -[logging] -# Log level: DEBUG, INFO (default), WARNING, ERROR -# Override via environment as FSO_LOG_LEVEL -log_level = INFO -# Where to log to: none (default), stderr, stderr:colors, file, syslog -# Override via environment as FSO_LOG_TO -log_to = file -# Log Destination (valid only for log_to = file) -# Override via environment as FSO_LOG_DESTINATION -log_destination = /var/log/fsodatad.log - -[fsodata] -# No settings yet - -[fsodata.world] -# No settings yet
recipes/freesmartphone/fsodatad_git.bb +0 -10
@@ -4,13 +4,3 @@ PR = "${INC_PR}.2" PV = "0.0.0+gitr${SRCREV}" DEPENDS += "libxml2 mobile-broadband-provider-info" - -SRC_URI += "file://fsodatad.conf" - -do_install_append() { - install -d ${D}${sysconfdir}/freesmartphone/ - install -m 0644 ${WORKDIR}/fsodatad.conf ${D}${sysconfdir}/freesmartphone/ -} - -FILES_${PN} += "${sysconfdir}/freesmartphone/fsodatad.conf" -CONFFILES_${PN} += "${sysconfdir}/freesmartphone/fsodatad.conf"
recipes/freesmartphone/fsodeviced/fsodeviced.conf deleted +0 -83
83 lines not on this page · raw message
recipes/freesmartphone/fsodeviced/om-gta02/fsodeviced.conf deleted +0 -88
88 lines not on this page · raw message
recipes/freesmartphone/fsodeviced_git.bb +1 -13
@@ -18,21 +18,9 @@ inherit update-rc.d INITSCRIPT_NAME = "fsodeviced" INITSCRIPT_PARAMS = "defaults 27" -SRC_URI += "file://fsodeviced file://fsodeviced.conf" +SRC_URI += "file://fsodeviced" do_install_append() { install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/fsodeviced ${D}${sysconfdir}/init.d/ - install -d ${D}${sysconfdir}/freesmartphone/ - install -m 0644 ${WORKDIR}/fsodeviced.conf ${D}${sysconfdir}/freesmartphone/ } - -FILES_${PN} += "\ - ${sysconfdir}/init.d/fsodeviced \ - ${sysconfdir}/freesmartphone \ -" - -CONFFILES_${PN} += "\ - ${sysconfdir}/freesmartphone/fsodeviced.conf \ -" -
recipes/freesmartphone/fsogsmd/fsogsmd.conf deleted +0 -57
57 lines not on this page · raw message
recipes/freesmartphone/fsogsmd_git.bb +0 -10
@@ -5,17 +5,7 @@ PV = "0.2.0+gitr${SRCREV}" DEPENDS += "libfsoresource libgsm0710mux" -SRC_URI += "file://fsogsmd.conf" - -do_install_append() { - install -d ${D}${sysconfdir}/freesmartphone/ - install -m 0644 ${WORKDIR}/fsogsmd.conf ${D}${sysconfdir}/freesmartphone/ -} - do_install_append_shr() { # remove .service file to disable fsogsmd autostart rm -f ${D}${datadir}/dbus-1/system-services/org.freesmartphone.ogsmd.service } - -FILES_${PN} += "${sysconfdir}/freesmartphone/fsogsmd.conf" -CONFFILES_${PN} += "${sysconfdir}/freesmartphone/fsogsmd.conf"
recipes/freesmartphone/fsonetworkd/fsonetworkd.conf deleted +0 -19
@@ -1,19 +0,0 @@ -####################################################################################### -# FSO Network Daemon Configuration File -- for SYSTEM INTEGRATORS only -######################################################################################## -[logging] -# Log level: DEBUG, INFO (default), WARNING, ERROR -# Override via environment as FSO_LOG_LEVEL -log_level = INFO -# Where to log to: none (default), stderr, stderr:colors, file, syslog -# Override via environment as FSO_LOG_TO -log_to = file -# Log Destination (valid only for log_to = file) -# Override via environment as FSO_LOG_DESTINATION -log_destination = /var/log/fsonetworkd.log - -[fsonetwork] -# No settings yet - -[fsonetwork.sharing] -# No settings yet
recipes/freesmartphone/fsonetworkd_git.bb +0 -10
@@ -2,13 +2,3 @@ require cornucopia.inc inherit fso-plugin PV = "0.1.0.0+gitr${SRCREV}" PR = "${INC_PR}.2" - -SRC_URI += "file://fsonetworkd.conf" - -do_install_append() { - install -d ${D}${sysconfdir}/freesmartphone/ - install -m 0644 ${WORKDIR}/fsonetworkd.conf ${D}${sysconfdir}/freesmartphone/ -} - -FILES_${PN} += "${sysconfdir}/freesmartphone/fsonetworkd.conf" -CONFFILES_${PN} += "${sysconfdir}/freesmartphone/fsonetworkd.conf"
recipes/freesmartphone/fsotdld/fsotdld.conf deleted +0 -43
43 lines not on this page · raw message
recipes/freesmartphone/fsotdld_git.bb +0 -10
@@ -4,13 +4,3 @@ PR = "${INC_PR}.2" PV = "0.0.0+gitr${SRCREV}" DEPENDS += "libfsotransport libfsoresource" - -SRC_URI += "file://fsotdld.conf" - -do_install_append() { - install -d ${D}${sysconfdir}/freesmartphone/ - install -m 0644 ${WORKDIR}/fsotdld.conf ${D}${sysconfdir}/freesmartphone/ -} - -FILES_${PN} += "${sysconfdir}/freesmartphone/fsotdld.conf" -CONFFILES_${PN} += "${sysconfdir}/freesmartphone/fsotdld.conf"
recipes/freesmartphone/fsousaged/fsousaged.conf deleted +0 -32
@@ -1,32 +0,0 @@ -####################################################################################### -# FSO Usage Daemon Configuration File -- for SYSTEM INTEGRATORS only -######################################################################################## -[logging] -# Log level: DEBUG, INFO (default), WARNING, ERROR -# Override via environment as FSO_LOG_LEVEL -log_level = INFO -# Where to log to: none (default), stderr, stderr:colors, file, syslog -# Override via environment as FSO_LOG_TO -log_to = file -# Log Destination (valid only for log_to = file) -# Override via environment as FSO_LOG_DESTINATION -log_destination = /var/log/fsousaged.log - -[fsousage] -# Which low level suspend/resume variant to use: none (default), kernel26, openmoko -lowlevel_type = kernel26 -# FOR DEBUGGING ONLY: Do not suspend, but instead sleep a couple of seconds -debug_do_not_suspend = 0 -# FOR DEBUGGING ONLY: Enable every registered resource on startup -debug_enable_on_startup = 0 -# FOR DEBUGGING ONLY: Whether resource activation should be synchronized with the registration lifecycle: always (default), startup, shutdown, never -sync_resources_with_lifecycle = always - -[fsousage.lowlevel_kernel26] -# No settings yet - -[fsousage.lowlevel_openmoko] -# No settings yet - -[fsousage.dbus_service] -# No settings yet
recipes/freesmartphone/fsousaged/om-gta02/fsousaged.conf deleted +0 -32
@@ -1,32 +0,0 @@ -####################################################################################### -# FSO Usage Daemon Configuration File -- for SYSTEM INTEGRATORS only -######################################################################################## -[logging] -# Log level: DEBUG, INFO (default), WARNING, ERROR -# Override via environment as FSO_LOG_LEVEL -log_level = INFO -# Where to log to: none (default), stderr, stderr:colors, file, syslog -# Override via environment as FSO_LOG_TO -log_to = file -# Log Destination (valid only for log_to = file) -# Override via environment as FSO_LOG_DESTINATION -log_destination = /var/log/fsousaged.log - -[fsousage] -# Which low level suspend/resume variant to use: none (default), kernel26, openmoko -lowlevel_type = openmoko -# FOR DEBUGGING ONLY: Do not suspend, but instead sleep a couple of seconds -debug_do_not_suspend = 0 -# FOR DEBUGGING ONLY: Enable every registered resource on startup -debug_enable_on_startup = 0 -# FOR DEBUGGING ONLY: Whether resource activation should be synchronized with the registration lifecycle: always (default), startup, shutdown, never -sync_resources_with_lifecycle = always - -[fsousage.lowlevel_kernel26] -# No settings yet - -[fsousage.lowlevel_openmoko] -# No settings yet - -[fsousage.dbus_service] -# No settings yet
recipes/freesmartphone/fsousaged_git.bb +0 -10
@@ -2,13 +2,3 @@ require cornucopia.inc inherit fso-plugin PV = "0.9.0.1+gitr${SRCREV}" PR = "${INC_PR}.2" - -SRC_URI += "file://fsousaged.conf" - -do_install_append() { - install -d ${D}${sysconfdir}/freesmartphone/ - install -m 0644 ${WORKDIR}/fsousaged.conf ${D}${sysconfdir}/freesmartphone/ -} - -FILES_${PN} += "${sysconfdir}/freesmartphone/fsousaged.conf" -CONFFILES_${PN} += "${sysconfdir}/freesmartphone/fsousaged.conf"
Signature · 1 line
1.6.6.1
Martin,
thank you for all the work you do. Does this patch even need review? If you are unsure about something then of course, please ask. But otherwise, I don't think you need to get two ACKs to push this.
Regards
Rolf