|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-ham.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-ham.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -1,10 +1,9 @@
<services>
<service name="tar_git">
- <param name="url">https://github.com/litew/droid-config-ham.git</param>
- <param name="branch">master</param>
- <param name="revision">f6139d540b8d3d8218774031d7df44f1470b042e</param>
- <param name="token"/>
- <param name="debian">N</param>
- <param name="dumb">N</param>
- </service>
-</services>
+ <param name="url">https://github.com/litew/droid-config-ham.git</param>
+ <param name="branch">master</param>
+ <param name="revision">a54dda26ddf37a1b38f1a01673977515736e48e3</param>
+ <param name="token"/>
+ <param name="debian">N</param>
+ <param name="dumb">N</param>
+</service></services>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-ham-0.0.8.tar.bz2/droid-configs-device/kickstart/post_nochroot/hybris
^
|
| @@ -1,8 +0,0 @@
-cp $INSTALL_ROOT/etc/os-release $IMG_OUT_DIR
-ls -l $INSTALL_ROOT/usr/share/ssu/features.d/customer-*.ini &> /dev/null
-if [ "$?" == "0" ]; then
- for CFILE in $(ls -1 $INSTALL_ROOT/usr/share/ssu/features.d/customer-*.ini); do
- CUSTOMER_TMP+=${CUSTOMER_TMP:+ }$(grep -i "^name[ ]*=" $CFILE | sed 's/^.*=[ \t]*//')
- done
- echo "SAILFISH_CUSTOMER=\""$(echo ${CUSTOMER_TMP} | sed 's![/ ()]\+!_!g')"\"" >> $IMG_OUT_DIR/os-release
-fi
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-ham-0.0.8.tar.bz2/droid-configs-device/sparse/lib/udev/platform-device
^
|
| @@ -1,5 +0,0 @@
-#!/bin/sh
-RESULT=`echo "$1" | sed "s|/devices/\([^/]*\)/\([^/]*\)/.*|\1/\2|g"| cut -d'/' -f1`
-
-echo ANDROID_BLOCK_DEVICE=$RESULT
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-ham-0.0.8.tar.bz2/sparse/etc/pulse/arm_msm8974_zuk-ham.pa
^
|
| @@ -1,123 +0,0 @@
-#!/usr/bin/pulseaudio -nF
-#
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-
-# This startup script is used only if PulseAudio is started per-user
-# (i.e. not in system mode)
-
-.nofail
-
-.fail
-
-load-module module-droid-keepalive
-
-load-module module-meego-parameters cache=1 directory=/var/lib/nemo-pulseaudio-parameters use_voice=false
-load-module module-meego-mainvolume virtual_stream=true
-
-### Automatically restore the volume of streams
-# load configuration based on bluez version
-.ifexists /etc/pulse/bluez5_stream_restore.pa
- .include /etc/pulse/bluez5_stream_restore.pa
-.else
- .include /etc/pulse/bluez4_stream_restore.pa
-.endif
-
-load-module module-match table=/etc/pulse/x-maemo-match.table key=application.name
-
-### Automatically augment property information from .desktop files
-### stored in /usr/share/application
-load-module module-augment-properties
-
-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 several protocols
-.ifexists module-esound-protocol-unix.so
-load-module module-esound-protocol-unix
-.endif
-load-module module-native-protocol-unix
-
-### Network access (may be configured with paprefs, so leave this commented
-### here if you plan to use paprefs)
-#load-module module-esound-protocol-tcp
-#load-module module-native-protocol-tcp
-
-### Load the RTP receiver module (also configured via paprefs, see above)
-#load-module module-rtp-recv
-
-### Load the RTP sender module (also configured via paprefs, see above)
-#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
-#load-module module-rtp-send source=rtp.monitor
-
-### Load additional modules from GConf settings. This can be configured with the paprefs tool.
-### Please keep in mind that the modules configured by paprefs might conflict with manually
-### loaded modules.
-.ifexists module-gconf.so
-.nofail
-load-module module-gconf
-.fail
-.endif
-
-### Make sure we always have a sink around, even if it is a null sink.
-load-module module-always-sink
-
-### Honour intended role device property
-load-module module-intended-roles
-
-### Automatically suspend sinks/sources that become idle for too long
-load-module module-suspend-on-idle timeout=1
-
-### If autoexit on idle is enabled we want to make sure we only quit
-### when no local session needs us anymore.
-.ifexists module-console-kit.so
-load-module module-console-kit
-.endif
-.ifexists module-systemd-login.so
-load-module module-systemd-login
-.endif
-
-### Load DBus protocol
-.ifexists module-dbus-protocol.so
-load-module module-dbus-protocol
-.endif
-
-### Move orphan streams to placeholder sinks or sources so that playback doesn't get
-### interrupted. Policy enforcement module then moves the streams to new appropriate
-### sinks or sources.
-load-module module-rescue-streams sink_name=sink.null source_name=sink.null.monitor
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-ham-0.0.8.tar.bz2/sparse/etc/sysconfig/pulseaudio
^
|
| @@ -1 +0,0 @@
-CONFIG="-n --file=/etc/pulse/arm_msm8974_zuk-ham.pa"
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-ham-0.0.8.tar.bz2/sparse/lib/udev/platform-device
^
|
| @@ -1,5 +0,0 @@
-#!/bin/sh
-RESULT=`echo "$1" | sed "s|/devices/\([^/]*\)/\([^/]*\)/.*|\1/\2|g"| cut -d'/' -f1`
-
-echo ANDROID_BLOCK_DEVICE=$RESULT
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-ham-0.0.8.tar.bz2/sparse/lib/udev/rules.d/998-droid-system.rules
^
|
| @@ -1,16 +0,0 @@
-SUBSYSTEM=="graphics", SYMLINK+="$env{SUBSYSTEM}/%k"
-SUBSYSTEM=="block", SYMLINK+="$env{SUBSYSTEM}/%k"
-SUBSYSTEM=="oncrpc", SYMLINK+="$env{SUBSYSTEM}/%k"
-SUBSYSTEM=="adsp", SYMLINK+="$env{SUBSYSTEM}/%k"
-SUBSYSTEM=="msm_camera", SYMLINK+="$env{SUBSYSTEM}/%k"
-SUBSYSTEM=="mtd", SYMLINK+="$env{SUBSYSTEM}/%k"
-SUBSYSTEM=="block", SYMLINK+="$env{SUBSYSTEM}/%k"
-SUBSYSTEM=="misc", KERNEL=="log_events", SYMLINK+="alog/events"
-SUBSYSTEM=="misc", KERNEL=="log_radio", SYMLINK+="alog/radio"
-SUBSYSTEM=="misc", KERNEL=="log_system", SYMLINK+="alog/system"
-SUBSYSTEM=="misc", KERNEL=="log_main", SYMLINK+="alog/main"
-
-ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", IMPORT{program}="/bin/sh /lib/udev/platform-device $env{DEVPATH}", SYMLINK+="block/bootdevice/by-name/$env{ID_PART_ENTRY_NAME}"
-
-ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", IMPORT{program}="/bin/sh /lib/udev/platform-device $env{DEVPATH}", SYMLINK+="block/platform/$env{ANDROID_BLOCK_DEVICE}/by-name/$env{ID_PART_ENTRY_NAME}"
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-ham-0.0.8.tar.bz2/sparse/lib/udev/rules.d/999-droid-vidc.rules
^
|
| @@ -1,4 +0,0 @@
-KERNEL=="video32", SYMLINK+="video/venus_dec"
-KERNEL=="video33", SYMLINK+="video/venus_enc"
-KERNEL=="video34", SYMLINK+="video/q6_dec"
-KERNEL=="video35", SYMLINK+="video/q6_enc"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-ham-0.0.9.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -135,8 +135,8 @@
Requires: ohm-plugin-ruleengine
Requires: ohm-plugin-profile
Requires: ohm-plugin-route
-Requires: pulseaudio-modules-nemo-common >= 8.0.24
-Requires: pulseaudio-policy-enforcement >= 8.0.33
+Requires: pulseaudio-modules-nemo-common >= 11.1.24
+Requires: pulseaudio-policy-enforcement >= 11.1.35
Requires: policy-settings-common >= 0.7.3
Obsoletes: ohm-config <= 1.1.15
# ohm-configs-default should not be installed ever, thus no version
@@ -172,12 +172,12 @@
%package pulseaudio-settings
Summary: PulseAudio settings for %{rpm_device} hw
Provides: droid-config-pulseaudio-settings
-Requires: pulseaudio >= 8.0
-Requires: pulseaudio-modules-nemo-parameters >= 8.0.24
-Requires: pulseaudio-modules-nemo-stream-restore >= 8.0.24
-Requires: pulseaudio-modules-nemo-mainvolume >= 8.0.24
-Requires: pulseaudio-modules-droid >= 8.0.63
-Requires: pulseaudio-policy-enforcement >= 8.0.33
+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
+Requires: pulseaudio-modules-droid >= 11.1.66
+Requires: pulseaudio-policy-enforcement >= 11.1.35
Provides: pulseaudio-settings
%description pulseaudio-settings
@@ -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
@@ -473,10 +485,6 @@
sed -e 's|@DEVICE@|%{rpm_device}|g' %{dcd_path}/kickstart/pack_package-droid-updater > $DEST_UPDATER || true
fi
-# post_nochroot
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/post_nochroot/
-cp %{dcd_common}/kickstart/post_nochroot/hybris $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/post_nochroot/%{rpm_device}
-
# and attachments (override if there is one)
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/attachment
cp -f %{dcd_common}/kickstart/attachment_hybris $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/attachment/%{rpm_device}
@@ -604,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-ham-0.0.9.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-ham-0.0.9.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -66,7 +66,7 @@
- rfkill
# enable device lock and allow to select untrusted software
-- jolla-devicelock-plugin-encsfa
+- jolla-devicelock-daemon-encsfa
# For GPS
- geoclue-provider-hybris
@@ -75,5 +75,8 @@
#- qt5-qtmultimedia-plugin-mediaservice-irisradio
#- jolla-mediaplayer-radio
+# For devices with SD Card
+#- sd-utils
+
Summary: Jolla HW Adaptation @DEVICE@
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-ham-0.0.9.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-ham-0.0.9.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-ham-0.0.9.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-ham-0.0.9.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-ham-0.0.9.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-ham-0.0.9.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-ham-0.0.9.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-ham-0.0.9.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-ham-0.0.9.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-ham-0.0.9.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-ham-0.0.9.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-ham-0.0.9.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
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-ham-0.0.9.tar.bz2/droid-configs-device/sparse/etc/media_codecs_performance.xml
^
|
| +(symlink to /system/etc/media_codecs_performance.xml)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-ham-0.0.9.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-ham-0.0.9.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf
^
|
| @@ -353,29 +353,6 @@
ports = droid.output.primary@equals:"true"->output-wired_headphone
[device]
-type = earpieceandtvout
-sink = droid.output.primary@equals:"true"
-ports = droid.output.primary@equals:"true"->output-earpiece
-
-[device]
-type = earpieceforcall
-sink = droid.output.primary@equals:"true"
-ports = droid.output.primary@equals:"true"->output-earpiece
-flags = delayed_port_change
-delay = 200
-
-[device]
-type = earpiece
-sink = droid.output.primary@equals:"true"
-ports = droid.output.primary@equals:"true"->output-earpiece
-
-[device]
-type = earpieceforalien
-sink = droid.output.media_latency@equals:"true"
-ports = droid.output.primary@equals:"true"->output-earpiece
-flags = refresh_always
-
-[device]
type = microphone
source = droid.input.builtin@equals:"true"
ports = droid.input.builtin@equals:"true"->$droid_source_input_microphone
@@ -539,10 +516,6 @@
name = "input of source."
group = internal
-[stream]
-property = media.role@equals:"abstract"
-group = internal
-
# For routing to sink.primaryandbluez
[stream]
property = media.name@startswith:"Simultaneous output on"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-ham-0.0.9.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4.conf
^
|
| @@ -46,21 +46,6 @@
profile = $droid_card_profile
[card]
-type = earpiece
-name = equals:$droid_card
-profile = voicecall
-
-[card]
-type = earpieceforcall
-name = equals:$droid_card
-profile = voicecall
-
-[card]
-type = earpieceforalien
-name = equals:$droid_card
-profile = communication
-
-[card]
type = ihfforcall
name = equals:$droid_card
profile = voicecall
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-ham-0.0.9.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4_earpiece.conf
^
|
| @@ -0,0 +1,14 @@
+[card]
+type = earpiece
+name = equals:$droid_card
+profile = voicecall
+
+[card]
+type = earpieceforcall
+name = equals:$droid_card
+profile = voicecall
+
+[card]
+type = earpieceforalien
+name = equals:$droid_card
+profile = communication
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-ham-0.0.9.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez5.conf
^
|
| @@ -25,7 +25,7 @@
[card]
type = bthsp
name0 = startswith:"bluez_card"
-profile0 = droid_hsp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = $droid_card_profile
flags1 = disable_notify
@@ -33,7 +33,7 @@
[card]
type = bthspforcall
name0 = startswith:"bluez_card"
-profile0 = droid_hsp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = voicecall
flags1 = disable_notify
@@ -41,7 +41,7 @@
[card]
type = bthspforalien
name0 = startswith:"bluez_card"
-profile0 = droid_hsp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = communication
flags1 = disable_notify
@@ -49,7 +49,7 @@
[card]
type = bthfp
name0 = startswith:"bluez_card"
-profile0 = droid_hfp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = $droid_card_profile
flags1 = disable_notify
@@ -57,7 +57,7 @@
[card]
type = bthfpforcall
name0 = startswith:"bluez_card"
-profile0 = droid_hfp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = voicecall
flags1 = disable_notify
@@ -65,7 +65,7 @@
[card]
type = bthfpforalien
name0 = startswith:"bluez_card"
-profile0 = droid_hfp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = communication
flags1 = disable_notify
@@ -141,30 +141,6 @@
name1 = startswith:"bluez_card"
profile1 = off
flags1 = disable_notify
-
-[card]
-type = earpiece
-name0 = equals:$droid_card
-profile0= voicecall
-name1 = startswith:"bluez_card"
-profile1 = off
-flags1 = disable_notify
-
-[card]
-type = earpieceforcall
-name0 = equals:$droid_card
-profile0= voicecall
-name1 = startswith:"bluez_card"
-profile1 = off
-flags1 = disable_notify
-
-[card]
-type = earpieceforalien
-name0 = equals:$droid_card
-profile0= communication
-name1 = startswith:"bluez_card"
-profile1 = off
-flags1 = disable_notify
[card]
type = ihfforcall
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-ham-0.0.9.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez5_earpiece.conf
^
|
| @@ -0,0 +1,23 @@
+[card]
+type = earpiece
+name0 = equals:$droid_card
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpieceforcall
+name0 = equals:$droid_card
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpieceforalien
+name0 = equals:$droid_card
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-ham-0.0.9.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/earpiece.conf
^
|
| @@ -0,0 +1,22 @@
+[device]
+type = earpieceandtvout
+sink = droid.output.primary@equals:"true"
+ports = droid.output.primary@equals:"true"->output-earpiece
+
+[device]
+type = earpieceforcall
+sink = droid.output.primary@equals:"true"
+ports = droid.output.primary@equals:"true"->output-earpiece
+flags = delayed_port_change
+delay = 200
+
+[device]
+type = earpiece
+sink = droid.output.primary@equals:"true"
+ports = droid.output.primary@equals:"true"->output-earpiece
+
+[device]
+type = earpieceforalien
+sink = droid.output.media_latency@equals:"true"
+ports = droid.output.primary@equals:"true"->output-earpiece
+flags = refresh_always
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-ham-0.0.9.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/fmradio.conf.disabled
^
|
| @@ -14,7 +14,7 @@
type = headphoneasfmradiolp
source= droid.input.external@equals:true
ports = droid.input.external@equals:true->$droid_source_input_fmradio
-module= module-loopback@sink_input_properties='media.role=x-maemo%20media.name=fmradio-loopback'%20latency_msec=250%20reset_on_attach=true
+module= module-loopback@sink_input_properties='media.role=x-maemo%20media.name=fmradio-loopback'%20source_output_properties='media.name=fmradio-loopback-source'%20latency_msec=250
flags = refresh_always, module_unload_immediately
[device]
@@ -27,9 +27,13 @@
type = headsetasfmradiolp
source= droid.input.external@equals:true
ports = droid.input.external@equals:true->$droid_source_input_fmradio
-module= module-loopback@sink_input_properties='media.role=x-maemo%20media.name=fmradio-loopback'%20latency_msec=250%20reset_on_attach=true
+module= module-loopback@sink_input_properties='media.role=x-maemo%20media.name=fmradio-loopback'%20source_output_properties='media.name=fmradio-loopback-source'%20latency_msec=250
flags = refresh_always, module_unload_immediately
[stream]
property = media.name@equals:"fmradio-loopback"
group = player
+
+[stream]
+property = media.name@equals:"fmradio-loopback-source"
+group = player
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-ham-0.0.9.tar.bz2/droid-configs-device/sparse/etc/zypp/systemCheck.d/ha.check
^
|
| @@ -1,5 +1,6 @@
-requires:droid-hal-@DEVICE@
requires:droid-config-@DEVICE@
+requires:droid-hal
+requires:droid-hal-img-boot
requires:droid-hal-version-@DEVICE@
requires:libhybris-libEGL
requires:libhybris-libGLESv2
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-ham-0.0.9.tar.bz2/droid-configs-device/sparse/lib/udev/rules.d/998-droid-system.rules
^
|
| @@ -10,6 +10,53 @@
SUBSYSTEM=="misc", KERNEL=="log_system", SYMLINK+="alog/system"
SUBSYSTEM=="misc", KERNEL=="log_main", SYMLINK+="alog/main"
-ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", IMPORT{program}="/bin/sh /lib/udev/platform-device $env{DEVPATH}", SYMLINK+="block/platform/$env{ANDROID_BLOCK_DEVICE}/by-name/$env{ID_PART_ENTRY_NAME}"
+# 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.
+
+# Pass collected (see below) information down to lower levels.
+SUBSYSTEM=="?*", ENV{PLATFORM_FOLDER}=="", IMPORT{parent}="PLATFORM_FOLDER"
+SUBSYSTEM=="?*", ENV{PLATFORM_DEVICE}=="", IMPORT{parent}="PLATFORM_DEVICE"
+# Collect information about the platform devices:
+# /sys/devices/platform/FOLDER
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", ENV{PLATFORM_FOLDER}="$kernel"
+# /sys/devices/platform/FOLDER/DEVICE
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", ENV{PLATFORM_DEVICE}="$kernel"
+# /sys/devices/FOLDER
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", ENV{PLATFORM_FOLDER}="$kernel"
+# /sys/devices/FOLDER/DEVICE
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", ENV{PLATFORM_DEVICE}="$kernel"
+
+# This will set up the bootdevice symlink, given that androidboot.bootdevice
+# is set on the commandline. If it is not given on the cmdline, android-init
+# will create the bootdevice (if the paths are correct, which they now should
+# be). If android-init doesn't create the bootdevice symlink and there is no
+# androidboot.bootdevice on the cmdline, then the bootdevice symlink is not
+# required.
+IMPORT{cmdline}="bootdevice"
+# Unfortunately we cannot compare two variables, therefore use a workaround
+# with a file.
+ENV{bootdevice}!="", RUN+="/bin/touch /tmp/udev-$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/mkdir -p /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/ln -s /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice} /dev/block/bootdevice"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/mkdir -p /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/ln -s /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice} /dev/block/bootdevice"
+# On certain devices the path is .../$PLATFORM_FOLDER/$PLATFORM_DEVICE/...,
+# but on others there is no $PLATFORM_DEVICE subdirectory, or in other words,
+# PLATFORM_FOLDER=platform device, PLATFORM_DEVICE=empty string. (1).
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/mkdir -p /dev/block/platform/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/ln -s /dev/block/platform/$env{bootdevice} /dev/block/bootdevice"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/mkdir -p /dev/block/platform/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/ln -s /dev/block/platform/$env{bootdevice} /dev/block/bootdevice"
+
+# Create the partition symlinks.
+ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/$env{PLATFORM_DEVICE}/by-name/$env{ID_PART_ENTRY_NAME}"
+ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/$env{PLATFORM_DEVICE}/by-num/p$env{ID_PART_ENTRY_NUMBER}"
+ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/$env{PLATFORM_DEVICE}/$name"
+
+# Backwards compatibility for old SailfishOS approach (might not be necessary)
+# NOTE: if the comment marked with (1) applies then this will not do anything.
+ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/by-name/$env{ID_PART_ENTRY_NAME}"
-ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", IMPORT{program}="/bin/sh /lib/udev/platform-device $env{DEVPATH}", SYMLINK+="block/bootdevice/by-name/$env{ID_PART_ENTRY_NAME}"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-ham-0.0.9.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-startup.sh
^
|
| @@ -13,5 +13,8 @@
# Save systemd notify socket name to let droid-init-done.sh pick it up later
echo $NOTIFY_SOCKET > /run/droid-hal/notify-socket-name
-exec /sbin/droid-hal-init
+# Use exec nohup since systemd may send SIGHUP, but droid-hal-init doesn't
+# handle it. This avoids having to modify android_system_core, which would
+# require different handling for every different android version.
+exec nohup /sbin/droid-hal-init
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-ham-0.0.9.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-ham-0.0.9.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
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-ham-0.0.9.tar.bz2/patterns/jolla-configuration-ham.yaml
^
|
| @@ -5,10 +5,11 @@
Name: jolla-configuration-ham
Requires:
- pattern:jolla-hw-adaptation-ham
-- pattern:jolla-sailfish-applications
-- pattern:jolla-ui-wayland
+
+- patterns-sailfish-applications
+- patterns-sailfish-ui
# For devices with cellular modem. Those without one, please comment out:
-- pattern:jolla-sailfish-cellular-apps
+- patterns-sailfish-cellular-apps
# Early stages of porting benefit from these:
- pattern:sailfish-porter-tools
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-ham-0.0.9.tar.bz2/patterns/jolla-hw-adaptation-ham.yaml
^
|
| @@ -69,7 +69,7 @@
- rfkill
# enable device lock and allow to select untrusted software
-- jolla-devicelock-plugin-encsfa
+- jolla-devicelock-daemon-encsfa
# For GPS
- geoclue-provider-hybris
@@ -78,6 +78,9 @@
#- qt5-qtmultimedia-plugin-mediaservice-irisradio
#- jolla-mediaplayer-radio
+# For devices with SD Card
+#- sd-utils
+
# Flashlight
- jolla-settings-system-flashlight
|
