[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil.spec
^
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.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-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.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-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.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-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.tar.bz2/droid-configs-device/sparse-10/var/lib/environment/compositor/droid-hal-device.conf
^
|
@@ -1,5 +0,0 @@
-EGL_PLATFORM=hwcomposer
-QT_QPA_PLATFORM=hwcomposer
-
-LIPSTICK_OPTIONS="-plugin evdevtouch -plugin evdevkeyboard:keymap=/usr/share/qt5/keymaps/droid.qmap"
-
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.tar.bz2/droid-configs-device/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=Statefs
-
-# 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
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/input.conf
^
|
@@ -1,9 +0,0 @@
-# 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
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/jolla.conf
^
|
@@ -1,5 +0,0 @@
-[General]
-Wakelocks=true
-
-[Security]
-DBusAuthorizedGroups=root,privileged
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/main.conf
^
|
@@ -1,65 +0,0 @@
-[General]
-
-# List of plugins that should not be loaded on bluetoothd startup
-#DisablePlugins = network,input
-
-# Default adaper name
-# %h - substituted for hostname
-# %d - substituted for adapter id
-Name=
-
-# Default device class. Only the major and minor device class bits are
-# considered.
-# 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
-
-# Use some other page timeout than the controller default one
-# which is 16384 (10 seconds).
-PageTimeout = 8192
-
-# 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.
-AutoConnectTimeout = 60
-
-# What value should be assumed for the adapter Powered property when
-# SetProperty(Powered, ...) hasn't been called yet. Defaults to true
-InitiallyPowered = true
-
-# Remember the previously stored Powered state when initializing adapters
-RememberPowered = true
-
-# 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
-
-# Enable the GATT functionality. Default is false
-EnableGatt = false
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/network.conf
^
|
@@ -1,6 +0,0 @@
-# Configuration file for the network service
-
-[General]
-
-# Disable link encryption: default=false
-#DisableSecurity=true
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/rfcomm.conf
^
|
@@ -1,17 +0,0 @@
-#
-# RFCOMM configuration file.
-#
-
-#rfcomm0 {
-# # Automatically bind the device at startup
-# bind no;
-#
-# # Bluetooth address of the device
-# device 11:22:33:44:55:66;
-#
-# # RFCOMM channel for the connection
-# channel 1;
-#
-# # Description of the connection
-# comment "Example Bluetooth device";
-#}
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.tar.bz2/droid-configs-device/sparse/etc/bluez4/bluetooth/serial.conf
^
|
@@ -1,10 +0,0 @@
-# Configuration file for serial
-
-# There could be multiple proxy sections, the format is [Proxy <user chosen name>]
-#[Proxy DUN]
-
-# UUID for DUN proxy service
-#UUID=00001103-0000-1000-8000-00805F9B34FB
-
-# Address for device node
-#Address=/dev/ttyx
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.tar.bz2/droid-configs-device/sparse/etc/pulse/bluez4_stream_restore.pa
^
|
@@ -1,2 +0,0 @@
-### 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
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.tar.bz2/droid-configs-device/sparse/etc/pulse/bluez5_stream_restore.pa
^
|
@@ -1,2 +0,0 @@
-### 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
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4.conf
^
|
@@ -1,185 +0,0 @@
-# -------- Card section ------------------------------------------------------
-
-[card]
-type = ihfandheadset
-name = equals:$droid_card
-profile = ringtone
-
-[card]
-type = ihfandheadphone
-name = equals:$droid_card
-profile = ringtone
-
-[card]
-type = ihfandlineout
-name = equals:$droid_card
-profile = ringtone
-
-[card]
-type = headset
-name = equals:$droid_card
-profile = $droid_card_profile
-
-[card]
-type = headsetforcall
-name = equals:$droid_card
-profile = voicecall
-
-[card]
-type = headsetforalien
-name = equals:$droid_card
-profile = communication
-
-[card]
-type = headphone
-name = equals:$droid_card
-profile = $droid_card_profile
-
-[card]
-type = headphoneforcall
-name = equals:$droid_card
-profile = voicecall
-
-[card]
-type = headphoneforalien
-name = equals:$droid_card
-profile = communication
-
-[card]
-type = lineout
-name = equals:$droid_card
-profile = $droid_card_profile
-
-[card]
-type = lineoutforcall
-name = equals:$droid_card
-profile = voicecall
-
-[card]
-type = lineoutforalien
-name = equals:$droid_card
-profile = communication
-
-[card]
-type = ihfandtvout
-name = equals:$droid_card
-profile = $droid_card_profile
-
-[card]
-type = ihfforcall
-name = equals:$droid_card
-profile = voicecall
-
-[card]
-type = ihf
-name = equals:$droid_card
-profile = $droid_card_profile
-
-[card]
-type = ihfforalien
-name = equals:$droid_card
-profile = communication
-
-[card]
-type = bthsp
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:$droid_card
-profile1 = voicecall
-
-[card]
-type = bthspforcall
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:$droid_card
-profile1 = voicecall
-
-[card]
-type = bthspforalien
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:$droid_card
-profile1 = communication
-
-[card]
-type = bthfp
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:$droid_card
-profile1 = voicecall
-
-[card]
-type = bthfpforcall
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:$droid_card
-profile1 = voicecall
-
-[card]
-type = bthfpforalien
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:$droid_card
-profile1 = communication
-
-[card]
-type = tvoutandbta2dp
-name = startswith:"bluez_card"
-profile = a2dp
-flags = disable_notify
-
-[card]
-type = bta2dp
-name0 = startswith:"bluez_card"
-profile0 = a2dp
-name1 = equals:$droid_card
-profile1 = $droid_card_profile
-
-[card]
-type = bta2dpforalien
-name0 = startswith:"bluez_card"
-profile0 = a2dp
-name1 = equals:$droid_card
-profile1 = communication
-
-# -------- Context rule section ------------------------------------------------
-
-[context-rule]
-variable = bluetooth_override
-value = equals:active
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"false"
-
-[context-rule]
-variable = bluetooth_override
-value = equals:inactive
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"true"
-
-[context-rule]
-variable = call
-value = equals:inactive
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.prefer.hsp", value@constant:"false"
-
-[context-rule]
-variable = call
-value = equals:incoming
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.prefer.hsp", value@constant:"true"
-
-[context-rule]
-variable = call
-value = equals:outgoing
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.prefer.hsp", value@constant:"true"
-
-[context-rule]
-variable = call
-value = equals:inactive
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"false"
-
-[context-rule]
-variable = call
-value = equals:incoming
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"true"
-
-[context-rule]
-variable = call
-value = equals:outgoing
-set-property = sink-name@equals:"sink.fake.sco", property:"bluetooth.hsp.prevent.suspend.transport", value@constant:"true"
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-yggdrasil-0.0.1+hybris.17.20211023191151.66.ge4010f3.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4_earpiece.conf
^
|
@@ -1,14 +0,0 @@
-[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-yggdrasil-0.0.2.tar.bz2/droid-configs-device/droid-configs.inc
^
|
@@ -22,6 +22,11 @@
# 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
+
+# Image configuration:
+# remove_sailfish_applications: set this if you do not want sailfish applications pattern
+# remove_sailfish_ui: set this if you do not want sailfish ui pattern
# Overwriting other configs:
# If your droid-config-$DEVICE needs to provide one or more device-specific
@@ -49,7 +54,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 +64,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 +81,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 +119,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
@@ -233,36 +222,6 @@
################################################################
%if 0%{?have_bluetooth:1}
-%package bluez4
-Summary: %{rpm_device} packages for BlueZ 4
-Conflicts: droid-config-%{rpm_device}-bluez5
-Provides: %{rpm_device}-bluez-configs
-
-Requires: bluez
-Conflicts: bluez5
-
-Requires: bluez-libs
-Conflicts: bluez5-libs
-
-Requires: obexd
-Conflicts: bluez5-obexd
-
-Requires: obexd-server
-# no obexd-server equivalent in BlueZ 5, so no conflict
-
-Requires: kf5bluezqt-bluez4
-Conflicts: kf5bluezqt-bluez5
-
-Provides: bluez-configs
-Conflicts: bluez5-configs
-Obsoletes: bluez-configs-sailfish
-Obsoletes: bluez-configs-mer
-
-Requires: pulseaudio-modules-bluez4
-
-%description bluez4
-%{summary}.
-
%package bluez5
Summary: %{rpm_device} packages for BlueZ 5
Conflicts: droid-config-%{rpm_device}-bluez4
@@ -305,7 +264,7 @@
%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
-case %{android_version_major} in 8|9|10) : ;; *) echo unsupported android_version_major; exit 1; esac
+case %{android_version_major} in 8|9|10|11) : ;; *) echo unsupported android_version_major; exit 1; esac
%endif
%install
@@ -324,9 +283,12 @@
do_not_move_to_lib64=(
"firmware"
"modules"
+ "oneshot.d"
"startup"
+ "sysctl.d"
"systemd/system"
"systemd/user"
+ "sysusers.d"
"tmpfiles.d"
"udev"
)
@@ -368,7 +330,7 @@
local files=$1
local file=$2
local dorm=$3
- [ "x$dorm" == "x1" ] && rm $RPM_BUILD_ROOT/$file
+ [ "x$dorm" == "x1" ] && rm -f $RPM_BUILD_ROOT/$file
grep -vE "$file" $files > tmp/$$.files
mv tmp/$$.files $files
}
@@ -398,20 +360,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 sparse submodule (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_path}/sparse-%{vendor}/sparse-%{android_version_major}
+delete_files tmp/droid-config.files \
+ %{dcd_path}/sparse-%{vendor}/delete_file_sparse-%{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
@@ -457,8 +424,6 @@
# We want to keep some files in separate subpackages.
# NOTE: some files might get to wrong place with this because of string assumption.
%if 0%{?have_bluetooth:1}
-grep bluez4 tmp/droid-config.files > tmp/bluez4.files || true
-sed --in-place '/bluez4/d' tmp/droid-config.files
grep bluez5 tmp/droid-config.files > tmp/bluez5.files || true
sed --in-place '/bluez5/d' tmp/droid-config.files
%endif
@@ -486,23 +451,6 @@
# 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
@@ -516,7 +464,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 }')
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil-0.0.2.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-yggdrasil-0.0.2.tar.bz2/droid-configs-device/patterns/templates/patterns-sailfish-device-adaptation-@DEVICE@.inc
^
|
@@ -21,7 +21,7 @@
# Vibra
Requires: ngfd-plugin-native-vibrator
-Requires: qt5-feedback-haptics-native-vibrator
+Requires: libngf-qt5-qtfeedback
# Needed for /dev/touchscreen symlink
Requires: qt5-plugin-generic-evdev
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil-0.0.2.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-yggdrasil-0.0.2.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
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-10/usr/libexec/droid-hybris/system/etc/init/disabled_services.rc
^
|
@@ -24,6 +24,10 @@
service bootanim /system/bin/bootanimation_HYBRIS_DISABLED
-service vendor.usb-hal-1-0 /vendor/bin/hw/android.hardware.usb@1.0-service
+service vendor.usb-hal-1-0 /vendor/bin/hw/android.hardware.usb@1.0-service_HYBRIS_DISABLED
service vendor.vibrator-1-0 /vendor/bin/hw/android.hardware.vibrator@1.0-service_HYBRIS_DISABLED
+
+service update_verifier_nonencrypted /system/bin/update_verifier_HYBRIS_DISABLED nonencrypted
+
+service update_verifier /system/bin/update_verifier_HYBRIS_DISABLED ${vold.decrypt}
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/boot/flashing-README.txt
^
|
@@ -0,0 +1 @@
+Please refer to https://jolla.com/sailfishxinstall
\ No newline at end of file
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/etc/dconf/db/vendor.d/lipstick-configs.txt
^
|
@@ -0,0 +1,3 @@
+[desktop/lipstick-jolla-home/peekfilter]
+boundaryWidth=48
+pressDelay=800
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/etc/gbinder.conf
^
|
@@ -0,0 +1,2 @@
+[General]
+ApiLevel = 30
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/etc/gst-droid/gstdroidcodec.conf
^
|
@@ -0,0 +1,6 @@
+[decoders]
+video/hevc=1
+
+[decoder-quirks]
+video/mp4v-es=use-codec-supplied-height;use-codec-supplied-width
+video/avc=use-codec-supplied-height;use-codec-supplied-width
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/etc/mce/60-fingerprint-sensor.conf
^
|
@@ -0,0 +1 @@
+/system/osso/dsm/fingerprint/mode=1
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/etc/mce/60-hybris-features.ini
^
|
@@ -0,0 +1,3 @@
+[FeatureHybris]
+# Keep mce off android hwc2 functionality
+FrameBuffer = false
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/etc/mce/60-proximity-sensor.conf
^
|
@@ -0,0 +1 @@
+/system/osso/dsm/proximity/on_demand=true
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/etc/ofono/ril_subscription.conf
^
|
@@ -0,0 +1,40 @@
+# Ofono configuration for Android 11
+
+[Settings]
+#EmptyConfig=false
+#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
+name=slot1
+ecclistFile=/run/ofono/ril.ecclist
+
+#socket=/dev/socket/rild
+#sub=SUB1
+#slot=0
+#timeout=0
+#technologies=all
+#enable4G=true
+#uiccWorkaround=true
+#dataCallFormat=auto
+#dataCallRetryLimit=4
+#dataCallRetryDelay=200
+#remoteHangupReasons=20
+#localHangupReasons=23
+#enableVoicecall=true
+#enableCellBroadcast=true
+#startTimeout=20000
+#legacyImeiQuery=false
+#lteNetworkMode=9
+#networkModeTimeout=20000
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/etc/ofono/ril_subscription.d/dual-sim.conf
^
|
@@ -0,0 +1,4 @@
+[ril_1]
+transport=binder:name=slot2
+name=slot2
+ecclistFile=/run/ofono/ril.ecclist1
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/etc/sailfish-fpd/50-settings.ini
^
|
@@ -0,0 +1,13 @@
+[fpslave]
+template_directory_owner_quirk = system
+template_directory_group_quirk = system
+template_directory_mode_quirk = 0770
+
+fphal_max_fingerprints_quirk = 5
+
+mass_remove_single_notify_quirk = 0
+set_active_group_twice_quirk = 0
+skip_post_enroll_quirk = 0
+skip_enumerate_quirk = 0
+no_cancel_notification_quirk = 0
+
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/usr/bin/droid/droid-bootctl.sh
^
|
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Check currentl used boot slot
+SLOT="$(/usr/libexec/droid-hybris/system/bin/bootctl get-current-slot)"
+
+# Check if current slot is marked successful
+/usr/libexec/droid-hybris/system/bin/bootctl is-slot-marked-successful $SLOT 2> /dev/null
+
+if [ $? -ne 0 ]
+then
+ echo "Marking boot as successful"
+ /usr/libexec/droid-hybris/system/bin/bootctl mark-boot-successful 2> /dev/null
+fi
+
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/usr/lib/systemd/system/droid-bootctl.service
^
|
@@ -0,0 +1,10 @@
+[Unit]
+Description=Droid bootctl
+After=start-user-session.service
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh /usr/bin/droid/droid-bootctl.sh
+
+[Install]
+WantedBy=graphical.target actdead.target
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/usr/lib/systemd/system/droid-hal-init.service
^
|
@@ -0,0 +1,26 @@
+[Unit]
+Description=droid-hal-init
+Wants=systemd-udev-settle.service
+After=local-fs.target systemd-udev-settle.service systemd-tmpfiles-setup.service
+Before=basic.target network.target bluetooth.service ofono.service sensorfwd.service
+DefaultDependencies=no
+Conflicts=shutdown.target
+# Lets not do Requires= here as that means that this service will restart which leads automatically
+# to broken state as android init can be only started once per boot. If something goes wrong
+# our best hope is that android init doesn't notice that and that the crashing party fixes itself :)
+
+[Service]
+Type=notify
+NotifyAccess=all
+ExecStartPre=-/bin/sh /usr/bin/droid/droid-hal-early-init.sh
+ExecStart=/bin/sh /usr/bin/droid/droid-hal-startup.sh
+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
+StartLimitInterval=60
+StartLimitBurst=2
+
+[Install]
+WantedBy=graphical.target
+
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/usr/lib/systemd/system/graphical.target.wants/droid-bootctl.service
^
|
+(symlink to ../droid-bootctl.service)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/usr/lib/systemd/system/multi-user.target.wants/wait_for_keymaster.service
^
|
+(symlink to ../wait_for_keymaster.service)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/usr/lib/systemd/system/wait_for_keymaster.service
^
|
@@ -0,0 +1,14 @@
+[Unit]
+Description=Fingerprint Daemon preinit
+DefaultDependencies=no
+After=droid-hal-init.service
+Before=sailfish-fpd.service
+Conflicts=shutdown.target
+
+[Service]
+Type=oneshot
+ExecStart=/system/bin/wait_for_keymaster
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/usr/libexec/droid-hybris/system/etc/init/disabled_services.rc
^
|
@@ -0,0 +1,33 @@
+service netd netd_HYBRIS_DISABLED
+
+service installd installd_HYBRIS_DISABLED
+
+service cameraserver cameraserver_HYBRIS_DISABLED
+
+service audioserver audioserver_HYBRIS_DISABLED
+
+service media mediaserver_HYBRIS_DISABLED
+
+service update_engine update_engine_HYBRIS_DISABLED
+
+service vendor.audio-hal /vendor/bin/hw/android.hardware.audio.service_HYBRIS_DISABLED
+
+service lmkd /system/bin/lmkd_HYBRIS_DISABLED
+
+service vold /system/bin/vold_HYBRIS_DISABLED
+
+service wificond /system/bin/wificond_HYBRIS_DISABLED
+
+service storaged /system/bin/storaged_HYBRIS_DISABLED
+
+service surfaceflinger surfaceflinger_HYBRIS_DISABLED
+
+service bootanim /system/bin/bootanimation_HYBRIS_DISABLED
+
+service vendor.usb-hal-1-2 /vendor/bin/hw/android.hardware.usb@1.2-service_HYBRIS_DISABLED
+
+service vendor.vibrator-1-0 /vendor/bin/hw/android.hardware.vibrator@1.0-service_HYBRIS_DISABLED
+
+service update_verifier_nonencrypted /system/bin/update_verifier_HYBRIS_DISABLED nonencrypted
+
+service update_verifier /system/bin/update_verifier_HYBRIS_DISABLED ${vold.decrypt}
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/usr/libexec/droid-hybris/system/etc/init/ecclist.rc
^
|
@@ -0,0 +1,12 @@
+on post-fs
+ # Create directory for ofono ecc files
+ mkdir /run/ofono 0755 root root
+
+# Ofono tracks these files to sync emergency numbers with the modem
+on property:ril.ecclist=*
+ write /run/ofono/ril.ecclist ${ril.ecclist}
+ chmod 0644 /run/ofono/ril.ecclist
+
+on property:ril.ecclist1=*
+ write /run/ofono/ril.ecclist1 ${ril.ecclist1}
+ chmod 0644 /run/ofono/ril.ecclist1
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/usr/share/ngfd/plugins.d/60-profile.ini
^
|
@@ -0,0 +1,3 @@
+[profile]
+touchscreen.sound.level = 0;18;50;75
+
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse-11/var/lib/environment/nemo/99-qtscenegraph.conf
^
|
@@ -0,0 +1,2 @@
+# This flag needs to be set, regardless of its value
+QT_OPENGL_NO_BGRA=1
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/boot/flash.sh
^
|
@@ -90,12 +90,14 @@
# Message to show with successful flashing.
# "
-SCRIPT_VERSION=1.0
+SCRIPT_VERSION=1.2
OS_VERSION=
FASTBOOT_BIN_PATH=
# Detect from fastboot command
FLASHCMD_FLASH_BOOT=
+USB_AUTOSUSPEND=
+USB_AUTOSUSPEND_PATH=/sys/module/usbcore/parameters/autosuspend
DRY_RUN=1
@@ -154,6 +156,14 @@
done
}
+restore_autosuspend() {
+ if [ -z "$USB_AUTOSUSPEND" ]; then
+ return
+ fi
+
+ echo "$USB_AUTOSUSPEND" > $USB_AUTOSUSPEND_PATH
+}
+
usage() {
cat <<EOF
Flash utility v$SCRIPT_VERSION
@@ -169,6 +179,7 @@
--blob-path Where possible vendor specific image files are located
--extra-opts Custom extra options for fastboot
--config Specify location for flash ops
+ --dry-run Only dry run, don't do any changes to device
EOF
}
@@ -202,6 +213,9 @@
shift
FLASH_CONFIG="$1"
;;
+ --dry-run)
+ ONLY_DRY_RUN=1
+ ;;
--help)
usage
exit 0
@@ -230,9 +244,10 @@
# 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"
+ 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\" ONLY_DRY_RUN=$ONLY_DRY_RUN $0"
fi
+echo "Flash utility v$SCRIPT_VERSION"
case $UNAME in
Linux)
@@ -275,6 +290,13 @@
fi
fi
+# Store current autosuspend value and set to -1 to disable
+if [ -f $USB_AUTOSUSPEND_PATH ]; then
+ USB_AUTOSUSPEND="$(cat $USB_AUTOSUSPEND_PATH)"
+ echo -1 > $USB_AUTOSUSPEND_PATH
+ trap restore_autosuspend EXIT
+fi
+
if [ -z "$FLASHCMD_FLASH_BOOT" ]; then
### Detect fastboot flash commands
@@ -297,25 +319,6 @@
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
@@ -451,11 +454,16 @@
fi
echo ">> $FASTBOOTCMD getvar $var_name"
+ local val_line
+ val_line="$($FASTBOOTCMD getvar "$var_name" 2>&1 | head -n1)"
+ echo "<< $val_line"
local val
- val="$($FASTBOOTCMD getvar "$var_name" 2>&1 | head -n1 | awk '{ print $2 }')"
- echo "<< getvar $var_name: $val"
+ val="$(echo "$val_line" | awk '{ print $2 }')"
- if [ "$val" == "$getvar_fail" ]; then
+ if [ "$val" == "FAILED" ]; then
+ # getvar:foo FAILED (remote: ERROR_MESSAGE)
+ exit 1
+ elif [ "$val" == "$getvar_fail" ]; then
eval echo -e \"\$GETVAR_ERROR_$var_name\"
exit 1
fi
@@ -517,8 +525,11 @@
DRY_RUN=1
run_flash_ops
-DRY_RUN=0
-run_flash_ops
+
+if [ -z "$ONLY_DRY_RUN" ]; then
+ DRY_RUN=0
+ run_flash_ops
+fi
echo
echo "Flashing completed."
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/etc/ofono/binder.conf
^
|
@@ -0,0 +1,6 @@
+[Settings]
+ExpectSlots = slot1
+
+[slot1]
+path = /ril_0
+slot = 0
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/etc/ofono/binder.d/dual-sim.conf
^
|
@@ -0,0 +1,6 @@
+[Settings]
+ExpectSlots+=slot2
+
+[slot2]
+path = /ril_1
+slot = 1
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/etc/ohm/dbus_signal_conf.ini
^
|
@@ -1,15 +1,15 @@
-[topmost_signal]
-name = privateTopmostWindowProcessIdChanged
+[application_signal]
+name = privateTopmostWindowPolicyApplicationIdChanged
path = /
interface = org.nemomobile.compositor
-signature = i
-arguments = pid
-target = active_application_request
+signature = s
+arguments = id
+target = policy_active_application_request
-[alien_signal]
-name = alienProcessIdChanged
-path = /org/nemomobile/policy
+[appsupport_signal]
+name = privatePolicyActiveAppsupportChanged
+path = /
interface = org.nemomobile.policy
-signature = i
-arguments = pid
-target = alien_application_request
+signature = s
+arguments = id
+target = policy_active_appsupport_request
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
@@ -55,15 +55,7 @@
load-module module-meego-mainvolume virtual_stream=true unmute_delay=600
### 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
- # fake sco sink and source are needed only by bluez4 device
- 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
-.endif
+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
load-module module-match table=/etc/pulse/x-maemo-match.table key=application.name
@@ -74,7 +66,7 @@
load-module module-null-sink sink_name=sink.null rate=48000
load-module module-null-source source_name=source.null rate=48000
-load-module module-bluetooth-discover bluez4_args="sco_sink=sink.fake.sco sco_source=source.fake.sco" bluez5_args="headset=droid"
+load-module module-bluetooth-discover headset=droid
load-module module-policy-enforcement
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf
^
|
@@ -32,6 +32,7 @@
droid_source_input_backmicrophone = input-back_mic
droid_source_input_fmradio = input-fm_tuner
droid_sink_port_change_delay = delayed_port_change
+sink_class_voip = droid.output.media_latency
delay_time = 150
# cards and profiles
droid_card = droid_card.primary
@@ -251,7 +252,7 @@
[device]
type = bthspforalien
-sink = droid.output.media_latency@equals:"true"
+sink = $sink_class_voip@equals:"true"
ports = droid.output.primary@equals:"true"->$droid_sco_output
flags = disable_notify, refresh_always, delayed_port_change
@@ -287,7 +288,7 @@
[device]
type = bthfpforalien
-sink = droid.output.media_latency@equals:"true"
+sink = $sink_class_voip@equals:"true"
ports = droid.output.primary@equals:"true"->$droid_sco_output
flags = disable_notify, refresh_always, delayed_port_change
@@ -324,7 +325,7 @@
[device]
type = headsetforalien
-sink = droid.output.media_latency@equals:"true"
+sink = $sink_class_voip@equals:"true"
ports = droid.output.primary@equals:"true"->output-wired_headset
flags = refresh_always
@@ -349,7 +350,7 @@
[device]
type = headphoneforalien
-sink = droid.output.media_latency@equals:"true"
+sink = $sink_class_voip@equals:"true"
ports = droid.output.primary@equals:"true"->output-wired_headphone
flags = refresh_always
@@ -369,7 +370,7 @@
[device]
type = lineoutforalien
-sink = droid.output.media_latency@equals:"true"
+sink = $sink_class_voip@equals:"true"
ports = droid.output.primary@equals:"true"->output-wired_headphone
flags = refresh_always
@@ -408,7 +409,7 @@
[device]
type = ihfforalien
-sink = droid.output.media_latency@equals:"true"
+sink = $sink_class_voip@equals:"true"
ports = droid.output.primary@equals:"true"->output-speaker
flags = refresh_always
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/earpiece.conf
^
|
@@ -17,6 +17,6 @@
[device]
type = earpieceforalien
-sink = droid.output.media_latency@equals:"true"
+sink = $sink_class_voip@equals:"true"
ports = droid.output.primary@equals:"true"->output-earpiece
flags = refresh_always
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-load-firmware.sh
^
|
@@ -1,6 +1,6 @@
#!/bin/sh
-FIRMWARE_FOLDERS="/system/etc/firmware/ /odm/firmware/ /vendor/firmware/ /firmware/image/"
+FIRMWARE_FOLDERS="/system/etc/firmware/ /odm/firmware/ /vendor/firmware/ /firmware/image/ /vendor/firmware_mnt/image/"
log() {
logger -p daemon.info -t firmware "$@"
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-reclaim-memory.sh
^
|
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+while [ "$(wc -l < /proc/swaps)" -lt 2 ]; do
+ sleep 1
+done
+
+TASKS=$(cat /sys/fs/cgroup/systemd/system.slice/*/cgroup.procs /sys/fs/cgroup/unified/system.slice/*/cgroup.procs /sys/fs/cgroup/system.slice/*/cgroup.procs)
+
+for task in $TASKS; do
+ echo "all" > /proc/"$task"/reclaim
+done
+
+DONE_FILE="/tmp/.droid-reclaim-memory-ran"
+
+if [ ! -f $DONE_FILE ]; then
+ # right after first login, no user apps are running yet
+ # reclaim also from the user session.
+ TASKS=$(cat /sys/fs/cgroup/systemd/user.slice/user-*.slice/*/cgroup.procs /sys/fs/cgroup/unified/user.slice/user-*.slice/*/cgroup.procs /sys/fs/cgroup/user.slice/user-*.slice/*/cgroup.procs)
+
+ for task in $TASKS; do
+ echo "all" > /proc/"$task"/reclaim
+ done
+
+ touch $DONE_FILE
+fi
+
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/usr/lib/sysctl.d/ipv4-settings.conf
^
|
(renamed from droid-configs-device/sparse/etc/sysctl.d/ipv4-settings.conf)
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/usr/lib/sysctl.d/ipv6-settings.conf
^
|
(renamed from droid-configs-device/sparse/etc/sysctl.d/ipv6-settings.conf)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/droid-reclaim-memory.service
^
|
@@ -0,0 +1,13 @@
+[Unit]
+Description=Reclaim memory
+
+[Service]
+Type=oneshot
+After=init-done.service
+ExecStart=/usr/bin/droid/droid-reclaim-memory.sh
+DevicePolicy=strict
+NoNewPrivileges=yes
+PrivateTmp=yes
+ProtectHome=yes
+ProtectSystem=full
+
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/droid-reclaim-memory.timer
^
|
@@ -0,0 +1,10 @@
+[Unit]
+Description=Reclaim memory once per day and on boot
+ConditionPathExists=/proc/1/reclaim
+
+[Timer]
+OnStartupSec=1s
+OnUnitActiveSec=1d
+
+[Install]
+WantedBy=timers.target
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/usr/lib/systemd/system/timers.target.wants/droid-reclaim-memory.timer
^
|
+(symlink to ../droid-reclaim-memory.timer)
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/droid-configs-device/sparse/var/lib/environment/compositor/droid-hal-device.conf
^
|
@@ -0,0 +1,5 @@
+EGL_PLATFORM=hwcomposer
+QT_QPA_PLATFORM=hwcomposer
+
+LIPSTICK_OPTIONS="-plugin evdevtouch -plugin evdevmouse -plugin evdevkeyboard:keymap=/usr/share/qt5/keymaps/droid.qmap"
+
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/sparse/boot/flash-vollax.sh
^
|
@@ -5,7 +5,7 @@
fastboot flash userdata sailfish.img001
#Sailfish Logo
-fastboot flash logo logo.bin
+fastboot flash logo logo_yggdrasilx.bin
#Lock partition to allow flashing and remove boot warning
fastboot flash lk lk-yggdrasilx.img
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/sparse/etc/modules-load.d/connectivity.conf
^
|
@@ -1,4 +1,6 @@
wlan_drv_gen2
+bluetooth
bt_drv
+hci_vhci
gps_drv
fmradio_drv
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-yggdrasil-0.0.2.tar.bz2/sparse/usr/bin/droid/droid-get-bt-address.sh
^
|
@@ -4,4 +4,10 @@
sleep 1
done
-hexdump -s 0 -n 6 -ve '/1 "%02X:"' /vendor/nvdata/APCFG/APRDEB/BT_Addr | sed "s/:$//g" > /var/lib/bluetooth/board-address
+FILE=/mnt/vendor/nvdata/APCFG/APRDEB/BT_Addr
+if [ -f "$FILE" ]; then
+ hexdump -s 0 -n 6 -ve '/1 "%02X:"' $FILE | sed "s/:$//g" > /var/lib/bluetooth/board-address
+else
+ hexdump -s 0 -n 6 -ve '/1 "%02X:"' /vendor/nvdata/APCFG/APRDEB/BT_Addr | sed "s/:$//g" > /var/lib/bluetooth/board-address
+fi
+
|