|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx.spec
|
|
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-a5ultexx-1.31.2.tar.bz2/droid-configs-device/sparse/lib/systemd/system/adbd-prepare.service
^
|
| @@ -1,17 +0,0 @@
-# Copyright (C) 2013 Jolla Oy
-#
-# Prepare functionfs for adbd
-
-[Unit]
-Description=functionfs setup for adbd
-
-[Service]
-Type=notify
-RemainAfterExit=yes
-ExecStart=/usr/sbin/adbd-functionfs.sh
-ExecStopPost=/bin/umount adb
-ExecStopPost=/bin/umount adb
-
-[Install]
-WantedBy=graphical.target
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-a5ultexx-1.31.2.tar.bz2/droid-configs-device/sparse/lib/systemd/system/adbd.service
^
|
| @@ -1,10 +0,0 @@
-[Unit]
-Description=Android Debug Bridge Daemon
-Requires=adbd-prepare.service
-After=adbd-prepare.service
-PartOf=adbd-prepare.service
-
-[Service]
-Environment=PATH=/sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
-ExecStart=/sbin/adbd
-Restart=always
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-a5ultexx-1.31.2.tar.bz2/droid-configs-device/sparse/usr/sbin/adbd-functionfs.sh
^
|
| @@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-mkdir -p /dev/usb-ffs
-chmod 0770 /dev/usb-ffs
-chown shell:shell /dev/usb-ffs
-mkdir -p /dev/usb-ffs/adb
-chmod 0770 /dev/usb-ffs/adb
-chown shell:shell /dev/usb-ffs/adb
-/bin/mount -t functionfs adb /dev/usb-ffs/adb -o uid=shell,gid=shell
-exit 0
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -74,10 +74,13 @@
Group: Configs
License: GPLv2
Source0: %{name}-%{version}.tar.bz2
-BuildRequires: ssu-kickstart-configuration-jolla
+BuildRequires: ssu-kickstart-configuration
BuildRequires: pkgconfig(android-headers)
BuildRequires: repomd-pattern-builder
BuildRequires: qt5-qttools-kmap2qmap
+BuildRequires: sed
+Requires: sed
+Requires: droid-hal
%if 0%{?community_adaptation:1}
# because it provides one ssu feature, do:
Requires: community-adaptation
@@ -152,7 +155,7 @@
%package kickstart-configuration
Summary: Kickstart configuration for %{rpm_device}
Provides: droid-config-kickstart-configuration
-Requires: ssu-kickstart-configuration-jolla
+Requires: ssu-kickstart-configuration
Provides: droid-hal-kickstart-configuration
# the %{name} contains ssu.ini file which is needed to build kickstarts
Requires: %{name} = %{version}-%{release}
@@ -495,19 +498,22 @@
cp -rf %{dcd_path}/kickstart/* $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/
fi
-# if we are building on Mer OBS or locally, make a domain=sales .ks
-# so it works for HADK users:
-%define disturl_subst %(echo %{disturl} | grep jollamobile.com)
-%if "%{disturl_subst}" == ""
- echo "Setting domain to sales"
- %define ssu_override domain=sales
-%else
- echo "Setting domain to jolla"
- %define ssu_override domain=jolla
+# Do not set ssu_override if it is already defined
+%if 0%{!?ssu_override:1}
+ # if we are building on Mer OBS or locally, make a domain=sales .ks
+ # so it works for HADK users:
+ %define disturl_subst %(echo %{disturl} | grep jollamobile.com)
+ %if "%{disturl_subst}" == ""
+ echo "Setting domain to sales"
+ %define ssu_override domain=sales
+ %else
+ echo "Setting domain to jolla"
+ %define ssu_override domain=jolla
+ %endif
%endif
-# build rnd kickstarts on devel level, release kickstarts on all other levels
-%if 0%{?qa_stage_devel:1}
+# build rnd kickstarts on devel and branch_devel level, release kickstarts on all other levels
+%if 0%{?qa_stage_devel:1} || 0%{?qa_stage_branch_devel:1}
KS_LEVELS=true
%else
KS_LEVELS=false
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -48,19 +48,8 @@
# This is needed for notification LEDs
- mce-plugin-libhybris
-## USB mode controller
-# Enables mode selector upon plugging USB cable:
+# USB mode controller
- usb-moded
-- usb-moded-defaults-android
-- usb-moded-developer-mode-android
-
-# Extra useful modes not officially supported:
-# might need some configuration to get working
-#- usb-moded-mass-storage-android-config
-# working but careful with roaming!
-- usb-moded-connection-sharing-android-config
-# android diag mode only usable for certain android tools
-#- usb-moded-diag-mode-android
# hammerhead, grouper, and maguro use this in scripts, so include for all
- rfkill
@@ -68,6 +57,9 @@
# enable device lock and allow to select untrusted software
- jolla-devicelock-daemon-encsfa
+# Enable home encryption
+#- sailfish-device-encryption
+
# For GPS
- geoclue-provider-hybris
@@ -75,8 +67,9 @@
#- qt5-qtmultimedia-plugin-mediaservice-irisradio
#- jolla-mediaplayer-radio
-# For devices with SD Card
-#- sd-utils
+# NFC for devices using Android 8 or newer as base
+#- nfcd-binder-plugin
+#- jolla-settings-system-nfc
Summary: Jolla HW Adaptation @DEVICE@
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
| @@ -23,7 +23,12 @@
.fail
-load-module module-droid-keepalive
+# Transitional check as keepalive module is moved away from droid modules.
+.ifexists module-keepalive.so
+ load-module module-keepalive
+.else
+ load-module module-droid-keepalive
+.endif
### If droid-card needs other arguments than the default, have the new
### load-module line in /etc/pulse/arm_droid_card_custom.pa
@@ -40,6 +45,12 @@
.fail
.endif
+.ifexists module-droid-hidl.so
+ .nofail
+ load-module module-droid-hidl
+ .fail
+.endif
+
load-module module-meego-parameters cache=1 directory=/var/lib/nemo-pulseaudio-parameters use_voice=false
load-module module-meego-mainvolume virtual_stream=true
@@ -49,6 +60,9 @@
.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-match table=/etc/pulse/x-maemo-match.table key=application.name
@@ -58,9 +72,8 @@
load-module module-augment-properties
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-null-sink sink_name=sink.fake.sco rate=8000 channels=1
-load-module module-null-source source_name=source.fake.sco rate=8000 channels=1
load-module module-bluetooth-discover bluez4_args="sco_sink=sink.fake.sco sco_source=source.fake.sco" bluez5_args="headset=droid"
load-module module-policy-enforcement
@@ -120,4 +133,4 @@
### Move orphan streams to placeholder sinks or sources so that playback doesn't get
### interrupted. Policy enforcement module then moves the streams to new appropriate
### sinks or sources.
-load-module module-rescue-streams sink_name=sink.null source_name=sink.null.monitor
+load-module module-rescue-streams sink_name=sink.null source_name=source.null
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/etc/pulse/x-maemo-route.table
^
|
| @@ -1,2 +1,3 @@
sink-input-by-media-role:x-maemo -25
sink-input-by-media-role:phone -15
+sink-input-by-media-role:voip -16
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/etc/pulse/x-maemo-stream-restore.table
^
|
| @@ -1,5 +1,6 @@
sink-input-by-media-role:x-maemo -20
sink-input-by-media-role:phone -15
+sink-input-by-media-role:voip -16
sink-input-by-media-role:animation -20
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf
^
|
| @@ -43,6 +43,10 @@
# -------- Group section -------------------------------------------------------
[group]
+name = othermedia
+flags = route_audio, limit_volume, cork_stream
+
+[group]
name = idle
flags = nopolicy
sink = sink.null
@@ -164,11 +168,11 @@
[group]
name = alien
-flags = route_audio, limit_volume, cork_stream
+flags = route_audio, limit_volume, mute_by_route
[group]
name = aliencall
-flags = route_audio, limit_volume, cork_stream
+flags = route_audio, limit_volume, mute_by_route
[group]
name = probesink
@@ -203,6 +207,13 @@
delay = $delay_time
[device]
+type = ihfandlineout
+sink = droid.output.media_latency@equals:"true"
+ports = droid.output.primary@equals:"true"->output-speaker+wired_headphone
+flags = $droid_sink_port_change_delay
+delay = $delay_time
+
+[device]
type = bta2dp
sink = startswith:"bluez_sink"
ports = droid.output.primary@equals:"true"->output-speaker
@@ -343,6 +354,26 @@
flags = refresh_always
[device]
+type = lineout
+sink = droid.output.media_latency@equals:"true"
+ports = droid.output.primary@equals:"true"->output-wired_headphone
+flags = disable_notify, refresh_always, $droid_sink_port_change_delay
+delay = $delay_time
+
+[device]
+type = lineoutforcall
+sink = droid.output.primary@equals:"true"
+ports = droid.output.primary@equals:"true"->output-wired_headphone
+flags = refresh_always, delayed_port_change
+delay = 200
+
+[device]
+type = lineoutforalien
+sink = droid.output.media_latency@equals:"true"
+ports = droid.output.primary@equals:"true"->output-wired_headphone
+flags = refresh_always
+
+[device]
type = ihfandtvout
sink = droid.output.media_latency@equals:"true"
ports = droid.output.primary@equals:"true"->output-wired_headphone
@@ -539,6 +570,16 @@
set-property = module-name@equals:module-policy-enforcement, property:"x-nemo.voicecall.status", value@constant:"inactive"
[context-rule]
+variable = call
+value = equals:voip
+set-property = module-name@equals:module-policy-enforcement, property:"x-nemo.voicecall.status", value@constant:"voip"
+
+[context-rule]
variable = media_state
value = matches:"^[^t].*"
set-property = module-name@equals:module-policy-enforcement, property:"x-nemo.media.state", value@copy-from-context
+
+[context-rule]
+variable = emergency_call
+value = matches:".*"
+set-property = module-name@equals:module-policy-enforcement, property:"x.emergency_call.state", value@copy-from-context
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4.conf
^
|
| @@ -11,6 +11,11 @@
profile = ringtone
[card]
+type = ihfandlineout
+name = equals:$droid_card
+profile = ringtone
+
+[card]
type = headset
name = equals:$droid_card
profile = $droid_card_profile
@@ -40,6 +45,21 @@
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
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez5.conf
^
|
| @@ -88,6 +88,14 @@
flags1 = disable_notify
[card]
+type = ihfandlineout
+name0 = equals:$droid_card
+profile0= ringtone
+name1 = startswith:"bluez_card"
+profile1= off
+flags1 = disable_notify
+
+[card]
type = headset
name0 = equals:$droid_card
profile0= $droid_card_profile
@@ -136,6 +144,30 @@
flags1 = disable_notify
[card]
+type = lineout
+name0 = equals:$droid_card
+profile0= $droid_card_profile
+name1 = startswith:"bluez_card"
+profile1= off
+flags1 = disable_notify
+
+[card]
+type = lineoutforcall
+name0 = equals:$droid_card
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1= off
+flags1 = disable_notify
+
+[card]
+type = lineoutforalien
+name0 = equals:$droid_card
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1= off
+flags1 = disable_notify
+
+[card]
type = ihfandtvout
name0 = equals:$droid_card
profile0= $droid_card_profile
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/fmradio.conf.disabled
^
|
| @@ -18,6 +18,19 @@
flags = refresh_always, module_unload_immediately
[device]
+type = lineoutasfmradio
+source= droid.input.external@equals:true
+ports = droid.input.external@equals:true->$droid_source_input_fmradio
+flags = refresh_always
+
+[device]
+type = lineoutasfmradiolp
+source= droid.input.external@equals:true
+ports = droid.input.external@equals:true->$droid_source_input_fmradio
+module= module-loopback@sink_input_properties='media.role=x-maemo%20media.name=fmradio-loopback'%20source_output_properties='media.name=fmradio-loopback-source'%20latency_msec=250
+flags = refresh_always, module_unload_immediately
+
+[device]
type = headsetasfmradio
source= droid.input.external@equals:true
ports = droid.input.external@equals:true->$droid_source_input_fmradio
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/etc/selinux/config
^
|
| @@ -0,0 +1 @@
+SELINUX=disabled
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/lib/systemd/system/droid-hal-init.service
^
|
| @@ -12,6 +12,10 @@
[Service]
Type=notify
NotifyAccess=all
+ProtectSystem=full
+ProtectHome=true
+PrivateTmp=true
+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 %c
Restart=always
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/lib/udev/rules.d/998-droid-system.rules
^
|
| @@ -4,7 +4,6 @@
SUBSYSTEM=="adsp", SYMLINK+="$env{SUBSYSTEM}/%k"
SUBSYSTEM=="msm_camera", SYMLINK+="$env{SUBSYSTEM}/%k"
SUBSYSTEM=="mtd", SYMLINK+="$env{SUBSYSTEM}/%k"
-SUBSYSTEM=="block", SYMLINK+="$env{SUBSYSTEM}/%k"
SUBSYSTEM=="misc", KERNEL=="log_events", SYMLINK+="alog/events"
SUBSYSTEM=="misc", KERNEL=="log_radio", SYMLINK+="alog/radio"
SUBSYSTEM=="misc", KERNEL=="log_system", SYMLINK+="alog/system"
@@ -60,3 +59,5 @@
# NOTE: if the comment marked with (1) applies then this will not do anything.
ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/by-name/$env{ID_PART_ENTRY_NAME}"
+SUBSYSTEM=="firmware", ACTION=="add", RUN="/usr/bin/droid/droid-load-firmware.sh"
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-shutdown.sh
^
|
| @@ -32,10 +32,11 @@
# class_stop main
# class_stop core
-# Kill all processes that are in this same cgroup ($1)
-[ -z "$1" ] && echo "Need cgroup path" && exit 1
-CGROUP=$1
-[ ! -f /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs ] && echo "No such cgroup: $1" && exit 1
+# Kill all processes that are in this same cgroup.
+# Deducing the name of the service's cgroup based on the shutdown script's
+# cgroup name.
+CGROUP=$(cat /proc/self/cgroup | sed -r '/1:name=systemd:/!d;s|||;s|/control||')
+[ ! -f /sys/fs/cgroup/systemd/$CGROUP/cgroup.procs ] && echo "No such cgroup: $CGROUP" && exit 1
get_pids() {
# Get list of running pids in this cgroup
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-load-firmware.sh
^
|
| @@ -0,0 +1,32 @@
+#!/bin/sh
+
+FIRMWARE_FOLDERS="/system/etc/firmware/ /odm/firmware/ /vendor/firmware/ /firmware/image/"
+
+log() {
+ logger -p daemon.info -t firmware "$@"
+}
+
+log "Attempting to load firmware $FIRMWARE for $DEVPATH"
+
+if [ -e /sys$DEVPATH/loading ]; then
+ for folder in $FIRMWARE_FOLDERS; do
+ if [ -e "$folder/$FIRMWARE" ]; then
+ log "Loading firmware $folder/$FIRMWARE"
+
+ echo 1 > /sys$DEVPATH/loading
+ cat "$folder/$FIRMWARE" > /sys$DEVPATH/data
+ echo 0 > /sys$DEVPATH/loading
+
+ log "Loaded firmware $FIRMWARE"
+ exit 0
+ fi
+ done
+
+ log "Failed to find firmware $FIRMWARE for $DEVPATH"
+ echo "\-1" > /sys$DEVPATH/loading
+ exit 1
+else
+ log "Failed to find /sys$DEVPATH/loading, could not load $FIRMWARE."
+ exit 1
+fi
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/bta2dp
^
|
| @@ -1,3 +1,4 @@
x-nemo.mainvolume.call = "0:-6000,1:-1400,2:-800,3:-450,4:-190,5:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-20000,1:-5850,2:-5525,3:-5200,4:-4875,5:-4550,6:-4225,7:-3900,8:-3575,9:-3250,10:-2925,11:-2600,12:-2275,13:-1950,14:-1625,15:-1300,16:-975,17:-650,18:-325,19:0"
x-nemo.mainvolume.high-volume-step = "15"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/btmono
^
|
| @@ -1,2 +1,3 @@
x-nemo.mainvolume.call = "0:-20000,1:-6175,2:-4875,3:-3625,4:-3025,5:-2425,6:-2025,7:-1815,8:-1625,9:-1200,10:-1025,11:-700,12:-575,13:-250,14:-125,15:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-20000,1:-6175,2:-4875,3:-4225,4:-3625,5:-3025,6:-2425,7:-1815,8:-1625,9:-1200,10:-1025,11:-700,12:-575,13:-450,14:-225,15:0"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/hp
^
|
| @@ -1,2 +1,3 @@
x-nemo.mainvolume.call = "0:-6000,1:-1400,2:-800,3:-450,4:-190,5:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-6175,1:-5850,2:-5525,3:-5200,4:-4875,5:-4550,6:-4225,7:-3900,8:-3575,9:-3250,10:-2925,11:-2600,12:-2275,13:-1950,14:-1625,15:-1300,16:-975,17:-650,18:-325,19:0"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/ihf
^
|
| @@ -1,2 +1,3 @@
x-nemo.mainvolume.call = "0:-6000,1:-1400,2:-800,3:-450,4:-190,5:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-20000,1:-3800,2:-3187,3:-2648,4:-2158,5:-1716,6:-1324,7:-932,8:-612,9:-368,10:-122,11:0"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-a5ultexx-1.31.3.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/lineout
^
|
| @@ -1,3 +1,4 @@
x-nemo.mainvolume.call = "0:-6000,1:-1400,2:-800,3:-450,4:-190,5:0"
+x-nemo.mainvolume.voip = "0:-3600,1:-3200,2:-2800,3:-2400,4:-2000,5:-1600,6:-1200,7:-800,8:-400,9:0"
x-nemo.mainvolume.media = "0:-20000,1:-5500,2:-5000,3:-4500,4:-4000,5:-3600,6:-3200,7:-2800,8:-2500,9:-2200,10:-1900,11:-1600,12:-1300,13:-1100,14:-950,15:-800,16:-600,17:-400,18:-200,19:0"
x-nemo.mainvolume.high-volume-step = "12"
|
