|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/mlehtima/droid-config-fp2-sibon.git</param>
<param name="branch">master</param>
- <param name="revision">9ebd6f5d105a5db520c28c1d2bcd369f9faa23b1</param>
+ <param name="revision">2b2dc0307e83148c53ed8840ab0cd664c9f8a381</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.73.tar.bz2/droid-configs-device/helpers/process_patterns.sh
^
|
| @@ -1,41 +0,0 @@
-#!/bin/sh
-# create/update patterns in local repo
-# Copyright (c) 2014 Jolla Ltd.
-# Contact: Simonas Leleiva <simonas.leleiva@jollamobile.com>
-
-if [ ! -d hybris ]; then
- echo $0: launch this script from the $ANDROID_ROOT directory
- exit 1
-fi
-
-if [ -z $DEVICE ]; then
- echo 'Error: $DEVICE is undefined. Please run hadk'
- exit 1
-fi
-
-RPMPATH="$ANDROID_ROOT/droid-local-repo/$DEVICE/droid-configs"
-RPMPATTERN='*-patterns*.rpm'
-RPMFILE="$RPMPATH/$RPMPATTERN"
-RPMCOUNT=$(find $RPMPATH -type f -name $RPMPATTERN | wc -l)
-echo "checking for $RPMFILE..."
-if [ $RPMCOUNT -gt 1 ]; then
- echo 'Error: more than one patterns RPM found. Please leave only one version'
- exit 1
-elif [ $RPMCOUNT == 0 ]; then
- echo 'Error: no patterns RPM found'
- exit 1
-fi
-
-mkdir -p tmp/patterns
-cd tmp/patterns
-rpm2cpio $RPMFILE | cpio -uidv
-COUNT=$(find . -type f -name "*.xml" | wc -l)
-echo "<patterns count=\"$COUNT\">" > ../patterns.xml
-find . -type f -name "*.xml" -exec cat {} + >> ../patterns.xml
-echo "</patterns>" >> ../patterns.xml
-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
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.73.tar.bz2/droid-configs-device/patterns/common/sailfish-porter-tools.yaml
^
|
| @@ -1,6 +0,0 @@
-Description: Pattern with packages for common debugging tools used by porters
-Name: sailfish-porter-tools
-Requires:
-- patterns-sailfish-device-porter-tools
-
-Summary: Sailfish OS Porter Tools
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.73.tar.bz2/droid-configs-device/patterns/templates/jolla-configuration-@DEVICE@.yaml
^
|
| @@ -1,6 +0,0 @@
-Description: Pattern with packages for @DEVICE@ configurations
-Name: jolla-configuration-@DEVICE@
-Requires:
-- patterns-sailfish-device-configuration-@DEVICE@
-
-Summary: Jolla Configuration @DEVICE@
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.73.tar.bz2/droid-configs-device/sparse-10/etc/pulse/arm_droid_card_custom.pa
^
|
| @@ -1,2 +0,0 @@
-load-module module-droid-card rate=48000 quirks=+unload_call_exit
-load-module module-udev-detect
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.73.tar.bz2/droid-configs-device/sparse-10/etc/pulse/xpolicy.conf.d/usbaudio.conf
^
|
| -(symlink to usbaudio.conf.disabled)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.73.tar.bz2/droid-configs-device/sparse-10/etc/pulse/xpolicy.conf.d/voicecall.conf
^
|
| @@ -1,7 +0,0 @@
-# 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"
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.73.tar.bz2/droid-configs-device/sparse-10/etc/selinux/config
^
|
| @@ -1,3 +0,0 @@
-SELINUX=permissive
-SELINUXTYPE=minimum
-AUTORELABEL=1
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.73.tar.bz2/droid-configs-device/sparse-10/etc/selinux/minimum/contexts/dbus_contexts
^
|
| @@ -1,5 +0,0 @@
-<!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>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.73.tar.bz2/droid-configs-device/sparse-10/etc/selinux/minimum/contexts/files/file_contexts
^
|
| -(symlink to /vendor/etc/selinux/vendor_file_contexts)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.73.tar.bz2/droid-configs-device/sparse-10/etc/selinux/minimum/policy/policy.30
^
|
| -(symlink to /vendor/etc/selinux/precompiled_sepolicy)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.73.tar.bz2/droid-configs-device/sparse-10/usr/lib/qt5/plugins/feedback/droid-vibrator-device.ini
^
|
| @@ -1,13 +0,0 @@
-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
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.73.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/system/network.target.wants/wifisetup.service
^
|
| -(symlink to ../wifisetup.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.73.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/system/wifisetup.service
^
|
| @@ -1,12 +0,0 @@
-[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
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.73.tar.bz2/patterns/jolla-configuration-fp2-sibon.yaml
^
|
| @@ -1,7 +0,0 @@
-Description: Pattern with packages for fp2-sibon configurations
-Name: jolla-configuration-fp2-sibon
-Requires:
-- patterns-sailfish-device-configuration-fp2-sibon
-
-Summary: Jolla Configuration fp2-sibon
-
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.74.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -22,6 +22,7 @@
# Jolla Tablet: 1.5
# Nexus 5: 2.0
# Nexus 4: pixel_ratio=1.3 (then icon_res becomes 1.25)
+# packages_own_system: adaptation gets /system from rpm instead of device partition
# Overwriting other configs:
# If your droid-config-$DEVICE needs to provide one or more device-specific
@@ -49,7 +50,7 @@
# dcd_common is the common stuff and dcd_sparse is the common sparse
%define dcd_common %{dcd_path}/droid-configs-device
-%define dcd_sparse droid-configs-device/sparse
+%define dcd_sparse %{dcd_common}/sparse
# Set defaults if not defined already:
%if 0%{!?rpm_device:1}
@@ -59,12 +60,6 @@
%define rpm_vendor %{vendor}
%endif
-%if 0%{?android_version_major:1}
-# If defined also use android version specfic sparse
-# Supersedes the base sparse and is superseded by device specific sparse
-%define dcd_sparse_android_version_major droid-configs-device/sparse-%{android_version_major}
-%endif
-
%define board_mapping_dir %{_datadir}/ssu/board-mappings.d
%define board_mapping_file %{board_mapping_dir}/05-%{rpm_vendor}-%{rpm_device}.ini
@@ -82,7 +77,6 @@
Source0: %{name}-%{version}.tar.bz2
BuildRequires: ssu-kickstart-configuration
BuildRequires: pkgconfig(android-headers)
-BuildRequires: repomd-pattern-builder
BuildRequires: qt5-qttools-kmap2qmap
BuildRequires: sed
Requires: sed
@@ -121,15 +115,6 @@
%{summary}.
################################################################
-%package patterns
-Summary: Repository patterns for %{rpm_device} hw
-Provides: droid-config-patterns
-Provides: package-groups
-
-%description patterns
-%{summary}.
-
-################################################################
%package policy-settings
Summary: Policy settings for %{rpm_device} hw
Provides: droid-config-policy-settings
@@ -258,6 +243,8 @@
Obsoletes: bluez-configs-sailfish
Obsoletes: bluez-configs-mer
+Requires: pulseaudio-modules-bluez4
+
%description bluez4
%{summary}.
@@ -362,16 +349,23 @@
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() {
- files=$1
- deletelist=$2
- dorm=$3
+ local files=$1
+ local deletelist=$2
+ local dorm=$3
if [ -e $deletelist ]; then
egrep -v '^#|^$' $deletelist | (
while read file; do
- [ "x$dorm" == "x1" ] && rm $RPM_BUILD_ROOT/$file
- grep -vE "$file" $files > tmp/$$.files
- mv tmp/$$.files $files
+ delete_file $files $file $dorm
done)
fi
}
@@ -389,20 +383,25 @@
fi
}
-# Copy from common; erase any we don't want; overlay from device
-# specific sparse/ :
-copy_files_from %{dcd_path}/%{dcd_sparse}
-%if 0%{?dcd_sparse_android_version_major:1}
-copy_files_from %{dcd_path}/%{dcd_sparse_android_version_major}
-%endif
+# Copy from common; erase any we don't want; overlay from
+# android version-specific sparse (if exists), then
+# vendor (android version-specific) sparse (if exists), then
+# sparse for adaptation that package own /system (if applicable), then
+# device specific sparse:
+copy_files_from %{dcd_sparse}
delete_files tmp/droid-config.files delete_file.list 1
-copy_files_from %{dcd_path}/sparse
-%if 0%{?dcd_sparse_android_version_major:1}
-if [ -e droid-config-device/delete_file_android_version_major_%{android_version_major}.list ] ; then
- delete_files tmp/droid-config.files \
- droid-config-device/delete_file_android_version_major_%{android_version_major}.list
-fi
+%if 0%{?android_version_major:1}
+copy_files_from %{dcd_sparse}-%{android_version_major}
+delete_files tmp/droid-config.files \
+ %{dcd_common}/delete_file_sparse-%{android_version_major}.list 1
+copy_files_from %{dcd_sparse}-%{vendor}-%{android_version_major}
+delete_files tmp/droid-config.files \
+ %{dcd_common}/delete_file_sparse-vendor-%{android_version_major}.list 1
%endif
+%if 0%{?packages_own_system:1}
+copy_files_from %{dcd_sparse}-ownsystem
+%endif
+copy_files_from %{dcd_path}/sparse
delete_files tmp/droid-config.files delete_file_%{rpm_device}.list 1
# This add %config to %files section for files from rpm-config-files.files
config_files tmp/droid-config.files rpm-config-files.files
@@ -470,28 +469,13 @@
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
# which need some kind of substitution or generating
-# patterns
-mkdir -p %{buildroot}/usr/share/package-groups/
-/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
@@ -505,7 +489,6 @@
%define icon_res %(awk 'BEGIN {a=int((%{pixel_ratio}-0.125)/0.25)*0.25+0.25;a=(a<=1?"1.0":(a>=2.0?"2.0":a));print a }')
sed --in-place 's|@ICON_RES@|%{icon_res}|' %{buildroot}/etc/dconf/db/vendor.d/silica-configs.txt
-sed --in-place 's|@ICON_RES@|%{icon_res}|' %{buildroot}/usr/share/package-groups/*
# In localbuilds it will break the system, because droid-hal-version-$DEVICE is
# not built yet. Also it will pull many unnecessary things into the SDK target.
@@ -529,15 +512,19 @@
%endif
%if 0%{?community_adaptation:1}
-# 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
+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
%endif
%if 0%{!?lvm_root_size:1}
@@ -643,6 +630,15 @@
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}
@@ -658,18 +654,11 @@
%{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,-)
%{_datadir}/kickstarts/*.ks
-%files patterns
-%defattr(-,root,root,-)
-%{_datadir}/package-groups/*.xml
-
%files policy-settings -f tmp/policy-settings.files
%defattr(644,root,root,-)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.74.tar.bz2/droid-configs-device/helpers/migrate_patterns.sh
^
|
| @@ -76,22 +76,7 @@
while IFS= read -r f; do
if (echo "$f" | grep -q "^- pattern:\s*sailfish-porter-tools"); then
echo "Please replace '- pattern:sailfish-porter-tools' with:"
- echo "- patterns-sailfish-rnd"
- echo "# dev-tools pattern will be fixed in the next release"
- echo "# for now we'll use its 'exploded' version:"
- echo "#- patterns-sailfish-dev-tools"
- echo "- jolla-developer-mode"
- echo "- strace"
- echo "- gdb"
- echo "- gdb-gdbserver"
- echo "- vim-enhanced"
- echo "- less"
- echo "- valgrind"
- echo "- lipstick-qt5-tools"
- echo "- libhybris-tests"
- echo "- busybox-static"
- echo "- openssh-server"
- echo "- zypper"
+ echo "- patterns-sailfish-device-tools"
echo
echo "and re-run this script"
exit 1
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.74.tar.bz2/droid-configs-device/patterns/templates/patterns-sailfish-device-configuration-@DEVICE@.inc
^
|
| @@ -7,22 +7,7 @@
Requires: patterns-sailfish-cellular-apps
# Early stages of porting benefit from these:
-Requires: patterns-sailfish-rnd
-# dev-tools pattern will be fixed in the next release
-# for now we'll use its 'exploded' version:
-#Requires: patterns-sailfish-dev-tools
-Recommends: jolla-developer-mode
-Requires: strace
-Requires: gdb
-Requires: gdb-gdbserver
-Requires: vim-enhanced
-Requires: less
-Requires: valgrind
-Requires: lipstick-qt5-tools
-Requires: libhybris-tests
-Requires: busybox-static
-Requires: openssh-server
-Requires: zypper
+Requires: patterns-sailfish-device-tools
Requires: sailfish-content-graphics-z%{icon_res}
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.74.tar.bz2/droid-configs-device/sparse-10/etc/dconf/db/vendor.d/lipstick-configs.txt
^
|
| @@ -1,6 +1,3 @@
-[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-fp2-sibon-0.0.74.tar.bz2/droid-configs-device/sparse-10/etc/ofono/ril_subscription.conf
^
|
| @@ -5,11 +5,15 @@
#Identity=radio:radio
#3GLTEHandover=true
#SetRadioCapability=auto
-
SetRadioCapability=off
+
emptyPinQuery=true
radioPowerCycle=false
confirmRadioPowerOn=false
+useDataProfiles=true
+mmsDataProfileId=0
+allowDataReq=off
+umtsNetworkMode=0
[ril_0]
transport=binder:name=slot1
@@ -23,7 +27,6 @@
#technologies=all
#enable4G=true
#uiccWorkaround=true
-#allowDataReq=auto
#dataCallFormat=auto
#dataCallRetryLimit=4
#dataCallRetryDelay=200
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.74.tar.bz2/droid-configs-device/sparse-10/etc/sailfish-fpd/50-settings.ini
^
|
| @@ -7,7 +7,6 @@
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
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.74.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/user/lipstick.service.d/50-vendor.hwcomposer-2-3.conf
^
|
| @@ -1,3 +1,4 @@
[Service]
# make unlock ui exit
ExecStartPre=/usr/sbin/dummy_compositor
+ExecStopPost=/usr/bin/setprop ctl.restart vendor.hwcomposer-2-3
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.74.tar.bz2/droid-configs-device/sparse/boot/flash.sh
^
|
| @@ -0,0 +1,528 @@
+#!/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"
+ ;;
+ --config)
+ shift
+ FLASH_CONFIG="$1"
+ ;;
+ --help)
+ usage
+ exit 0
+ ;;
+ *)
+ echo "Unknown argument '$1'"
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+if [ ! -f "$FLASH_CONFIG" ]; then
+ echo "Configuration file ($FLASH_CONFIG) for flash script not found."
+ exit 1
+fi
+
+source "$FLASH_CONFIG"
+
+if [ ${#FLASH_OPS[@]} -eq 0 ]; then
+ echo "No flash operations defined in $FLASH_CONFIG"
+ exit 1
+fi
+
+UNAME=$(uname)
+
+# Do not need root for fastboot on Mac OS X
+if [ "$UNAME" != "Darwin" ] && [ "$(id -u)" -ne 0 ]; then
+ exec sudo -E bash -c "FORCE=$FORCE FASTBOOT_BIN_NAME=\"$FASTBOOT_BIN_NAME\" IMAGE_PATH=\"$IMAGE_PATH\" BLOB_PATH=\"$BLOB_PATH\" FASTBOOTEXTRAOPTS=\"$FASTBOOTEXTRAOPTS\" FLASH_CONFIG=\"$FLASH_CONFIG\" $0"
+fi
+
+
+case $UNAME in
+ Linux)
+ echo "Detected Linux"
+ ;;
+ Darwin)
+ IFS='.' read -r major minor patch <<< "$(sw_vers -productVersion)"
+ OS_VERSION=$major-$minor
+ echo "Detected Mac OS X - Version: $OS_VERSION"
+ ;;
+ FreeBSD)
+ FASTBOOT_BIN_PATH="/usr/local/bin/"
+ echo "Detected FreeBSD"
+ ;;
+ *)
+ echo "Failed to detect operating system!"
+ exit 1
+ ;;
+esac
+
+
+if [ -z "$FASTBOOT_BIN_NAME" ]; then
+ if ! check_fastboot "fastboot-$UNAME-$OS_VERSION" ; then
+ if ! check_fastboot "fastboot-$UNAME"; then
+ # In case we didn't provide functional fastboot binary to the system
+ # lets check that one is found from the system.
+ if ! which fastboot &>/dev/null; then
+ echo "No 'fastboot' found in \$PATH. To install, use:"
+ echo ""
+ echo " Debian/Ubuntu/.deb distros: apt-get install android-tools-fastboot"
+ echo " Fedora: yum install android-tools"
+ echo " OS X: brew install android-sdk"
+ echo " FreeBSD: pkg install android-tools-fastboot"
+ echo ""
+ exit 1
+ else
+ FASTBOOT_BIN_NAME=fastboot
+ fi
+ fi
+ fi
+fi
+
+if [ -z "$FLASHCMD_FLASH_BOOT" ]; then
+ ### Detect fastboot flash commands
+
+ # By default use "flash" for boot partition
+ FLASHCMD_FLASH_BOOT="flash"
+
+ # If running fastboot version 30 or newer, use flash:raw for boot
+ if ${FASTBOOT_BIN_PATH}${FASTBOOT_BIN_NAME} help 2>&1 | grep -q "flash:raw PARTITION"; then
+ FLASHCMD_FLASH_BOOT="flash:raw"
+ fi
+fi
+
+echo "Searching device to flash.."
+FASTBOOTCMD_NO_DEVICE="${FASTBOOT_BIN_PATH}${FASTBOOT_BIN_NAME}"
+
+FASTBOOT_DEVICES=$($FASTBOOTCMD_NO_DEVICE devices | awk '{ print $1 }' | tr $'\n' ' ')
+
+if [ -z "$FASTBOOT_DEVICES" ]; then
+ echo "No device that can be flashed found. Please connect your device in fastboot mode before running this script."
+ exit 1
+fi
+
+# Workaround for kickstart files until they are modified to not alter
+# flash.sh script directly.
+# If the valid product from flash-config.sh still contains @VALID_PRODUCTS@ placeholder,
+# assume this script is still being modified and set the product name here.
+# There are two variations of the modification, one uses DEVICE and other DEVICES
+# but both contain one or more of '-e "product_name"'
+for test_valid in "${VALID_PRODUCTS[@]}"; do
+ if [ "$test_valid" == "@VALID_PRODUCTS@" ]; then
+ old_IFS=$"$IFS"
+ IFS=" "
+ VALID_PRODUCTS=($(printf %s "@DEVICES@" | sed 's/-e //g'))
+ if [ "${VALID_PRODUCTS[0]}" == '@DEVICES@' ]; then
+ VALID_PRODUCTS=($(printf %s "@DEVICE@" | sed 's/-e //g'))
+ fi
+ IFS=$"$old_IFS"
+ break
+ fi
+done
+
+TARGET_SERIALNO=
+count=0
+for SERIALNO in $FASTBOOT_DEVICES; do
+ PRODUCT=$($FASTBOOTCMD_NO_DEVICE -s "$SERIALNO" getvar product 2>&1 | head -n1 | cut -d ' ' -f2)
+ BASEBAND=$($FASTBOOTCMD_NO_DEVICE -s "$SERIALNO" getvar version-baseband 2>&1 | head -n1 | cut -d ' ' -f2)
+ BOOTLOADER=$($FASTBOOTCMD_NO_DEVICE -s "$SERIALNO" getvar version-bootloader 2>&1 | head -n1 | cut -d ' ' -f2)
+
+ echo "Found $PRODUCT, serial:$SERIALNO, baseband:$BASEBAND, bootloader:$BOOTLOADER"
+
+ for VALID_PRODUCT in "${VALID_PRODUCTS[@]}"; do
+ if echo "$PRODUCT" | grep -qe "^$VALID_PRODUCT$"; then
+ TARGET_SERIALNO="$SERIALNO $TARGET_SERIALNO"
+ ((++count))
+ fi
+ done
+done
+TARGET_SERIALNO=${TARGET_SERIALNO%% }
+
+FASTBOOTCMD="${FASTBOOT_BIN_PATH}${FASTBOOT_BIN_NAME}"
+
+if [ -n "$FASTBOOTEXTRAOPTS" ]; then
+ echo "Fastboot extra options detected: $FASTBOOTEXTRAOPTS, let's ignore device count check."
+ FASTBOOTCMD="$FASTBOOTCMD $FASTBOOTEXTRAOPTS"
+elif [ $count -eq 0 ]; then
+ echo "No valid devices found."
+ exit 1
+elif [ $count -gt 1 ]; then
+ echo "More than one flashable device connected. Make sure there is exactly one device connected in fastboot mode."
+ exit 1
+else
+ echo "Found matching device with serial $TARGET_SERIALNO"
+ FASTBOOTCMD="$FASTBOOTCMD -s $TARGET_SERIALNO"
+fi
+
+echo "Fastboot command: $FASTBOOTCMD"
+
+if [ "$UNAME" = "Darwin" ] || [ "$UNAME" = "FreeBSD" ]; then
+ # macOS and FreeBSD don't have md5sum so lets use md5 there.
+ while read -r line; do
+ md5=$(echo "$line" | awk '{ print $1 }')
+ filename=$(echo "$line" | awk '{ print $2 }')
+ md5calc=$(md5 "$filename" | cut -d '=' -f2 | tr -d '[:space:]')
+ if [ "$md5" != "$md5calc" ]; then
+ if [ -n "$FORCE" ]; then
+ echo "Ignoring md5sum errors (--force)"
+ else
+ echo; echo "md5sum does not match on file $filename, please download the package again."
+ echo;
+ exit 1;
+ fi
+ fi
+ done < md5.lst
+else
+ if [ "$(md5sum -c md5.lst --status;echo $?)" -eq "1" ]; then
+ if [ -n "$FORCE" ]; then
+ echo "Ignoring md5sum errors (--force)"
+ else
+ echo; echo "md5sum does not match, please download the package again."
+ echo;
+ exit 1;
+ fi
+ fi
+fi
+
+#
+# flash ops
+#
+
+flash_image() {
+ local partition="$1"
+ local image_file="$2"
+ local exit_on_failure="$3"
+
+ if [ -n "$IMAGE_PATH" ]; then
+ image_file="$IMAGE_PATH/$image_file"
+ fi
+
+ if [ ! -e "$image_file" ]; then
+ echo "Image file '$image_file' not found."
+ exit 1
+ fi
+
+ if [ $DRY_RUN -eq 0 ]; then
+ local flashcmd="flash"
+ if [ "$partition" == "boot" ] || [ "$partition" == "boot_a" ] || [ "$partition" == "boot_b" ]; then
+ flashcmd=$FLASHCMD_FLASH_BOOT
+ fi
+
+ if [ "$exit_on_failure" -eq 1 ]; then
+ print_and_run "$FASTBOOTCMD" $flashcmd "$partition" "$image_file"
+ else
+ print_and_run_retry "$FASTBOOTCMD" $flashcmd "$partition" "$image_file"
+ fi
+ fi
+}
+
+flash_blob() {
+ local partition="$1"
+ local image_file="$2"
+
+ local b_path="$BLOB_PATH"
+ if [ -z "$b_path" ]; then
+ b_path="."
+ fi
+
+ local count=0
+
+ while IFS= read -r -d '' b; do
+ if [ $DRY_RUN -eq 0 ]; then
+ print_and_run "$FASTBOOTCMD" flash "$partition" "$b"
+ fi
+ ((++count))
+ done < <(find "$b_path" -maxdepth 1 -name "$image_file" -print0)
+
+ if [ $count -eq 0 ]; then
+ eval echo -e \"\$BLOB_ERROR_NOT_FOUND_$partition\"
+ exit 1
+ fi
+
+ if [ $count -gt 1 ]; then
+ eval echo -e \"\$BLOB_ERROR_TOO_MANY_$partition\"
+ exit 1
+ fi
+}
+
+getvar_test() {
+ local var_name="$1"
+ local getvar_fail="$2"
+
+ # Only test vars during dry run
+ if [ $DRY_RUN -eq 0 ]; then
+ return
+ fi
+
+ echo ">> $FASTBOOTCMD getvar $var_name"
+ local val
+ val="$($FASTBOOTCMD getvar "$var_name" 2>&1 | head -n1 | awk '{ print $2 }')"
+ echo "<< getvar $var_name: $val"
+
+ if [ "$val" == "$getvar_fail" ]; then
+ eval echo -e \"\$GETVAR_ERROR_$var_name\"
+ exit 1
+ fi
+}
+
+run_flash_op() {
+ local op="$1"
+ local arg1="$2"
+ local arg2="$3"
+
+ case "$op" in
+ flash)
+ flash_image "$arg1" "$arg2" 1
+ ;;
+
+ flash_dont_fail)
+ flash_image "$arg1" "$arg2" 0
+ ;;
+
+ flash_blob)
+ flash_blob "$arg1" "$arg2"
+ ;;
+
+ getvar_fail_if)
+ getvar_test "$arg1" "$arg2"
+ ;;
+
+ run)
+ if [ $DRY_RUN -eq 0 ]; then
+ case "$arg1" in
+ fastboot)
+ shift
+ shift
+ print_and_run "$FASTBOOTCMD" "$@"
+ ;;
+
+ *)
+ shift
+ shift
+ print_and_run "$arg1" "$@"
+ ;;
+ esac
+ fi
+ ;;
+
+ *)
+ echo "Unknown flash operation '$op'"
+ exit 1
+ ;;
+ esac
+}
+
+run_flash_ops() {
+ for flash_op in "${FLASH_OPS[@]}"; do
+ read var_op var_arg1 var_arg2 <<< "$flash_op"
+ run_flash_op "$var_op" "$var_arg1" "$var_arg2"
+ done
+}
+
+DRY_RUN=1
+run_flash_ops
+DRY_RUN=0
+run_flash_ops
+
+echo
+echo "Flashing completed."
+
+if [ -n "$FLASH_COMPLETED_MESSAGE" ]; then
+ echo -e "$FLASH_COMPLETED_MESSAGE"
+fi
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.74.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
+load-module module-meego-mainvolume virtual_stream=true unmute_delay=600
### Automatically restore the volume of streams
# load configuration based on bluez version
@@ -130,7 +130,8 @@
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=source.null
+### 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
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.74.tar.bz2/patterns/patterns-sailfish-device-configuration-fp2-sibon.inc
^
|
| @@ -5,23 +5,9 @@
# For devices with cellular modem. Those without one, please comment out:
Requires: patterns-sailfish-cellular-apps
+
# Early stages of porting benefit from these:
-Requires: patterns-sailfish-rnd
-# dev-tools pattern will be fixed in the next release
-# for now we'll use its 'exploded' version:
-#Requires: patterns-sailfish-dev-tools
-Recommends: jolla-developer-mode
-Requires: strace
-Requires: gdb
-Requires: gdb-gdbserver
-Requires: vim-enhanced
-Requires: less
-Requires: valgrind
-Requires: lipstick-qt5-tools
-Requires: libhybris-tests
-Requires: busybox-static
-Requires: openssh-server
-Requires: zypper
+Requires: patterns-sailfish-device-tools
# jolla-rnd-device will enable usb-moded even when UI is not yet
# brought up (useful during development, available since update10)
|
