[-]
[+]
|
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">b9f40570490fd19ca2b6bf17b3c9c3032c411098</param>
+ <param name="revision">245dfad82681f1ee28d8c3ba1f3077aea40825b8</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/droid-configs-device/configs/droid.kmap
^
|
@@ -1,12 +1,16 @@
keycode 100 = AltGr
-keycode 102 = Home
+keycode 353 = Select
keycode 114 = VolumeDown
keycode 115 = VolumeUp
+keycode 139 = MenuKB
+keycode 158 = Back
keycode 163 = MediaNext
keycode 164 = MediaTogglePlayPause
keycode 165 = MediaPrevious
keycode 166 = MediaStop
keycode 168 = AudioRewind
+keycode 169 = Call
+keycode 172 = HomePage
keycode 200 = MediaPlay
keycode 201 = MediaPause
keycode 208 = AudioForward
@@ -16,4 +20,5 @@
keycode 226 = ToggleCallHangup
# BTN_MISC
keycode 256 = ToggleCallHangup
-
+keycode 528 = CameraFocus
+keycode 766 = Camera
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/droid-configs-device/droid-configs.inc
^
|
@@ -423,13 +423,23 @@
sed --in-place 's|@PIXEL_RATIO@|%{pixel_ratio}|' %{buildroot}/etc/dconf/db/vendor.d/silica-configs.txt
+%define start_drag_distance %(awk 'BEGIN{print int(%{pixel_ratio}*20)}')
+sed --in-place 's|@START_DRAG_DISTANCE@|%{start_drag_distance}|' %{buildroot}/etc/xdg/QtProject/QPlatformTheme.conf
+
# icon_res can be only one of 1.0, 1.25, 1.5, 1.75 or 2.0 use pixel_ratio and pick closest one
%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.
+%if 0%{?_obs_build_project:1}
sed --in-place 's|@DEVICE@|%{rpm_device}|' %{buildroot}/etc/zypp/systemCheck.d/*.check
+%else
+sed --in-place '/systemCheck.d/d' tmp/droid-config.files
+rm -f %{buildroot}/etc/zypp/systemCheck.d/*.check
+%endif
# SSU board mapping for hardware adaptation
%if 0%{!?provides_own_board_mapping:1}
@@ -441,11 +451,12 @@
-e "s|%VENDOR_PRETTY%|%{vendor_pretty}|g" \
-e "s|%ARCH%|%{_target_cpu}|g" \
droid-configs-device/ssu/board-mappings.d/05-sfe.ini.in >$RPM_BUILD_ROOT/%{board_mapping_file}
+%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_file}
+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' \
@@ -454,8 +465,6 @@
>$RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/adaptation-community.ini
%endif
-%endif
-
# Copy kickstart packs (for %%{rpm_device}-kickstart-configuration)
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/pack/%{rpm_device}
DEST_UPDATER=$RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/pack/%{rpm_device}/hybris
@@ -541,8 +550,8 @@
################################################################
%post
# Force an update of ssu repositories
-touch %{board_mapping_dir}/*
-touch %{_datadir}/ssu/features.d/*
+touch %{board_mapping_dir}/* || :
+touch %{_datadir}/ssu/features.d/* || :
# To add additional post scripts, one can define those as part
# of additional_post_scripts macro.
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/droid-configs-device/patterns/templates/jolla-configuration-@DEVICE@.yaml
^
|
@@ -2,10 +2,11 @@
Name: jolla-configuration-@DEVICE@
Requires:
- pattern:jolla-hw-adaptation-@DEVICE@
-- 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
@@ -18,6 +19,10 @@
# 3rd party accounts like Twitter, VK, cloud services, etc
- jolla-settings-accounts-extensions-3rd-party-all
+# Introduced starting Sailfish OS 2.1.1.26
+# Required for Jolla Store Access
+- patterns-sailfish-consumer-generic
+
# For Mozilla location services (online)
- geoclue-provider-mlsdb
@@ -25,5 +30,9 @@
# needs some configuration to get all features working
- csd
+# Devices with 2G or more memory should also include this booster
+# to improve camera startup times and the like
+#- mapplauncherd-booster-silica-qt5-media
+
Summary: Jolla Configuration @DEVICE@
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
@@ -9,7 +9,7 @@
- droid-config-@DEVICE@-policy-settings
- droid-config-@DEVICE@-preinit-plugin
- droid-config-@DEVICE@-flashing
-- droid-config-@DEVICE@-bluez4
+- droid-config-@DEVICE@-bluez5
- droid-hal-version-@DEVICE@
# Hybris packages
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
@@ -50,12 +50,14 @@
### Needed on many new devices. HADK guide explains how to implement this fully
.ifexists module-droid-glue.so
+.nofail
load-module module-droid-glue
+.fail
.endif
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-bluez4-discover sco_sink=sink.fake.sco sco_source=source.fake.sco
+load-module module-bluetooth-discover bluez4_args="sco_sink=sink.fake.sco sco_source=source.fake.sco" bluez5_args="headset=droid"
load-module module-combine-sink sink_name=sink.primaryandbluez resample_method=trivial rate=48000 channels=2 ignore=sink.low_latency
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf
^
|
@@ -26,7 +26,7 @@
[group]
name = feedbacksound
-flags = route_audio, limit_volume, cork_stream, mute_by_route
+flags = set_sink, limit_volume, cork_stream, mute_by_route
sink = sink.primary
source = sink.null.monitor
@@ -159,137 +159,6 @@
# -------- Card section --------------------------------------------------------
-[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.primary
-profile1 = primary-primary
-
-[card]
-type = bta2dpforalien
-name0 = startswith:"bluez_card"
-profile0 = a2dp
-name1 = equals:droid_card.primary
-profile1 = communication
-
-[card]
-type = tvoutandbthsp
-name = startswith:"bluez_card"
-profile = hsp
-flags = disable_notify
-
-[card]
-type = ihfandbthsp
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:droid_card.primary
-profile1 = primary-primary
-flags = disable_notify
-
-[card]
-type = bthsp
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:droid_card.primary
-profile1 = primary-primary
-
-[card]
-type = bthspforcall
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:droid_card.primary
-profile1 = voicecall
-
-[card]
-type = bthspforalien
-name0 = startswith:"bluez_card"
-profile0 = hsp
-name1 = equals:droid_card.primary
-profile1 = communication
-
-[card]
-type = ihfandheadset
-name = equals:droid_card.primary
-profile = ringtone
-
-[card]
-type = ihfandheadphone
-name = equals:droid_card.primary
-profile = ringtone
-
-[card]
-type = headset
-name = equals:droid_card.primary
-profile = primary-primary
-
-[card]
-type = headsetforcall
-name = equals:droid_card.primary
-profile = voicecall
-
-[card]
-type = headsetforalien
-name = equals:droid_card.primary
-profile = communication
-
-[card]
-type = headphone
-name = equals:droid_card.primary
-profile = primary-primary
-
-[card]
-type = headphoneforcall
-name = equals:droid_card.primary
-profile = voicecall
-
-[card]
-type = headphoneforalien
-name = equals:droid_card.primary
-profile = communication
-
-[card]
-type = ihfandtvout
-name = equals:droid_card.primary
-profile = primary-primary
-
-[card]
-type = earpiece
-name = equals:droid_card.primary
-profile = voicecall
-
-[card]
-type = earpieceforcall
-name = equals:droid_card.primary
-profile = voicecall
-
-[card]
-type = earpieceforalien
-name = equals:droid_card.primary
-profile = communication
-
-[card]
-type = ihfforcall
-name = equals:droid_card.primary
-profile = voicecall
-
-[card]
-type = ihf
-name = equals:droid_card.primary
-profile = primary-primary
-
-[card]
-type = ihfforalien
-name = equals:droid_card.primary
-profile = communication
-
# -------- Device section ------------------------------------------------------
[device]
@@ -297,19 +166,6 @@
sink = name@startswith:"bluez_sink"
[device]
-type = tvoutandbthsp
-sink = equals:sink.primary
-
-[device]
-type = tvoutandbthsp
-source = equals:source.primary
-
-[device]
-type = ihfandbthsp
-sink = equals:sink.primary
-ports = sink.primary:output-speaker
-
-[device]
type = ihfandheadset
sink = equals:sink.primary
ports = sink.primary:output-speaker+wired_headphone
@@ -373,6 +229,42 @@
flags = disable_notify, refresh_always
[device]
+type = bthfp
+sink = equals:sink.primary
+ports = sink.primary:output-bluetooth_sco
+flags = disable_notify, refresh_always
+
+[device]
+type = bthfp
+source = equals:source.primary
+ports = source.primary:input-bluetooth_sco_headset
+flags = disable_notify, refresh_always
+
+[device]
+type = bthfpforcall
+sink = equals:sink.primary
+ports = sink.primary:output-bluetooth_sco
+flags = disable_notify, refresh_always, delayed_port_change
+
+[device]
+type = bthfpforcall
+source = equals:source.primary
+ports = source.primary:input-bluetooth_sco_headset
+flags = disable_notify, refresh_always
+
+[device]
+type = bthfpforalien
+sink = equals:sink.primary
+ports = sink.primary:output-bluetooth_sco
+flags = disable_notify, refresh_always, delayed_port_change
+
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4.conf
^
|
@@ -0,0 +1,180 @@
+# -------- Card section ------------------------------------------------------
+
+[card]
+type = ihfandheadset
+name = equals:droid_card.primary
+profile = ringtone
+
+[card]
+type = ihfandheadphone
+name = equals:droid_card.primary
+profile = ringtone
+
+[card]
+type = headset
+name = equals:droid_card.primary
+profile = primary-primary
+
+[card]
+type = headsetforcall
+name = equals:droid_card.primary
+profile = voicecall
+
+[card]
+type = headsetforalien
+name = equals:droid_card.primary
+profile = communication
+
+[card]
+type = headphone
+name = equals:droid_card.primary
+profile = primary-primary
+
+[card]
+type = headphoneforcall
+name = equals:droid_card.primary
+profile = voicecall
+
+[card]
+type = headphoneforalien
+name = equals:droid_card.primary
+profile = communication
+
+[card]
+type = ihfandtvout
+name = equals:droid_card.primary
+profile = primary-primary
+
+[card]
+type = earpiece
+name = equals:droid_card.primary
+profile = voicecall
+
+[card]
+type = earpieceforcall
+name = equals:droid_card.primary
+profile = voicecall
+
+[card]
+type = earpieceforalien
+name = equals:droid_card.primary
+profile = communication
+
+[card]
+type = ihfforcall
+name = equals:droid_card.primary
+profile = voicecall
+
+[card]
+type = ihf
+name = equals:droid_card.primary
+profile = primary-primary
+
+[card]
+type = ihfforalien
+name = equals:droid_card.primary
+profile = communication
+
+[card]
+type = bthsp
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:droid_card.primary
+profile1 = voicecall
+
+[card]
+type = bthspforcall
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:droid_card.primary
+profile1 = voicecall
+
+[card]
+type = bthspforalien
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:droid_card.primary
+profile1 = communication
+
+[card]
+type = bthfp
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:droid_card.primary
+profile1 = voicecall
+
+[card]
+type = bthfpforcall
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:droid_card.primary
+profile1 = voicecall
+
+[card]
+type = bthfpforalien
+name0 = startswith:"bluez_card"
+profile0 = hsp
+name1 = equals:droid_card.primary
+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.primary
+profile1 = primary-primary
+
+[card]
+type = bta2dpforalien
+name0 = startswith:"bluez_card"
+profile0 = a2dp
+name1 = equals:droid_card.primary
+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"
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez5.conf
^
|
@@ -0,0 +1,193 @@
+# -------- Card section --------------------------------------------------------
+
+[card]
+type = tvoutandbta2dp
+name = startswith:"bluez_card"
+profile = a2dp
+flags = disable_notify
+
+
+[card]
+type = bta2dp
+name0 = startswith:"bluez_card"
+profile0 = a2dp_sink
+name1 = equals:droid_card.primary
+profile1 = primary-primary
+flags1 = disable_notify
+
+[card]
+type = bta2dpforalien
+name0 = startswith:"bluez_card"
+profile0 = a2dp_sink
+name1 = equals:droid_card.primary
+profile1 = communication
+flags1 = disable_notify
+
+[card]
+type = bthsp
+name0 = startswith:"bluez_card"
+profile0 = droid_hsp
+name1 = equals:droid_card.primary
+profile1 = primary-primary
+flags1 = disable_notify
+
+[card]
+type = bthspforcall
+name0 = startswith:"bluez_card"
+profile0 = droid_hsp
+name1 = equals:droid_card.primary
+profile1 = voicecall
+flags1 = disable_notify
+
+[card]
+type = bthspforalien
+name0 = startswith:"bluez_card"
+profile0 = droid_hsp
+name1 = equals:droid_card.primary
+profile1 = communication
+flags1 = disable_notify
+
+[card]
+type = bthfp
+name0 = startswith:"bluez_card"
+profile0 = droid_hfp
+name1 = equals:droid_card.primary
+profile1 = primary-primary
+flags1 = disable_notify
+
+[card]
+type = bthfpforcall
+name0 = startswith:"bluez_card"
+profile0 = droid_hfp
+name1 = equals:droid_card.primary
+profile1 = voicecall
+flags1 = disable_notify
+
+[card]
+type = bthfpforalien
+name0 = startswith:"bluez_card"
+profile0 = droid_hfp
+name1 = equals:droid_card.primary
+profile1 = communication
+flags1 = disable_notify
+
+[card]
+type = ihfandheadset
+name0 = equals:droid_card.primary
+profile0= ringtone
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihfandheadphone
+name0 = equals:droid_card.primary
+profile0= ringtone
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headset
+name0 = equals:droid_card.primary
+profile0= primary-primary
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headsetforcall
+name0 = equals:droid_card.primary
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headsetforalien
+name0 = equals:droid_card.primary
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headphone
+name0 = equals:droid_card.primary
+profile0= primary-primary
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headphoneforcall
+name0 = equals:droid_card.primary
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = headphoneforalien
+name0 = equals:droid_card.primary
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihfandtvout
+name0 = equals:droid_card.primary
+profile0= primary-primary
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpiece
+name0 = equals:droid_card.primary
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpieceforcall
+name0 = equals:droid_card.primary
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = earpieceforalien
+name0 = equals:droid_card.primary
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihfforcall
+name0 = equals:droid_card.primary
+profile0= voicecall
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihf
+name0 = equals:droid_card.primary
+profile0= primary-primary
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
+[card]
+type = ihfforalien
+name0 = equals:droid_card.primary
+profile0= communication
+name1 = startswith:"bluez_card"
+profile1 = off
+flags1 = disable_notify
+
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/droid-configs-device/sparse/etc/xdg/QtProject/QPlatformTheme.conf
^
|
@@ -0,0 +1,2 @@
+[GenericUnixTheme]
+StartDragDistance=@START_DRAG_DISTANCE@
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/droid-configs-device/sparse/lib/systemd/system/droid-hal-init.service
^
|
@@ -13,7 +13,7 @@
Type=notify
NotifyAccess=all
ExecStart=/bin/sh /usr/bin/droid/droid-hal-startup.sh
-ExecStop=/bin/sh /usr/bin/droid/droid-hal-shutdown.sh
+ExecStop=/bin/sh /usr/bin/droid/droid-hal-shutdown.sh %c
Restart=always
# Lets make sure we don't block minutes in case of errors.
TimeoutSec=15
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-shutdown.sh
^
|
@@ -60,7 +60,9 @@
WAIT=1
get_pids
MAX_WAIT=5
-while [ $NUM_PIDS -gt 0 -a $WAIT -lt $MAX_WAIT ]; do
+# -gt 1 because droid-hal-init is also in this cgroup
+while [ $NUM_PIDS -gt 1 -a $WAIT -lt $MAX_WAIT ]; do
+ let WAIT=$WAIT+1
if [ $NUM_PIDS -lt $PREV_NUM_PIDS ]; then
# Number of running processes is getting smaller
# Wait a little bit more
@@ -69,13 +71,23 @@
# Number of pids is not gettting smaller
break
fi
- let WAIT=$WAIT+1
PREV_NUM_PIDS=$NUM_PIDS
get_pids
done
-echo All done. Killing droid-hal-init
+echo Killing droid-hal-init
killall droid-hal-init
+echo Killing processes hybris.shutdown missed
+get_pids
+if [ $NUM_PIDS -gt 0 ]; then
+ killall $PIDS
+ sleep 1
+ get_pids
+ if [ $NUM_PIDS -gt 0 ]; then
+ killall -s 9 $PIDS
+ fi
+fi
+
exit 0
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-startup.sh
^
|
@@ -1,7 +1,14 @@
#!/bin/sh
cd /
touch /dev/.coldboot_done
-export LD_LIBRARY_PATH=/usr/libexec/droid-hybris/system/lib/:/vendor/lib:/system/lib
+
+if [ "$(uname -m | grep -o 64)" == "64" ]; then
+ # for 64 bit use the default LD_LIBRARY_PATH, otherwise we get conflicts.
+ export LD_LIBRARY_PATH=
+else
+ # for 32 bit, this is safe
+ export LD_LIBRARY_PATH=/usr/libexec/droid-hybris/system/lib/:/vendor/lib:/system/lib
+fi
# Save systemd notify socket name to let droid-init-done.sh pick it up later
echo $NOTIFY_SOCKET > /run/droid-hal/notify-socket-name
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/patterns/jolla-configuration-fp2-sibon.yaml
^
|
@@ -18,12 +18,9 @@
# 3rd party accounts like Twitter, VK, cloud services, etc
- jolla-settings-accounts-extensions-3rd-party-all
-# Jolla Store items
-- store-client
-- jolla-settings-accounts-extensions-jolla
-
-# Non-trusted app installation support
-- jolla-settings-system-sideloading
+# Introduced starting Sailfish OS 2.1.1.26
+# Required for Jolla Store Access
+- patterns-sailfish-consumer-generic
# For Mozilla location services (online)
- geoclue-provider-mlsdb
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/sparse/etc/dconf/db/vendor.d/jolla-camera-hw.txt
^
|
@@ -2,7 +2,7 @@
imageResolution='3264x1836'
videoResolution='1920x1080'
viewfinderResolution='1920x1080'
-isoValues=[0, 100, 200, 400]
+isoValues=[0, 100, 200, 400, 800]
whiteBalanceValues=[0, 3, 2, 6, 5]
focusDistanceValues=[8, 4, 16]
flashValues=[1, 2, 4]
@@ -11,15 +11,13 @@
imageResolution_16_9='3264x1836'
viewfinderResolution_4_3='1600x1200'
viewfinderResolution_16_9='1920x1080'
-resolutionText_4_3='camera_settings-me-4-3-8m'
-resolutionText_16_9='camera_settings-me-16-9-6m'
focusDistance=16
[apps/jolla-camera/secondary/image]
imageResolution='1280x720'
videoResolution='1280x720'
viewfinderResolution='1280x720'
-isoValues=[0, 100, 200, 400]
+isoValues=[0, 100, 200, 400, 800]
whiteBalanceValues=[0, 3, 2, 6, 5]
focusDistanceValues=[4]
flashValues=[2]
@@ -28,15 +26,13 @@
imageResolution_16_9='1280x720'
viewfinderResolution_4_3='1280x960'
viewfinderResolution_16_9='1280x720'
-resolutionText_4_3='camera_settings-me-4-3-2m'
-resolutionText_16_9='camera_settings-me-16-9-1m'
focusDistance=4
[apps/jolla-camera/primary/video]
imageResolution='1920x1080'
videoResolution='1920x1080'
viewfinderResolution='1920x1080'
-isoValues=[0, 100, 200, 400]
+isoValues=[0, 100, 200, 400, 800]
whiteBalanceValues=[0, 3, 2, 6, 5]
focusDistanceValues=[4, 16]
flashValues=[2, 32]
@@ -47,7 +43,7 @@
imageResolution='1280x720'
videoResolution='1280x720'
viewfinderResolution='1280x720'
-isoValues=[0, 100, 200, 400]
+isoValues=[0, 100, 200, 400, 800]
whiteBalanceValues=[0, 3, 2, 6, 5]
focusDistanceValues=[4]
flashValues=[2]
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.39.tar.bz2/sparse/etc/media_codecs_performance.xml
^
|
+(symlink to /system/etc/media_codecs_performance.xml)
|