|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/piggz/droid-config-mido.git</param>
<param name="branch">master</param>
- <param name="revision"></param>
+ <param name="revision">22fb913a855c9ff6f291d28824635e5db77dab29</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -172,7 +172,7 @@
%package pulseaudio-settings
Summary: PulseAudio settings for %{rpm_device} hw
Provides: droid-config-pulseaudio-settings
-Requires: pulseaudio >= 11.1
+Requires: pulseaudio >= 11.1+git4
Requires: pulseaudio-modules-nemo-parameters >= 11.1.24
Requires: pulseaudio-modules-nemo-stream-restore >= 11.1.24
Requires: pulseaudio-modules-nemo-mainvolume >= 11.1.24
@@ -307,7 +307,7 @@
copy_files_from() {
config_dir=$1
if [ -d $config_dir ]; then
- (cd $config_dir; find . \( -type f -or -type l \) -print ) | sed 's/^.//' >> tmp/droid-config.files
+ (cd $config_dir; find . \( -type f -o -type l \) -print ) | sed 's/^.//' >> tmp/droid-config.files
cp -Rf $config_dir/* $RPM_BUILD_ROOT/
fi
}
@@ -417,6 +417,18 @@
/usr/bin/repomd-pattern-builder.py --patternxml -p %{dcd_common}/patterns/common -o %{buildroot}/usr/share/package-groups/ --version=%{version} --release=%{release}
/usr/bin/repomd-pattern-builder.py --patternxml -p %{dcd_path}/patterns/ -o %{buildroot}/usr/share/package-groups/ --version=%{version} --release=%{release}
+delete_patterns() {
+ deletelist=$1
+ if [ -e $deletelist ]; then
+ egrep -v '^#|^$' $deletelist | (
+ while read file; do
+ rm $RPM_BUILD_ROOT/$file
+ done)
+ fi
+}
+
+delete_patterns delete_pattern_%{rpm_device}.list
+
%if 0%{!?pixel_ratio:1}
%define pixel_ratio 1.0
%endif
@@ -600,6 +612,14 @@
%endif
%if 0%{?have_bluetooth:1}
+%posttrans bluez4
+rm -rf /etc/bluetooth || :
+ln -s bluez4/bluetooth /etc/bluetooth || :
+
+%posttrans bluez5
+rm -rf /etc/bluetooth || :
+ln -s bluez5/bluetooth /etc/bluetooth || :
+
%files bluez4 -f tmp/bluez4.files
%defattr(644,root,root,-)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/helpers/process_patterns.sh
^
|
| @@ -33,7 +33,8 @@
echo "<patterns count=\"$COUNT\">" > ../patterns.xml
find . -type f -name "*.xml" -exec cat {} + >> ../patterns.xml
echo "</patterns>" >> ../patterns.xml
-modifyrepo ../patterns.xml $ANDROID_ROOT/droid-local-repo/$DEVICE/repodata
+modifyrepo_c ../patterns.xml $ANDROID_ROOT/droid-local-repo/$DEVICE/repodata ||
+ modifyrepo ../patterns.xml $ANDROID_ROOT/droid-local-repo/$DEVICE/repodata
cd ../..
rm -rf tmp/patterns
rm tmp/patterns.xml
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/audio.conf
^
|
| (renamed from droid-configs-device/sparse/etc/bluetooth/audio.conf)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/input.conf
^
|
| (renamed from droid-configs-device/sparse/etc/bluetooth/input.conf)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/jolla.conf
^
|
| (renamed from droid-configs-device/sparse/etc/bluetooth/jolla.conf)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/main.conf
^
|
| (renamed from droid-configs-device/sparse/etc/bluetooth/main.conf)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/network.conf
^
|
| (renamed from droid-configs-device/sparse/etc/bluetooth/network.conf)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/rfcomm.conf
^
|
| (renamed from droid-configs-device/sparse/etc/bluetooth/rfcomm.conf)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/serial.conf
^
|
| (renamed from droid-configs-device/sparse/etc/bluetooth/serial.conf)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/etc/bluez5/bluetooth/exclude.conf
^
|
| @@ -0,0 +1,2 @@
+[Exclude]
+0000111e-0000-1000-8000-00805f9b34fb = 00001108-0000-1000-8000-00805f9b34fb
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/etc/bluez5/bluetooth/input.conf
^
|
| @@ -0,0 +1,13 @@
+# 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
+
+# Enable HID protocol handling in userspace input profile
+# Defaults to false (HIDP handled in HIDP kernel module)
+#UserspaceHID=true
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/etc/bluez5/bluetooth/jolla.conf
^
|
| @@ -0,0 +1,5 @@
+[General]
+Wakelocks=true
+
+[Security]
+DBusAuthorizedGroups=root,privileged
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/etc/bluez5/bluetooth/main.conf
^
|
| @@ -0,0 +1,109 @@
+[General]
+
+# Default adapter name
+# Defaults to 'BlueZ X.YZ'
+Name=
+
+# Default device class. Only the major and minor device class bits are
+# considered. Defaults to '0x000000'.
+# 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
+
+# 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. Default is 60.
+AutoConnectTimeout = 60
+
+# 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
+
+# Restricts all controllers to the specified transport. Default value
+# is "dual", i.e. both BR/EDR and LE enabled (when supported by the HW).
+# Possible values: "dual", "bredr", "le"
+#ControllerMode = dual
+
+# Enables Multi Profile Specification support. This allows to specify if
+# system supports only Multiple Profiles Single Device (MPSD) configuration
+# or both Multiple Profiles Single Device (MPSD) and Multiple Profiles Multiple
+# Devices (MPMD) configurations.
+# Possible values: "off", "single", "multiple"
+#MultiProfile = off
+
+# Permanently enables the Fast Connectable setting for adapters that
+# support it. When enabled other devices can connect faster to us,
+# however the tradeoff is increased power consumptions. This feature
+# will fully work only on kernel version 4.1 and newer. Defaults to
+# 'false'.
+#FastConnectable = false
+
+# Default privacy setting.
+# Enables use of private address.
+# Possible values: "off", "device", "network"
+# "network" option not supported currently
+# Defaults to "off"
+# Privacy = off
+
+[GATT]
+# GATT attribute cache.
+# Possible values:
+# always: Always cache attributes even for devices not paired, this is
+# recommended as it is best for interoperability, with more consistent
+# reconnection times and enables proper tracking of notifications for all
+# devices.
+# yes: Only cache attributes of paired devices.
+# no: Never cache attributes
+# Default: always
+#Cache = always
+
+[Policy]
+#
+# The ReconnectUUIDs defines the set of remote services that should try
+# to be reconnected to in case of a link loss (link supervision
+# timeout). The policy plugin should contain a sane set of values by
+# default, but this list can be overridden here. By setting the list to
+# empty the reconnection feature gets disabled.
+#ReconnectUUIDs=00001112-0000-1000-8000-00805f9b34fb,0000111f-0000-1000-8000-00805f9b34fb,0000110a-0000-1000-8000-00805f9b34fb
+
+# ReconnectAttempts define the number of attempts to reconnect after a link
+# lost. Setting the value to 0 disables reconnecting feature.
+#ReconnectAttempts=7
+
+# ReconnectIntervals define the set of intervals in seconds to use in between
+# attempts.
+# If the number of attempts defined in ReconnectAttempts is bigger than the
+# set of intervals the last interval is repeated until the last attempt.
+#ReconnectIntervals=1,2,4,8,16,32,64
+
+# AutoEnable defines option to enable all controllers when they are found.
+# This includes adapters present on start as well as adapters that are plugged
+# in later on. Defaults to 'false'.
+#AutoEnable=false
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/etc/bluez5/bluetooth/network.conf
^
|
| @@ -0,0 +1,6 @@
+# Configuration file for the network service
+
+[General]
+
+# Disable link encryption: default=false
+#DisableSecurity=true
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
| @@ -25,6 +25,21 @@
load-module module-droid-keepalive
+### If droid-card needs other arguments than the default, have the new
+### load-module line in /etc/pulse/arm_droid_card_custom.pa
+.ifexists /etc/pulse/arm_droid_card_custom.pa
+ .include /etc/pulse/arm_droid_card_custom.pa
+.else
+ load-module module-droid-card rate=48000
+.endif
+
+### Needed on many new devices. HADK guide explains how to implement this fully
+.ifexists module-droid-glue.so
+ .nofail
+ load-module module-droid-glue
+ .fail
+.endif
+
load-module module-meego-parameters cache=1 directory=/var/lib/nemo-pulseaudio-parameters use_voice=false
load-module module-meego-mainvolume virtual_stream=true
@@ -44,28 +59,13 @@
load-module module-null-sink sink_name=sink.null rate=48000
-### If droid-card needs other arguments than the default, have the new
-### load-module line in /etc/pulse/arm_droid_card_custom.pa
-.ifexists /etc/pulse/arm_droid_card_custom.pa
- .include /etc/pulse/arm_droid_card_custom.pa
-.else
- load-module module-droid-card rate=48000
-.endif
-
-### Needed on many new devices. HADK guide explains how to implement this fully
-.ifexists module-droid-glue.so
- .nofail
- load-module module-droid-glue
- .fail
-.endif
-
load-module module-null-sink sink_name=sink.fake.sco rate=8000 channels=1
load-module module-null-source source_name=source.fake.sco rate=8000 channels=1
load-module module-bluetooth-discover bluez4_args="sco_sink=sink.fake.sco sco_source=source.fake.sco" bluez5_args="headset=droid"
load-module module-policy-enforcement
-load-module module-role-ducking trigger_roles=notification,warning ducking_roles=x-maemo volume=-12dB
+load-module module-role-ducking trigger_roles=notification,warning ducking_roles=x-maemo volume=-12dB duck_while_corked=true
### Load several protocols
.ifexists module-esound-protocol-unix.so
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/lib/udev/rules.d/998-droid-system.rules
^
|
| @@ -10,6 +10,9 @@
SUBSYSTEM=="misc", KERNEL=="log_system", SYMLINK+="alog/system"
SUBSYSTEM=="misc", KERNEL=="log_main", SYMLINK+="alog/main"
+# Video device symlinks needed for video codecs
+SUBSYSTEM=="video4linux", KERNEL=="video[0-9]*", ATTRS{link_name}!="", SYMLINK+="video/%s{link_name}"
+
# Partition symlinks, compatible with the android way of setting up the
# symlinks.
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-init-done.sh
^
|
| @@ -35,7 +35,7 @@
# oneshot
export LD_LIBRARY_PATH=/lib:/usr/lib
-export PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin
+export PATH=/sbin:/bin:/usr/sbin:/usr/bin
export NOTIFY_SOCKET="$(cat /run/droid-hal/notify-socket-name)"
DROID_PID=$(pgrep droid-hal-init)
systemd-notify --pid=$DROID_PID --ready
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-mido-0.3.7.tar.bz2/droid-configs-device/sparse/usr/sbin/flash-partition
^
|
| @@ -199,6 +199,10 @@
fi
fi
+ if [[ "$SAILFISHOS_WIPE_PARTITIONS" == "1" ]]; then
+ dd if=/dev/zero bs=1M of=$DEVDIR/$DEVICE
+ fi
+
dd if=$FILENAME bs=4096 of=$DEVDIR/$DEVICE
if [[ "$SPARSE" == "ed26ff3a" ]]; then
|
