|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mako.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mako.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/mer-hybris/droid-config-mako.git</param>
<param name="branch">master</param>
- <param name="revision">8ef9961c1fd31d99bf71292c28e83764252733ea</param>
+ <param name="revision">5f05fa7f5cd6137f5a7a535e721ead25f6ab33b2</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-mako-0.0.11.tar.bz2/sparse/lib/systemd/system/droid-wlan-fwreload.service
^
|
| @@ -1,14 +0,0 @@
-[Unit]
-Description=droid-wlan-fwreload
-After=droid-late-start.service
-Before=network.target start-user-session@USER.service bluetooth.service ofono.service sensord.service
-Conflicts=shutdown.target actdead.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/sh /usr/bin/droid/droid-wlan-fwreload.sh
-
-[Install]
-WantedBy=basic.target
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-mako-0.0.11.tar.bz2/sparse/lib/systemd/system/multi-user.target.wants/droid-wlan-fwreload.service
^
|
| -(symlink to ../droid-wlan-fwreload.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-mako-0.0.11.tar.bz2/sparse/lib/systemd/system/network.target.wants/wlan-module-load.service
^
|
| -(symlink to ../wlan-module-load.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-mako-0.0.11.tar.bz2/sparse/lib/systemd/system/wlan-module-load.service
^
|
| @@ -1,17 +0,0 @@
-[Unit]
-Description=Load WLAN Kernel Module
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=droid-hal-init.service persist.mount firmware.mount
-Requires=persist.mount firmware.mount
-Before=network.target wpa_supplicant.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/droid/load-wlan
-ExecStop=/usr/bin/droid/unload-wlan
-
-[Install]
-WantedBy=network.target
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-mako-0.0.11.tar.bz2/sparse/usr/bin/droid/droid-wlan-fwreload.sh
^
|
| @@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2014 Jolla Ltd.
-# Contact: Simonas Leleiva <simonas.leleiva@jollamobile.com>
-#
-
-# This waits for mako (LG Nexus 4) WLAN firmware to be provided by conn_init
-
-while [ ! -e /data/misc/wifi/WCNSS_qcom_wlan_nv.bin ]; do
- sleep 1
- echo "...waiting for wlan firmware to appear: WCNSS_qcom_wlan_nv.bin"
-done
-while [ ! -e /data/misc/wifi/WCNSS_qcom_cfg.ini ]; do
- sleep 1
- echo "...waiting for wlan firmware to appear: WCNSS_qcom_cfg.ini"
-done
-echo "...waiting for services to settle"
-sleep 2
-/system/bin/ndc softap fwreload wlan0 AP
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-mako-0.0.11.tar.bz2/sparse/usr/bin/droid/load-wlan
^
|
| @@ -1,23 +0,0 @@
-#!/bin/sh
-# This waits ready signal from anrdoid side before loading wlan module
-
-WLAN_READY=/sys/module/wcnsscore/parameters/wlan_smd_ready
-MAX_WAIT=15
-
-i=0
-
-if [ -f $WLAN_READY ]; then
- # Wait ready signal
- ready=$(cat $WLAN_READY)
- while [ $i -lt $MAX_WAIT ] &&
- [ $ready -ne 1 ]; do
- sleep 1
- let i=$i+1
- ready=$(cat $WLAN_READY)
- done
-fi
-
-echo "Ready to load wlan after $i s wait"
-
-modprobe wlan
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-mako-0.0.11.tar.bz2/sparse/usr/bin/droid/unload-wlan
^
|
| @@ -1,4 +0,0 @@
-#!/bin/sh
-ifconfig wlan0 down
-modprobe -r wlan
-
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/patterns/jolla-hw-adaptation-mako.yaml
^
|
| @@ -27,12 +27,6 @@
- qt5-qpa-hwcomposer-plugin
- qtscenegraph-adaptation
-# GStreamer v0.10 multimedia support is being deprecated
-#- gstreamer0.10-droidcamsrc
-#- gstreamer0.10-omx
-#- gstreamer0.10-droideglsink
-#- nemo-qtmultimedia-plugins-gstvideotexturebackend
-
# Add GStreamer v1.0 as standard
- gstreamer1.0
- gstreamer1.0-plugins-good
@@ -46,10 +40,6 @@
- qt5-qtdeclarative-import-positioning
- qt5-qtdeclarative-import-sensors
-# This is required for harbour-flashlight
-- gstreamer0.10-droidcamsrc
-- gstreamer0.10-droideglsink
-
# Flashlight
- jolla-settings-system-flashlight
@@ -71,12 +61,8 @@
# android diag mode only usable for certain android tools
- usb-moded-diag-mode-android
-# from update13, this is needed explicitly
-- bluez-configs-sailfish
-
# OBEX for bluetooth PBAP
- obexd-calldata-provider
-- obexd-configs-sailfish
# hammerhead, grouper, and maguro use this in scripts, so include for all
- rfkill
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/patterns/jolla-ui-configuration-mako.yaml
^
|
| @@ -6,5 +6,10 @@
Requires:
- jolla-ambient-z1.25
- ambient-icons-closed-z1.25
+
+# Introduced starting Sailfish OS 2.0.4.x:
+# 3rd party accounts like Twitter, VK, cloud services, etc
+- jolla-settings-accounts-extensions-3rd-party-all
+
Summary: Jolla UI Configuration mako
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/etc/bluetooth/audio.conf
^
|
| @@ -0,0 +1,63 @@
+# Configuration file for the audio service
+
+# This section contains options which are not specific to any
+# particular interface
+[General]
+#Enable=Gateway
+# Switch to master role for incoming connections (defaults to true)
+#Master=true
+
+# If we want to disable support for specific services
+# Defaults to supporting all implemented services
+#Disable=Gateway,Source,Socket
+
+# SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA)
+# Defaults to HCI
+#SCORouting=PCM
+
+# Automatically connect both A2DP and HFP/HSP profiles for incoming
+# connections. Some headsets that support both profiles will only connect the
+# other one automatically so the default setting of true is usually a good
+# idea.
+#AutoConnect=true
+
+# Headset interface specific options (i.e. options which affect how the audio
+# service interacts with remote headset devices)
+[Headset]
+
+# Set to true to support HFP, false means only HSP is supported
+# Defaults to true
+HFP=true
+
+# Maximum number of connected HSP/HFP devices per adapter. Defaults to 1
+MaxConnected=1
+
+# Set to true to enable use of fast connectable mode (faster page scanning)
+# for HFP when incoming call starts. Default settings are restored after
+# call is answered or rejected. Page scan interval is much shorter and page
+# scan type changed to interlaced. Such allows faster connection initiated
+# by a headset.
+FastConnectable=false
+
+# Just an example of potential config options for the other interfaces
+#[A2DP]
+#SBCSources=1
+#MPEG12Sources=0
+
+# Limit features advertised to headsets
+[Telephony]
+Disable=ConferenceCalling,InBandRingtone,EnhancedCallControl
+
+# Where to retrieve battery charge info from
+BatteryInfo=Statefs
+
+# Where to retrieve last dialed number from
+LastDialedNumber=/home/nemo/.cache/last-dialed
+
+# Configure AVRCP features: TG category 1, CT disabled
+[AVRCP]
+EnableTarget=true
+TargetVersion=0x0100
+DisableTargetFeatures=Category2,Category3,Category4,PlayerSettings
+
+EnableControl=false
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/etc/bluetooth/input.conf
^
|
| @@ -0,0 +1,9 @@
+# Configuration file for the input service
+
+# This section contains options which are not specific to any
+# particular interface
+[General]
+
+# Set idle timeout (in minutes) before the connection will
+# be disconnect (defaults to 0 for no timeout)
+#IdleTimeout=30
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/etc/bluetooth/jolla.conf
^
|
| @@ -0,0 +1,5 @@
+[General]
+Wakelocks=true
+
+[Security]
+DBusAuthorizedGroups=root,privileged
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/etc/bluetooth/main.conf
^
|
| @@ -0,0 +1,65 @@
+[General]
+
+# List of plugins that should not be loaded on bluetoothd startup
+#DisablePlugins = network,input
+
+# Default adaper name
+# %h - substituted for hostname
+# %d - substituted for adapter id
+Name=
+
+# Default device class. Only the major and minor device class bits are
+# considered.
+# Phone, smart-phone
+Class = 0x00020c
+
+# How long to stay in discoverable mode before going back to non-discoverable
+# The value is in seconds. Default is 180, i.e. 3 minutes.
+# 0 = disable timer, i.e. stay discoverable forever
+DiscoverableTimeout = 0
+
+# How long to stay in pairable mode before going back to non-discoverable
+# The value is in seconds. Default is 0.
+# 0 = disable timer, i.e. stay pairable forever
+PairableTimeout = 0
+
+# Use some other page timeout than the controller default one
+# which is 16384 (10 seconds).
+PageTimeout = 8192
+
+# Automatic connection for bonded devices driven by platform/user events.
+# If a platform plugin uses this mechanism, automatic connections will be
+# enabled during the interval defined below. Initially, this feature
+# intends to be used to establish connections to ATT channels.
+AutoConnectTimeout = 60
+
+# What value should be assumed for the adapter Powered property when
+# SetProperty(Powered, ...) hasn't been called yet. Defaults to true
+InitiallyPowered = true
+
+# Remember the previously stored Powered state when initializing adapters
+RememberPowered = true
+
+# Use vendor id source (assigner), vendor, product and version information for
+# DID profile support. The values are separated by ":" and assigner, VID, PID
+# and version.
+# Possible vendor id source values: bluetooth, usb (defaults to usb)
+#DeviceID = bluetooth:1234:5678:abcd
+
+# Do reverse service discovery for previously unknown devices that connect to
+# us. This option is really only needed for qualification since the BITE tester
+# doesn't like us doing reverse SDP for some test cases (though there could in
+# theory be other useful purposes for this too). Defaults to true.
+ReverseServiceDiscovery = true
+
+# Enable name resolving after inquiry. Set it to 'false' if you don't need
+# remote devices name and want shorter discovery cycle. Defaults to 'true'.
+NameResolving = true
+
+# Enable runtime persistency of debug link keys. Default is false which
+# makes debug link keys valid only for the duration of the connection
+# that they were created for.
+DebugKeys = false
+
+# Enable the GATT functionality. Default is false
+EnableGatt = false
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/etc/bluetooth/network.conf
^
|
| @@ -0,0 +1,6 @@
+# Configuration file for the network service
+
+[General]
+
+# Disable link encryption: default=false
+#DisableSecurity=true
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/etc/bluetooth/rfcomm.conf
^
|
| @@ -0,0 +1,17 @@
+#
+# RFCOMM configuration file.
+#
+
+#rfcomm0 {
+# # Automatically bind the device at startup
+# bind no;
+#
+# # Bluetooth address of the device
+# device 11:22:33:44:55:66;
+#
+# # RFCOMM channel for the connection
+# channel 1;
+#
+# # Description of the connection
+# comment "Example Bluetooth device";
+#}
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/etc/bluetooth/serial.conf
^
|
| @@ -0,0 +1,10 @@
+# Configuration file for serial
+
+# There could be multiple proxy sections, the format is [Proxy <user chosen name>]
+#[Proxy DUN]
+
+# UUID for DUN proxy service
+#UUID=00001103-0000-1000-8000-00805F9B34FB
+
+# Address for device node
+#Address=/dev/ttyx
|
|
|
Changed |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/etc/obexd/excludes/bluetooth:pcsuite
^
|
|
|
Changed |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/etc/obexd/noplugins/ftp
^
|
|
|
Changed |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/etc/obexd/noplugins/irmc
^
|
|
|
Changed |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/etc/obexd/noplugins/mas
^
|
|
|
Changed |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/etc/obexd/noplugins/syncevolution
^
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/etc/obexd/opp.conf
^
|
| @@ -0,0 +1,2 @@
+[OPP]
+DisableFormat=vCal1.0,iCal2.0,vNote,vMessage
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/etc/obexd/pbap.conf
^
|
| @@ -0,0 +1,4 @@
+[PBAP]
+# By default PBAP server listens for incoming connections at channel 15.
+# That can be overridden by specifying a non-default channel.
+# Channel=21
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/lib/systemd/system/basic.target.wants/wifi-module-load.service
^
|
| +(symlink to ../wifi-module-load.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/lib/systemd/system/hcismd.service
^
|
| @@ -1,7 +1,8 @@
[Unit]
Description=Enable Bluetooth HCI over SMD
-DefaultDependencies=false
-After=local-fs.target
+After=droid-late-start.target
+Before=bluetooth.service
+Conflicts=shutdown.target actdead.targe
[Service]
Type=oneshot
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/lib/systemd/system/wifi-module-load.service
^
|
| @@ -0,0 +1,18 @@
+[Unit]
+Description=Load wifi module
+After=droid-late-start.service
+Before=network.target
+Conflicts=shutdown.target actdead.target
+
+[Service]
+Type=simple
+RemainAfterExit=yes
+ExecStartPre=/bin/touch /dev/wcnss_wlan
+ExecStartPre=/bin/sleep 10
+ExecStart=/sbin/modprobe wlan
+ExecStop=/sbin/rmmod wlan
+Restart=on-failure
+RestartSec=2
+
+[Install]
+WantedBy=basic.target
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mako-0.0.12.tar.bz2/sparse/sbin/hcismd-enable.sh
^
|
| @@ -5,13 +5,25 @@
# not work, so we loop.
MAXTRIES=15
-seq 1 $MAXTRIES | while read i ; do
+i=1
+while [ ! $i -gt $MAXTRIES ] ; do
echo 1 > /sys/module/hci_smd/parameters/hcismd_set
if [ -e /sys/class/bluetooth/hci0 ] ; then
- # found hci0, exit successfully
+ # found hci0, get/set BT MAC address
+ echo 0 > /sys/module/hci_smd/parameters/hcismd_set
+ bt_mac=$(/system/bin/hci_qcomm_init -e -p 2 -P 2 -d /dev/ttyHSL0 2>1 | grep -oP '([0-9a-f]{2}:){5}([0-9a-f]{2})')
+ echo "BT MAC: $bt_mac"
+ if [ ! -z "$bt_mac" ] ; then
+ echo $bt_mac > /var/lib/bluetooth/board-address
+ echo "BT MAC: $bt_mac"
+ fi
+ echo 1 > /sys/module/hci_smd/parameters/hcismd_set
exit 0
fi
sleep 1
+ if [ $i == $MAXTRIES ] ; then
+ # must have gotten through all our retries, fail
+ exit 1
+ fi
+
done
-# must have gotten through all our retries, fail
-exit 1
|
