[-]
[+]
|
Changed |
_service:tar_git:droid-config-moto_msm8960_jbbl.spec
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/elros34/droid-config-moto_msm8960_jbbl.git</param>
<param name="branch">master</param>
- <param name="revision">HEAD</param>
+ <param name="revision">0a0501683748a3f13e804bb8e08e5358c6eeb98f</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/droid-configs.inc
^
|
@@ -258,8 +258,6 @@
Obsoletes: bluez-configs-sailfish
Obsoletes: bluez-configs-mer
-Requires: pulseaudio-modules-bluez4
-
%description bluez4
%{summary}.
@@ -364,23 +362,16 @@
fi
}
-delete_file() {
- local files=$1
- local file=$2
- local dorm=$3
- [ "x$dorm" == "x1" ] && rm $RPM_BUILD_ROOT/$file
- grep -vE "$file" $files > tmp/$$.files
- mv tmp/$$.files $files
-}
-
delete_files() {
- local files=$1
- local deletelist=$2
- local dorm=$3
+ files=$1
+ deletelist=$2
+ dorm=$3
if [ -e $deletelist ]; then
egrep -v '^#|^$' $deletelist | (
while read file; do
- delete_file $files $file $dorm
+ [ "x$dorm" == "x1" ] && rm $RPM_BUILD_ROOT/$file
+ grep -vE "$file" $files > tmp/$$.files
+ mv tmp/$$.files $files
done)
fi
}
@@ -479,8 +470,6 @@
delete_files tmp/droid-config.files out-of-image-files.files 0
cp out-of-image-files.files tmp/out-of-image-files.files
fi
-%else
- delete_file tmp/droid-config.files /boot/flash.sh 1
%endif
# Now the majority of the sparse tree is made we can handle configs
@@ -540,19 +529,15 @@
%endif
%if 0%{?community_adaptation:1}
-if [ ! "$(ls -A %{dcd_path}/sparse/%{_datadir}/ssu/repos.d 2> /dev/null)" ]; then
- # Community ports that do not override repos in ssu/repos.d are catered by
- # the community-adaptation package.
- # Prevent the default adaptation0 from being created:
- sed --in-place '/adaptation-repos=/d' $RPM_BUILD_ROOT/%{board_mapping_dir}/*.ini
- # Make a separate adaptation repo for community:
- mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/
- sed -e 's|@DEVICE@|%{rpm_device}|g' \
- -e 's|@VENDOR@|%{rpm_vendor}|g' \
- %{_datadir}/community-adaptation/adaptation-community.ini.in \
- >$RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/adaptation-community.ini
- echo "%{_datadir}/ssu/features.d/adaptation-community.ini" >> tmp/droid-config.files
-fi
+# Community ports have their adaptation repos on http://build.merproject.org
+# Until we figure out how ssu works, we'll prevent the default adaptation0 from being created...
+sed --in-place '/adaptation-repos=/d' $RPM_BUILD_ROOT/%{board_mapping_dir}/*.ini
+# ...and make a separate adaptation repo for community:
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/
+sed -e 's|@DEVICE@|%{rpm_device}|g' \
+ -e 's|@VENDOR@|%{rpm_vendor}|g' \
+ %{_datadir}/community-adaptation/adaptation-community.ini.in \
+ >$RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/adaptation-community.ini
%endif
%if 0%{!?lvm_root_size:1}
@@ -658,15 +643,6 @@
touch %{board_mapping_dir}/* &> /dev/null || :
touch %{_datadir}/ssu/features.d/* &> /dev/null || :
-%if 0%{?community_adaptation:1}
-if [ "$(find /%{_datadir}/ssu/repos.d -maxdepth 1 -type f -not -name 10-jolla.ini 2> /dev/null)" ] \
- && ssu lr | grep -q adaptation-community; then
- # Switching to a self-hosted removes adaptation-community*.ini files
- # but those feature repos will still exist until we clear its cache:
- rm -f /var/cache/ssu/features.ini
-fi
-%endif
-
# To add additional post scripts, one can define those as part
# of additional_post_scripts macro.
%{?additional_post_scripts}
@@ -682,6 +658,9 @@
%{board_mapping_file}
%endif
%{_datadir}/qt5/keymaps/droid.qmap
+%if 0%{?community_adaptation:1}
+%{_datadir}/ssu/features.d/adaptation-community.ini
+%endif
%files ssu-kickstarts
%defattr(-,root,root,-)
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/sparse-10/etc/dconf/db/vendor.d/lipstick-configs.txt
^
|
@@ -1,3 +1,6 @@
+[desktop/lipstick-jolla-home]
+reboot_warning_on_sim_remove=true
+
[desktop/lipstick-jolla-home/peekfilter]
boundaryWidth=48
pressDelay=800
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/sparse-10/etc/ofono/ril_subscription.conf
^
|
@@ -5,15 +5,11 @@
#Identity=radio:radio
#3GLTEHandover=true
#SetRadioCapability=auto
-SetRadioCapability=off
+SetRadioCapability=off
emptyPinQuery=true
radioPowerCycle=false
confirmRadioPowerOn=false
-useDataProfiles=true
-mmsDataProfileId=0
-allowDataReq=off
-umtsNetworkMode=0
[ril_0]
transport=binder:name=slot1
@@ -27,6 +23,7 @@
#technologies=all
#enable4G=true
#uiccWorkaround=true
+#allowDataReq=auto
#dataCallFormat=auto
#dataCallRetryLimit=4
#dataCallRetryDelay=200
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/sparse-10/etc/pulse/arm_droid_card_custom.pa
^
|
@@ -0,0 +1,2 @@
+load-module module-droid-card rate=48000 quirks=+unload_call_exit
+load-module module-udev-detect
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/sparse-10/etc/pulse/xpolicy.conf.d/usbaudio.conf
^
|
+(symlink to usbaudio.conf.disabled)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/sparse-10/etc/pulse/xpolicy.conf.d/voicecall.conf
^
|
@@ -0,0 +1,7 @@
+# We cannot use input-voice_call port even though
+# it is available, as this results in broken audio.
+# Using whatever normal ports with correct audio
+# source works, so don't do port change.
+[device]
+type = voicecall
+source = droid.input.external@equals:"true"
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/sparse-10/etc/sailfish-fpd/50-settings.ini
^
|
@@ -7,6 +7,7 @@
mass_remove_single_notify_quirk = 0
set_active_group_twice_quirk = 0
+set_active_group_always_quirk = 1
skip_post_enroll_quirk = 0
skip_enumerate_quirk = 0
no_cancel_notification_quirk = 0
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/sparse-10/etc/selinux/config
^
|
@@ -0,0 +1,3 @@
+SELINUX=permissive
+SELINUXTYPE=minimum
+AUTORELABEL=1
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/sparse-10/etc/selinux/minimum/contexts/dbus_contexts
^
|
@@ -0,0 +1,5 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+<selinux>
+</selinux>
+</busconfig>
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/sparse-10/etc/selinux/minimum/contexts/files/file_contexts
^
|
+(symlink to /vendor/etc/selinux/vendor_file_contexts)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/sparse-10/etc/selinux/minimum/policy/policy.30
^
|
+(symlink to /vendor/etc/selinux/precompiled_sepolicy)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/sparse-10/usr/lib/qt5/plugins/feedback/droid-vibrator-device.ini
^
|
@@ -0,0 +1,13 @@
+Press = 35
+Release = 33
+PressWeak = 25
+ReleaseWeak = 22
+PressStrong = 45
+ReleaseStrong = 40
+DragStart = 20
+DragDropInZone = 30
+DragDropOutOfZone = 23
+DragCrossBoundary = 25
+Appear = 0
+Disappear = 0
+Move = 0
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/system/network.target.wants/wifisetup.service
^
|
+(symlink to ../wifisetup.service)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/system/wifisetup.service
^
|
@@ -0,0 +1,12 @@
+[Unit]
+Description=wifisetup
+After=droid-hal-init.service
+Before=connman.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/sh -c "echo 1 > /sys/kernel/boot_wlan/boot_wlan"
+
+[Install]
+WantedBy=network.target
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
@@ -52,7 +52,7 @@
.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 unmute_delay=600
+load-module module-meego-mainvolume virtual_stream=true
### Automatically restore the volume of streams
# load configuration based on bluez version
@@ -130,8 +130,7 @@
load-module module-dbus-protocol
.endif
-### Set default sink and source to sink.null and source.null, respectively. PulseAudio default
-### sink/source handling will move orphaned sink-inputs and source-outputs to default ones.
-### Policy enforcement module then moves the streams to new appropriate sinks or sources.
-set-default-sink sink.null
-set-default-source source.null
+### 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=source.null
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/patterns/patterns-sailfish-device-adaptation-moto_msm8960_jbbl.inc
^
|
@@ -76,26 +76,27 @@
#Requires: jolla-mediaplayer-radio
# NFC
-Recommends: nfcd-pn54x-plugin
-Recommends: nfcd-mce-plugin
+Requires: nfcd-pn54x-plugin
+Requires: nfcd-mce-plugin
# No device reset
Provides: jolla-settings-system-reset
# Tools
Requires: mce-tools
-Recommends: systemd-analyze
-Recommends: gstreamer1.0-droid-tools
+Requires: systemd-analyze
+Requires: gstreamer1.0-droid-tools
Requires: gstreamer1.0-tools
Requires: photonq-helper
-Recommends: harbour-storeman
+Requires: harbour-storeman
Requires: patch
-Recommends: harbour-messwerk
+Requires: harbour-messwerk
Requires: qt5-qtdeclarative-qmlscene
Requires: connman-tools
Requires: ncurses
Requires: rsync
-Recommends: nfcd-tools
+Requires: nfcd-tools
+Requires: csd
# For mounting SD card automatically
Requires: udisks2
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210426105342.0a05016.tar.bz2/patterns/patterns-sailfish-device-configuration-moto_msm8960_jbbl.inc
^
|
@@ -48,17 +48,17 @@
# needs some configuration to get all features working
Requires: jolla-settings-system-flashlight
-Recommends: jolla-settings-system-nfc
+Requires: jolla-settings-system-nfc
# Pre-installed applications
Requires: sailfish-office
Requires: jolla-calculator
Requires: jolla-email
-Recommends: jolla-notes
+Requires: jolla-notes
Requires: jolla-clock
-Recommends: jolla-mediaplayer
+Requires: jolla-mediaplayer
Requires: jolla-calendar
-Recommends: sailfish-weather
+Requires: sailfish-weather
%description -n patterns-sailfish-device-configuration-moto_msm8960_jbbl
Pattern with packages for moto_msm8960_jbbl configurations
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210611122407.977dc0c.tar.bz2/droid-configs-device/sparse/boot/flash.sh
^
|
@@ -1,528 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (c) 2021, 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.
-
-
-# Flash operations:
-#
-# getvar_fail_if <variable-name> <variable-value>
-# If variable-name equals variable-value abort flashing
-# Custom error message can be set in GETVAR_ERROR_<variable-name>
-#
-# flash <partition> <image>
-# Flash image to partition
-#
-# flash_dont_fail <partition> <image>
-# Try to flash image to partition but retry 30 times before giving up,
-# sleep 1 second between retries
-#
-# flash_blob <partition> <image>
-# Flash extra blob image to partition. This is a bit different from
-# regular flash operation, as image part can contain wildcards and
-# custom error messages can be set for not existing or too many files
-# in BLOB_ERROR_NOT_FOUND_<partition> and BLOB_ERROR_TOO_MANY_<partition>
-# variables, respectively.
-#
-# run <commands>
-# Run arbitrary commands, for example run sleep 5
-#
-# run fastboot <commands>
-# Run arbitrary fastboot commands
-#
-#
-#
-# Example flash-config.sh:
-#
-# VALID_PRODUCTS=(
-# "product-name"
-# )
-#
-# FLASH_OPS=(
-# "getvar_fail_if secure yes"
-# "run fastboot reboot-bootloader
-# "run fastboot erase foo
-# "run sleep 2"
-# "flash_dont_fail partition partition.bin"
-# "flash boot_a hybris-boot.img"
-# "flash boot_b hybris-boot.img"
-# "flash dtbo_a dtbo.img"
-# "flash dtbo_b dtbo.img"
-# "flash userdata userdata.img001"
-# "flash_blob oem_a *_vendor_image.img"
-# )
-#
-# GETVAR_ERROR_secure="
-# Error to display if variable secure has value yes
-# "
-#
-# BLOB_ERROR_NOT_FOUND_oem_a="
-# Error to display if vendor blob is not found.
-# "
-#
-# BLOB_ERROR_TOO_MANY_oem_a="
-# Error to display if more than one matching blob is found when using wildcards
-# "
-#
-# FLASH_COMPLETED_MESSAGE="
-# Message to show with successful flashing.
-# "
-
-SCRIPT_VERSION=1.0
-
-OS_VERSION=
-FASTBOOT_BIN_PATH=
-# Detect from fastboot command
-FLASHCMD_FLASH_BOOT=
-
-DRY_RUN=1
-
-if [ -z "$FLASH_CONFIG" ]; then
- FLASH_CONFIG="./flash-config.sh"
-fi
-
-check_fastboot() {
- FASTBOOT_BIN_NAME=$1
- if [ -f "$FASTBOOT_BIN_NAME" ]; then
- chmod 755 "$FASTBOOT_BIN_NAME"
- # Ensure that the binary that is found can be executed fine
- if ./"$FASTBOOT_BIN_NAME" help &>/dev/null; then
- FASTBOOT_BIN_PATH="./"
- return 0
- fi
- fi
- return 1
-}
-
-print_and_run() {
- # shellcheck disable=SC2145
- echo ">> $@"
-
- # shellcheck disable=SC2068
- $@
- local ret=$?
-
- if [ $ret -ne 0 ]; then
- echo "Flashing failed ($ret)"
- exit $ret
- fi
-}
-
-print_and_run_retry() {
- # shellcheck disable=SC2145
- echo ">> $@"
-
- local retries=30
- local ret=1
- while [ $ret -ne 0 ]; do
- # shellcheck disable=SC2068
- $@
- ret=$?
-
- if [ $ret -ne 0 ]; then
- if [ $retries -eq 0 ]; then
- echo "Retry limit reached, flashing failed ($ret)"
- exit 1
- fi
-
- sleep 1
- fi
-
- ((--retries))
- done
-}
-
-usage() {
- cat <<EOF
-Flash utility v$SCRIPT_VERSION
-
-This script uses either flash-config.sh from the directory where the
-script is ran or defined by --config.
-
-Options
- --help This help
- --force Don't abort if md5sums of files don't match
- --fastboot Location of fastboot binary to use
- --image-path Where regular image files are located
- --blob-path Where possible vendor specific image files are located
- --extra-opts Custom extra options for fastboot
- --config Specify location for flash ops
-
-EOF
-}
-
-#
-# Command line arguments
-#
-
-while [ $# -gt 0 ]; do
- case $1 in
- --force)
- FORCE=1
- ;;
- --fastboot)
- shift
- FASTBOOT_BIN_NAME="$1"
- ;;
- --image-path)
- shift
- IMAGE_PATH="$1"
- ;;
- --blob-path)
- shift
- BLOB_PATH="$1"
- ;;
- --extra-opts)
- shift
- FASTBOOTEXTRAOPTS="$1"
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-moto_msm8960_jbbl-1+master.20210611122407.977dc0c.tar.bz2/sparse/etc/bluez4/bluetooth/audio.conf
^
|
@@ -1,63 +0,0 @@
-# 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=Hal
-
-# 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
|