|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan.spec
|
|
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20180412155200.8.ga6d8dae.tar.bz2/droid-configs-device/kickstart/post_nochroot/hybris
^
|
| @@ -1,8 +0,0 @@
-cp $INSTALL_ROOT/etc/os-release $IMG_OUT_DIR
-ls -l $INSTALL_ROOT/usr/share/ssu/features.d/customer-*.ini &> /dev/null
-if [ "$?" == "0" ]; then
- for CFILE in $(ls -1 $INSTALL_ROOT/usr/share/ssu/features.d/customer-*.ini); do
- CUSTOMER_TMP+=${CUSTOMER_TMP:+ }$(grep -i "^name[ ]*=" $CFILE | sed 's/^.*=[ \t]*//')
- done
- echo "SAILFISH_CUSTOMER=\""$(echo ${CUSTOMER_TMP} | sed 's![/ ()]\+!_!g')"\"" >> $IMG_OUT_DIR/os-release
-fi
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.2.3+master.20180412155200.8.ga6d8dae.tar.bz2/droid-configs-device/sparse/lib/udev/platform-device
^
|
| @@ -1,5 +0,0 @@
-#!/bin/sh
-RESULT=`echo "$1" | sed "s|/devices/\([^/]*\)/\([^/]*\)/.*|\1/\2|g"| cut -d'/' -f1`
-
-echo ANDROID_BLOCK_DEVICE=$RESULT
-
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20180610185930.9.g81a1855.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -135,8 +135,8 @@
Requires: ohm-plugin-ruleengine
Requires: ohm-plugin-profile
Requires: ohm-plugin-route
-Requires: pulseaudio-modules-nemo-common >= 8.0.24
-Requires: pulseaudio-policy-enforcement >= 8.0.33
+Requires: pulseaudio-modules-nemo-common >= 11.1.24
+Requires: pulseaudio-policy-enforcement >= 11.1.35
Requires: policy-settings-common >= 0.7.3
Obsoletes: ohm-config <= 1.1.15
# ohm-configs-default should not be installed ever, thus no version
@@ -172,12 +172,12 @@
%package pulseaudio-settings
Summary: PulseAudio settings for %{rpm_device} hw
Provides: droid-config-pulseaudio-settings
-Requires: pulseaudio >= 8.0
-Requires: pulseaudio-modules-nemo-parameters >= 8.0.24
-Requires: pulseaudio-modules-nemo-stream-restore >= 8.0.24
-Requires: pulseaudio-modules-nemo-mainvolume >= 8.0.24
-Requires: pulseaudio-modules-droid >= 8.0.63
-Requires: pulseaudio-policy-enforcement >= 8.0.33
+Requires: pulseaudio >= 11.1
+Requires: pulseaudio-modules-nemo-parameters >= 11.1.24
+Requires: pulseaudio-modules-nemo-stream-restore >= 11.1.24
+Requires: pulseaudio-modules-nemo-mainvolume >= 11.1.24
+Requires: pulseaudio-modules-droid >= 11.1.66
+Requires: pulseaudio-policy-enforcement >= 11.1.35
Provides: pulseaudio-settings
%description pulseaudio-settings
@@ -473,10 +473,6 @@
sed -e 's|@DEVICE@|%{rpm_device}|g' %{dcd_path}/kickstart/pack_package-droid-updater > $DEST_UPDATER || true
fi
-# post_nochroot
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/post_nochroot/
-cp %{dcd_common}/kickstart/post_nochroot/hybris $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/post_nochroot/%{rpm_device}
-
# and attachments (override if there is one)
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/attachment
cp -f %{dcd_common}/kickstart/attachment_hybris $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/attachment/%{rpm_device}
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20180610185930.9.g81a1855.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -66,7 +66,7 @@
- rfkill
# enable device lock and allow to select untrusted software
-- jolla-devicelock-plugin-encsfa
+- jolla-devicelock-daemon-encsfa
# For GPS
- geoclue-provider-hybris
@@ -75,5 +75,8 @@
#- qt5-qtmultimedia-plugin-mediaservice-irisradio
#- jolla-mediaplayer-radio
+# For devices with SD Card
+#- sd-utils
+
Summary: Jolla HW Adaptation @DEVICE@
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20180610185930.9.g81a1855.tar.bz2/droid-configs-device/sparse/etc/media_codecs_performance.xml
^
|
| +(symlink to /system/etc/media_codecs_performance.xml)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20180610185930.9.g81a1855.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf
^
|
| @@ -353,29 +353,6 @@
ports = droid.output.primary@equals:"true"->output-wired_headphone
[device]
-type = earpieceandtvout
-sink = droid.output.primary@equals:"true"
-ports = droid.output.primary@equals:"true"->output-earpiece
-
-[device]
-type = earpieceforcall
-sink = droid.output.primary@equals:"true"
-ports = droid.output.primary@equals:"true"->output-earpiece
-flags = delayed_port_change
-delay = 200
-
-[device]
-type = earpiece
-sink = droid.output.primary@equals:"true"
-ports = droid.output.primary@equals:"true"->output-earpiece
-
-[device]
-type = earpieceforalien
-sink = droid.output.media_latency@equals:"true"
-ports = droid.output.primary@equals:"true"->output-earpiece
-flags = refresh_always
-
-[device]
type = microphone
source = droid.input.builtin@equals:"true"
ports = droid.input.builtin@equals:"true"->$droid_source_input_microphone
@@ -539,10 +516,6 @@
name = "input of source."
group = internal
-[stream]
-property = media.role@equals:"abstract"
-group = internal
-
# For routing to sink.primaryandbluez
[stream]
property = media.name@startswith:"Simultaneous output on"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20180610185930.9.g81a1855.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4.conf
^
|
| @@ -46,21 +46,6 @@
profile = $droid_card_profile
[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
-
-[card]
type = ihfforcall
name = equals:$droid_card
profile = voicecall
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20180610185930.9.g81a1855.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4_earpiece.conf
^
|
| @@ -0,0 +1,14 @@
+[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-titan-1.2.3+master.20180610185930.9.g81a1855.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez5.conf
^
|
| @@ -25,7 +25,7 @@
[card]
type = bthsp
name0 = startswith:"bluez_card"
-profile0 = droid_hsp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = $droid_card_profile
flags1 = disable_notify
@@ -33,7 +33,7 @@
[card]
type = bthspforcall
name0 = startswith:"bluez_card"
-profile0 = droid_hsp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = voicecall
flags1 = disable_notify
@@ -41,7 +41,7 @@
[card]
type = bthspforalien
name0 = startswith:"bluez_card"
-profile0 = droid_hsp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = communication
flags1 = disable_notify
@@ -49,7 +49,7 @@
[card]
type = bthfp
name0 = startswith:"bluez_card"
-profile0 = droid_hfp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = $droid_card_profile
flags1 = disable_notify
@@ -57,7 +57,7 @@
[card]
type = bthfpforcall
name0 = startswith:"bluez_card"
-profile0 = droid_hfp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = voicecall
flags1 = disable_notify
@@ -65,7 +65,7 @@
[card]
type = bthfpforalien
name0 = startswith:"bluez_card"
-profile0 = droid_hfp
+profile0 = headset_head_unit
name1 = equals:$droid_card
profile1 = communication
flags1 = disable_notify
@@ -141,30 +141,6 @@
name1 = startswith:"bluez_card"
profile1 = off
flags1 = disable_notify
-
-[card]
-type = earpiece
-name0 = equals:$droid_card
-profile0= voicecall
-name1 = startswith:"bluez_card"
-profile1 = off
-flags1 = disable_notify
-
-[card]
-type = earpieceforcall
-name0 = equals:$droid_card
-profile0= voicecall
-name1 = startswith:"bluez_card"
-profile1 = off
-flags1 = disable_notify
-
-[card]
-type = earpieceforalien
-name0 = equals:$droid_card
-profile0= communication
-name1 = startswith:"bluez_card"
-profile1 = off
-flags1 = disable_notify
[card]
type = ihfforcall
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20180610185930.9.g81a1855.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez5_earpiece.conf
^
|
| @@ -0,0 +1,23 @@
+[card]
+type = earpiece
+name0 = equals:$droid_card
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpieceforcall
+name0 = equals:$droid_card
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpieceforalien
+name0 = equals:$droid_card
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-titan-1.2.3+master.20180610185930.9.g81a1855.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/earpiece.conf
^
|
| @@ -0,0 +1,22 @@
+[device]
+type = earpieceandtvout
+sink = droid.output.primary@equals:"true"
+ports = droid.output.primary@equals:"true"->output-earpiece
+
+[device]
+type = earpieceforcall
+sink = droid.output.primary@equals:"true"
+ports = droid.output.primary@equals:"true"->output-earpiece
+flags = delayed_port_change
+delay = 200
+
+[device]
+type = earpiece
+sink = droid.output.primary@equals:"true"
+ports = droid.output.primary@equals:"true"->output-earpiece
+
+[device]
+type = earpieceforalien
+sink = droid.output.media_latency@equals:"true"
+ports = droid.output.primary@equals:"true"->output-earpiece
+flags = refresh_always
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20180610185930.9.g81a1855.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/fmradio.conf.disabled
^
|
| @@ -14,7 +14,7 @@
type = headphoneasfmradiolp
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'%20latency_msec=250%20reset_on_attach=true
+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]
@@ -27,9 +27,13 @@
type = headsetasfmradiolp
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'%20latency_msec=250%20reset_on_attach=true
+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
[stream]
property = media.name@equals:"fmradio-loopback"
group = player
+
+[stream]
+property = media.name@equals:"fmradio-loopback-source"
+group = player
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20180610185930.9.g81a1855.tar.bz2/droid-configs-device/sparse/etc/zypp/systemCheck.d/ha.check
^
|
| @@ -1,5 +1,6 @@
-requires:droid-hal-@DEVICE@
requires:droid-config-@DEVICE@
+requires:droid-hal
+requires:droid-hal-img-boot
requires:droid-hal-version-@DEVICE@
requires:libhybris-libEGL
requires:libhybris-libGLESv2
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20180610185930.9.g81a1855.tar.bz2/droid-configs-device/sparse/lib/udev/rules.d/998-droid-system.rules
^
|
| @@ -10,6 +10,50 @@
SUBSYSTEM=="misc", KERNEL=="log_system", SYMLINK+="alog/system"
SUBSYSTEM=="misc", KERNEL=="log_main", SYMLINK+="alog/main"
-ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", IMPORT{program}="/bin/sh /lib/udev/platform-device $env{DEVPATH}", SYMLINK+="block/platform/$env{ANDROID_BLOCK_DEVICE}/by-name/$env{ID_PART_ENTRY_NAME}"
+# Partition symlinks, compatible with the android way of setting up the
+# symlinks.
+
+# Pass collected (see below) information down to lower levels.
+SUBSYSTEM=="?*", ENV{PLATFORM_FOLDER}=="", IMPORT{parent}="PLATFORM_FOLDER"
+SUBSYSTEM=="?*", ENV{PLATFORM_DEVICE}=="", IMPORT{parent}="PLATFORM_DEVICE"
+# Collect information about the platform devices:
+# /sys/devices/platform/FOLDER
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", ENV{PLATFORM_FOLDER}="$kernel"
+# /sys/devices/platform/FOLDER/DEVICE
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", ENV{PLATFORM_DEVICE}="$kernel"
+# /sys/devices/FOLDER
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", ENV{PLATFORM_FOLDER}="$kernel"
+# /sys/devices/FOLDER/DEVICE
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", ENV{PLATFORM_DEVICE}="$kernel"
+
+# This will set up the bootdevice symlink, given that androidboot.bootdevice
+# is set on the commandline. If it is not given on the cmdline, android-init
+# will create the bootdevice (if the paths are correct, which they now should
+# be). If android-init doesn't create the bootdevice symlink and there is no
+# androidboot.bootdevice on the cmdline, then the bootdevice symlink is not
+# required.
+IMPORT{cmdline}="bootdevice"
+# Unfortunately we cannot compare two variables, therefore use a workaround
+# with a file.
+ENV{bootdevice}!="", RUN+="/bin/touch /tmp/udev-$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/mkdir -p /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*/*", DEVPATH=="/devices/platform/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/ln -s /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice} /dev/block/bootdevice"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/mkdir -p /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*/*", DEVPATH=="/devices/*/*", TEST=="/tmp/udev-$env{PLATFORM_DEVICE}", RUN+="/bin/ln -s /dev/block/platform/$env{PLATFORM_FOLDER}/$env{bootdevice} /dev/block/bootdevice"
+# On certain devices the path is .../$PLATFORM_FOLDER/$PLATFORM_DEVICE/...,
+# but on others there is no $PLATFORM_DEVICE subdirectory, or in other words,
+# PLATFORM_FOLDER=platform device, PLATFORM_DEVICE=empty string. (1).
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/mkdir -p /dev/block/platform/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH=="/devices/platform/*", DEVPATH!="/devices/platform/*/*", DEVPATH=="/devices/platform/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/ln -s /dev/block/platform/$env{bootdevice} /dev/block/bootdevice"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/mkdir -p /dev/block/platform/$env{bootdevice}"
+SUBSYSTEM=="platform", KERNEL!="", DEVPATH!="/devices/platform/*", DEVPATH!="/devices/*/*", DEVPATH=="/devices/*", TEST=="/tmp/udev-$env{PLATFORM_FOLDER}", RUN+="/bin/ln -s /dev/block/platform/$env{bootdevice} /dev/block/bootdevice"
+
+# Create the partition symlinks.
+ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/$env{PLATFORM_DEVICE}/by-name/$env{ID_PART_ENTRY_NAME}"
+ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/$env{PLATFORM_DEVICE}/by-num/p$env{ID_PART_ENTRY_NUMBER}"
+ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", SYMLINK+="block/platform/$env{PLATFORM_FOLDER}/$env{PLATFORM_DEVICE}/$name"
+
+# Backwards compatibility for old SailfishOS approach (might not be necessary)
+# 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}"
-ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", IMPORT{program}="/bin/sh /lib/udev/platform-device $env{DEVPATH}", SYMLINK+="block/bootdevice/by-name/$env{ID_PART_ENTRY_NAME}"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20180610185930.9.g81a1855.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-startup.sh
^
|
| @@ -13,5 +13,8 @@
# Save systemd notify socket name to let droid-init-done.sh pick it up later
echo $NOTIFY_SOCKET > /run/droid-hal/notify-socket-name
-exec /sbin/droid-hal-init
+# Use exec nohup since systemd may send SIGHUP, but droid-hal-init doesn't
+# handle it. This avoids having to modify android_system_core, which would
+# require different handling for every different android version.
+exec nohup /sbin/droid-hal-init
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.3+master.20180610185930.9.g81a1855.tar.bz2/patterns/jolla-configuration-titan.yaml
^
|
| @@ -5,10 +5,11 @@
Name: jolla-configuration-titan
Requires:
- pattern:jolla-hw-adaptation-titan
-- pattern:jolla-sailfish-applications
-- pattern:jolla-ui-wayland
+
+- patterns-sailfish-applications
+- patterns-sailfish-ui
# For devices with cellular modem. Those without one, please comment out:
-- pattern:jolla-sailfish-cellular-apps
+- patterns-sailfish-cellular-apps
# Early stages of porting benefit from these:
- pattern:sailfish-porter-tools
|
