Changes - SailfishOS Open Build Service

Changes of Revision 13

[-] [+]	Changed	_service:tar_git:droid-config-armani.changes
@@ -1,3 +1,7 @@ +* Fri Jul 07 2017 Litew <litew9@gmail.com> - 0.0.4 +- [dcd] Update link for submodule +- [dcd] Update submodule link + * Fri Mar 03 2017 Litew <litew9@gmail.com> - 0.0.1 - [dcd] Update link to submodule - [dcd] Update subproject link
[-] [+]	Changed	_service:tar_git:droid-config-armani.spec ^
@@ -83,7 +83,7 @@ Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 0.0.3 +Version: 0.0.4 Release: 1 Group: Configs License: GPLv2 @@ -217,7 +217,7 @@ Provides: droid-config-flashing Group: System # Sparse image flashing support for flash-partition -Requires: droid-hal-%{rpm_device}-tools +Requires: droid-hal-tools Summary: On device flashing files for %{rpm_device} hw %description flashing
[-] [+]	Changed	_service ^
@@ -6,7 +6,7 @@ <service name="tar_git"> <param name="url">https://github.com/Litew/droid-config-armani.git</param> <param name="branch">master</param> - <param name="revision"/> + <param name="revision">HEAD</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Deleted	_service:tar_git:droid-config-armani-0.0.3.tar.bz2/droid-configs-device/sparse/usr/bin/droid/kill-cgroup.sh ^
@@ -1,74 +0,0 @@ -#!/bin/sh -# Contact: Pekka Lundstrom <pekka.lundstrom@jollamobile.com> -# -# Copyright (c) 2013, Jolla Ltd. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of the <organization> nor the -# names of its contributors may be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -# Kill all processes that are in this same cgroup ($1) -[ -z "$1" ] && echo "Need cgroup path" && exit 1 -CGROUP=$1 -[ ! -f /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs ] && echo "No such cgroup: $1" && exit 1 - -get_pids() { - # Get list of running pids in this cgroup - # return list $PIDS and $NUM_PIDS - PIDS=$(cat /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs) - NUM_PIDS=$(echo $PIDS \| wc -w) -} - -kill_pids() { - # Kill pids using signal $1 - for pid in $PIDS; do - [ -d /proc/$pid ] && kill -$1 $pid - done -} - -# ============== main() =============== - -get_pids -PREV_NUM_PIDS=$NUM_PIDS -kill_pids TERM -sleep 1 -WAIT=1 -get_pids -MAX_WAIT=5 -while [ $NUM_PIDS -gt 0 -a $WAIT -lt $MAX_WAIT ]; do - if [ $NUM_PIDS -lt $PREV_NUM_PIDS ]; then - # Number of running processes is getting smaller - # Wait a little bit more - sleep 1 - else - # Number of pids is not gettting smaller - break - fi - let WAIT=$WAIT+1 - PREV_NUM_PIDS=$NUM_PIDS - get_pids -done -# If anyone left, hard kill them all -[ $NUM_PIDS -gt 0 ] && kill_pids KILL -exit 0 -
[-] [+]	Deleted	_service:tar_git:droid-config-armani-0.0.3.tar.bz2/sparse/lib/systemd/system/external_sd.mount ^
@@ -1,13 +0,0 @@ -[Unit] -Description=Mount for Android in /external_sd -Before=local-fs.target systemd-modules-load.service - -[Mount] -What=/dev/mmcblk1p1 -Where=/external_sd -Type=vfat -Options=rw,uid=100000,gid=100000,dirsync,noatime,users,utf8,flush,discard -TimeoutSec=5 - -[Install] -WantedBy=local-fs.target
[-] [+]	Deleted	_service:tar_git:droid-config-armani-0.0.3.tar.bz2/sparse/lib/systemd/system/local-fs.target.wants/external_sd.mount ^
-(symlink to ../external_sd.mount)
[-] [+]	Deleted	_service:tar_git:droid-config-armani-0.0.3.tar.bz2/sparse/lib/udev/rules.d/999-extra-rules.rules ^
@@ -1 +0,0 @@ -KERNEL=="hw_random", NAME="hwrng", SYMLINK+="%k" MODE="0660"
[-] [+]	Changed	_service:tar_git:droid-config-armani-0.0.4.tar.bz2/droid-configs-device/droid-configs.inc ^
@@ -203,7 +203,7 @@ Provides: droid-config-flashing Group: System # Sparse image flashing support for flash-partition -Requires: droid-hal-%{rpm_device}-tools +Requires: droid-hal-tools Summary: On device flashing files for %{rpm_device} hw %description flashing
[-] [+]	Changed	_service:tar_git:droid-config-armani-0.0.4.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa ^
@@ -29,7 +29,14 @@ load-module module-meego-mainvolume virtual_stream=true ### Automatically restore the volume of streams -load-module module-stream-restore-nemo restore_device=no restore_volume=yes restore_muted=no route_table=/etc/pulse/x-maemo-route.table fallback_table=/etc/pulse/x-maemo-stream-restore.table use_voice=false sink_volume_table=/etc/pulse/x-maemo-sink-volume.table +# load configuration based on bluez version +.ifexists /etc/pulse/bluez4_stream_restore.pa +.include /etc/pulse/bluez4_stream_restore.pa +.endif + +.ifexists /etc/pulse/bluez5_stream_restore.pa +.include /etc/pulse/bluez5_stream_restore.pa +.endif load-module module-match table=/etc/pulse/x-maemo-match.table key=application.name @@ -50,6 +57,8 @@ load-module module-null-source source_name=source.fake.sco rate=8000 channels=1 load-module module-bluez4-discover sco_sink=sink.fake.sco sco_source=source.fake.sco +load-module module-combine-sink sink_name=sink.primaryandbluez resample_method=trivial rate=48000 channels=2 ignore=sink.low_latency + load-module module-policy-enforcement load-module module-role-ducking trigger_roles=alarm,notification,warning ducking_roles=x-maemo volume=-200dB @@ -104,7 +113,7 @@ load-module module-dbus-protocol .endif -load-module module-switch-on-port-available +load-module module-rescue-streams sink_name=sink.null source_name=sink.null.monitor ### Make some devices default set-default-sink sink.primary
[-] [+]	Added	_service:tar_git:droid-config-armani-0.0.4.tar.bz2/droid-configs-device/sparse/etc/pulse/bluez4_stream_restore.pa ^
@@ -0,0 +1,2 @@ +### Bluez4 specific module arguments +load-module module-stream-restore-nemo restore_device=no restore_volume=yes restore_muted=no route_table=/etc/pulse/x-maemo-route.table fallback_table=/etc/pulse/x-maemo-stream-restore.table use_voice=false sink_volume_table=/etc/pulse/x-maemo-sink-volume.table
[-] [+]	Added	_service:tar_git:droid-config-armani-0.0.4.tar.bz2/droid-configs-device/sparse/etc/pulse/bluez5_stream_restore.pa ^
@@ -0,0 +1,2 @@ +### Bluez5 specific module arguments +load-module module-stream-restore-nemo restore_device=no restore_volume=yes restore_muted=no route_table=/etc/pulse/x-maemo-route.table fallback_table=/etc/pulse/x-maemo-stream-restore.table use_voice=false
[-] [+]	Changed	_service:tar_git:droid-config-armani-0.0.4.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf ^
@@ -266,6 +266,11 @@ profile = voicecall [card] +type = earpieceforcall +name = equals:droid_card.primary +profile = voicecall + +[card] type = earpieceforalien name = equals:droid_card.primary profile = communication @@ -439,6 +444,11 @@ sink = equals:sink.primary ports = sink.primary:output-earpiece +[device] +type = earpieceforcall +sink = equals:sink.primary +ports = sink.primary:output-earpiece + [device] type = earpieceforalien sink = equals:sink.primary
[-] [+]	Added	_service:tar_git:droid-config-armani-0.0.4.tar.bz2/droid-configs-device/sparse/etc/xdg/QtProject/QtQuick2.conf ^
@@ -0,0 +1,2 @@ +[QuickMouseArea] +PressAndHoldDelay=600
[-] [+]	Changed	_service:tar_git:droid-config-armani-0.0.4.tar.bz2/droid-configs-device/sparse/lib/systemd/system/adbd.service ^
@@ -7,3 +7,4 @@ [Service] Environment=PATH=/sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin ExecStart=/sbin/adbd +Restart=always
[-] [+]	Changed	_service:tar_git:droid-config-armani-0.0.4.tar.bz2/droid-configs-device/sparse/lib/systemd/system/droid-hal-init.service ^
@@ -13,7 +13,7 @@ Type=notify NotifyAccess=all ExecStart=/bin/sh /usr/bin/droid/droid-hal-startup.sh -ExecStop=/usr/bin/droid/kill-cgroup.sh %c +ExecStop=/bin/sh /usr/bin/droid/droid-hal-shutdown.sh Restart=always # Lets make sure we don't block minutes in case of errors. TimeoutSec=15
[-] [+]	Changed	_service:tar_git:droid-config-armani-0.0.4.tar.bz2/droid-configs-device/sparse/lib/udev/rules.d/998-droid-system.rules ^
@@ -11,3 +11,5 @@ 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}" + +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}"
[-] [+]	Added	_service:tar_git:droid-config-armani-0.0.4.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-shutdown.sh ^
@@ -0,0 +1,81 @@ +#!/bin/sh +# Contact: Pekka Lundstrom <pekka.lundstrom@jollamobile.com> +# +# Copyright (c) 2013, Jolla Ltd. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of the <organization> nor the +# names of its contributors may be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# The following should be in /init.rc, so init will shut everything down: +# on property:hybris.shutdown=* +# class_stop late_start +# class_stop main +# class_stop core + +# Kill all processes that are in this same cgroup ($1) +[ -z "$1" ] && echo "Need cgroup path" && exit 1 +CGROUP=$1 +[ ! -f /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs ] && echo "No such cgroup: $1" && exit 1 + +get_pids() { + # Get list of running pids in this cgroup + # return list $PIDS and $NUM_PIDS + PIDS=$(cat /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs) + NUM_PIDS=$(echo $PIDS \| wc -w) + echo Android service PIDs remaining: $NUM_PIDS +} + +# ============== main() =============== + +get_pids +PREV_NUM_PIDS=$NUM_PIDS +# This android property is supposed to ensure a shutdown if system-server crashes +# We don't use it, but some init scripts watch for it as a signal to shut other things down +/usr/bin/setprop sys.shutdown.requested 1 + +echo Shutting down droid-hal-init services +/usr/bin/setprop hybris.shutdown 1 + +sleep 1 +WAIT=1 +get_pids +MAX_WAIT=5 +while [ $NUM_PIDS -gt 0 -a $WAIT -lt $MAX_WAIT ]; do + if [ $NUM_PIDS -lt $PREV_NUM_PIDS ]; then + # Number of running processes is getting smaller + # Wait a little bit more + sleep 1 + else + # Number of pids is not gettting smaller + break + fi + let WAIT=$WAIT+1 + PREV_NUM_PIDS=$NUM_PIDS + get_pids +done + +echo All done. Killing droid-hal-init +killall droid-hal-init + +exit 0 +
[-] [+]	Changed	_service:tar_git:droid-config-armani-0.0.4.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/btmono ^
@@ -1,2 +1,2 @@ -x-nemo.mainvolume.call = "0:-20000,1:-6175,2:-4875,3:-4225,4:-3625,5:-3025,6:-2425,7:-1815,8:-1625,9:-1200,10:-1025,11:-700,12:-575,13:-450,14:-225,15:0" +x-nemo.mainvolume.call = "0:-20000,1:-6175,2:-4875,3:-3625,4:-3025,5:-2425,6:-2025,7:-1815,8:-1625,9:-1200,10:-1025,11:-700,12:-575,13:-250,14:-125,15:0" x-nemo.mainvolume.media = "0:-20000,1:-6175,2:-4875,3:-4225,4:-3625,5:-3025,6:-2425,7:-1815,8:-1625,9:-1200,10:-1025,11:-700,12:-575,13:-450,14:-225,15:0"
[-] [+]	Changed	_service:tar_git:droid-config-armani-0.0.4.tar.bz2/sparse/lib/udev/rules.d/998-droid-system.rules ^
@@ -10,4 +10,7 @@ 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}" +
[-] [+]	Changed	_service:tar_git:droid-config-armani-0.0.4.tar.bz2/sparse/lib/udev/rules.d/999-droid-vidc.rules ^
@@ -1,8 +1,3 @@ -KERNEL=="video32", MODE="0660", GROUP="audio", OWNER="system" -KERNEL=="video33", MODE="0660", GROUP="audio", OWNER="system" -KERNEL=="video34", MODE="0660", GROUP="audio", OWNER="system" -KERNEL=="video35", MODE="0660", GROUP="audio", OWNER="system" - KERNEL=="video32", SYMLINK+="video/venus_dec" KERNEL=="video33", SYMLINK+="video/venus_enc" KERNEL=="video34", SYMLINK+="video/q6_dec"