|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/MisterMagisterDev/droid-config-titan.git</param>
<param name="branch">hybris-12.1</param>
- <param name="revision">36559593e298001f6b19ae2afedf05eb6585aabd</param>
+ <param name="revision">6108f07633b307624749418cf80f8f6fa0af4eca</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.1.1.tar.bz2/sparse/lib/systemd/system/basic.target.wants/lipstick-hack.service
^
|
| -(symlink to ../lipstick-hack.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-titan-1.1.1.tar.bz2/sparse/lib/systemd/system/lipstick-hack.service
^
|
| @@ -1,13 +0,0 @@
-[Unit]
-Description=Hack lipstick to work
-After=local-fs.target
-Before=start-user-session@USER.service
-Conflicts=rescue.target actdead.target factory-test.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/usr/bin/droid/lipstick-hack.sh
-
-[Install]
-WantedBy=basic.target
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.2.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-titan-1.2.2.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -432,7 +432,14 @@
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}
@@ -444,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' \
@@ -457,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
@@ -544,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-titan-1.2.2.tar.bz2/droid-configs-device/patterns/templates/jolla-configuration-@DEVICE@.yaml
^
|
| @@ -18,6 +18,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 +29,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-titan-1.2.2.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
| @@ -50,7 +50,9 @@
### 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
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.2.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez4.conf
^
|
| @@ -13,7 +13,7 @@
[card]
type = headset
name = equals:droid_card.primary
-profile = primary
+profile = primary-primary
[card]
type = headsetforcall
@@ -28,7 +28,7 @@
[card]
type = headphone
name = equals:droid_card.primary
-profile = primary
+profile = primary-primary
[card]
type = headphoneforcall
@@ -43,7 +43,7 @@
[card]
type = ihfandtvout
name = equals:droid_card.primary
-profile = primary
+profile = primary-primary
[card]
type = earpiece
@@ -68,7 +68,7 @@
[card]
type = ihf
name = equals:droid_card.primary
-profile = primary
+profile = primary-primary
[card]
type = ihfforalien
@@ -128,7 +128,7 @@
name0 = startswith:"bluez_card"
profile0 = a2dp
name1 = equals:droid_card.primary
-profile1 = primary
+profile1 = primary-primary
[card]
type = bta2dpforalien
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.2.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf.d/bluez5.conf
^
|
| @@ -12,7 +12,7 @@
name0 = startswith:"bluez_card"
profile0 = a2dp_sink
name1 = equals:droid_card.primary
-profile1 = primary
+profile1 = primary-primary
flags1 = disable_notify
[card]
@@ -28,7 +28,7 @@
name0 = startswith:"bluez_card"
profile0 = droid_hsp
name1 = equals:droid_card.primary
-profile1 = primary
+profile1 = primary-primary
flags1 = disable_notify
[card]
@@ -52,7 +52,7 @@
name0 = startswith:"bluez_card"
profile0 = droid_hfp
name1 = equals:droid_card.primary
-profile1 = primary
+profile1 = primary-primary
flags1 = disable_notify
[card]
@@ -90,7 +90,7 @@
[card]
type = headset
name0 = equals:droid_card.primary
-profile0= primary
+profile0= primary-primary
name1 = startswith:"bluez_card"
profile1 = off
flags1 = disable_notify
@@ -114,7 +114,7 @@
[card]
type = headphone
name0 = equals:droid_card.primary
-profile0= primary
+profile0= primary-primary
name1 = startswith:"bluez_card"
profile1 = off
flags1 = disable_notify
@@ -138,7 +138,7 @@
[card]
type = ihfandtvout
name0 = equals:droid_card.primary
-profile0= primary
+profile0= primary-primary
name1 = startswith:"bluez_card"
profile1 = off
flags1 = disable_notify
@@ -178,7 +178,7 @@
[card]
type = ihf
name0 = equals:droid_card.primary
-profile0= primary
+profile0= primary-primary
name1 = startswith:"bluez_card"
profile1 = off
flags1 = disable_notify
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.2.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-titan-1.2.2.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-titan-1.2.2.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-titan-1.2.2.tar.bz2/patterns/jolla-configuration-titan.yaml
^
|
| @@ -22,8 +22,7 @@
- jolla-settings-accounts-extensions-3rd-party-all
# Jolla Store items
-- store-client
-- jolla-settings-accounts-extensions-jolla
+- patterns-sailfish-consumer-generic
# Non-trusted app installation support
- jolla-settings-system-sideloading
@@ -34,9 +33,13 @@
# Sailfish OS CSD tool for hardware testing
# needs some configuration to get all features working
- csd
+
# sd-utils for mounting sdcard
- sd-utils
+# For all keyboard layouts
+- jolla-keyboard-layout-all
+
Summary: Jolla Configuration titan
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-titan-1.2.2.tar.bz2/sparse/usr/bin/droid/zramswap
^
|
| @@ -1,7 +1,7 @@
#!/bin/bash
start() {
- echo 150M > /sys/block/zram0/disksize
+ echo 600M > /sys/block/zram0/disksize
mkswap /dev/zram0
swapon -p 100 /dev/zram0
}
|
