|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-iyokan.changes
|
| @@ -1,3 +0,0 @@
-* Wed Oct 12 2016 Matti Lehtimäki <matti.lehtimaki@nomovok.com> - 0.0.10
-- [patterns] Add flashlight settings plugin.
-
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-iyokan.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-iyokan-0.0.11.tar.bz2/droid-configs-device/configs/droid.kmap
^
|
| @@ -1,4 +1,5 @@
keycode 100 = AltGr
+keycode 102 = Home
keycode 114 = VolumeDown
keycode 115 = VolumeUp
keycode 163 = MediaNext
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-iyokan-0.0.11.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -70,8 +70,13 @@
BuildRequires: pkgconfig(android-headers)
BuildRequires: repomd-pattern-builder
BuildRequires: qt5-qttools-kmap2qmap
-Provides: bluez-configs
Provides: bluetooth-rfkill-event-configs
+# The pc_suite usb mode (implies obex) can conflict with bluez5
+Conflicts: usb-moded-pc-suite-mode-android
+Obsoletes: usb-moded-pc-suite-mode-android
+# Config packages from usb-moded source with overlapping purposes
+Conflicts: usb-moded-mtp-mode-android-ffs
+Obsoletes: usb-moded-mtp-mode-android-ffs
%description
%{summary}.
@@ -171,6 +176,18 @@
################################################################
+%package flashing
+Provides: droid-config-flashing
+Group: System
+# Sparse image flashing support for flash-partition
+Requires: droid-hal-%{rpm_device}-tools
+Summary: On device flashing files for %{rpm_device} hw
+
+%description flashing
+%{summary}.
+
+################################################################
+
%if 0%{?out_of_image_files:1}
%package out-of-image-files
@@ -186,7 +203,6 @@
################################################################
-
%prep
%if 0%{?_obs_build_project:1}
# For OBS builds we need to have tarball extracted after tar_git packaging it
@@ -218,7 +234,7 @@
deletelist=$2
dorm=$3
if [ -e $deletelist ]; then
- egrep -v '^#' $deletelist | (
+ egrep -v '^#|^$' $deletelist | (
while read file; do
[ "x$dorm" == "x1" ] && rm $RPM_BUILD_ROOT/$file
grep -vE "$file" $files > tmp/$$.files
@@ -231,7 +247,7 @@
files=$1
configlist=$2
if [ -e $configlist ]; then
- egrep -v '^#' $configlist | (
+ egrep -v '^#|^$' $configlist | (
while read file; do
escape=$(echo "$file" | sed 's,/,\\\/,g')
sed -e "s/$escape/%config $escape/g" $files > tmp/$$.files
@@ -290,6 +306,8 @@
sed --in-place '/preinit/d' tmp/droid-config.files
grep "/dconf/db/" tmp/droid-config.files > tmp/sailfish-settings.files
sed --in-place '/\/dconf\/db\//d' tmp/droid-config.files
+grep -e "flash-partition" -e "platform-updates" tmp/droid-config.files > tmp/flashing.files
+sed --in-place -e '/flash-partition/d' -e '/platform-updates/d' tmp/droid-config.files
%if 0%{?out_of_image_files:1}
if [ -e out-of-image-files.files ]; then
@@ -378,7 +396,7 @@
%if 0%{?variant_name_list:1}
variants=variant_name.list
if [ -e $variants ]; then
- egrep -v '^#' $variants | (
+ egrep -v '^#|^$' $variants | (
while read line; do
%gen_ks "$line"
sed -i s/@VARIANT_NAME@/$line/g %{buildroot}/%{_datadir}/kickstarts/*$line*.ks
@@ -416,11 +434,20 @@
done
fi
+# Delete files from droid-config.files which are packaged in main spec file
+if [ -e packaged-in-main-spec.files ]; then
+ delete_files tmp/droid-config.files packaged-in-main-spec.files 0
+fi
+
################################################################
%post
# Force an update of ssu repositories
touch %{board_mapping_dir}/*
+# To add additional post scripts, one can define those as part
+# of additional_post_scripts macro.
+%{?additional_post_scripts}
+
################################################################
%post sailfish
%{_bindir}/add-oneshot dconf-update || :
@@ -457,6 +484,9 @@
%files sailfish -f tmp/sailfish-settings.files
%defattr(-,root,root,-)
+%files flashing -f tmp/flashing.files
+%defattr(-,root,root,-)
+
%if 0%{?out_of_image_files:1}
%files out-of-image-files -f tmp/out-of-image-files.files
%endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-iyokan-0.0.11.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -12,6 +12,7 @@
- droid-config-@DEVICE@-pulseaudio-settings
- droid-config-@DEVICE@-policy-settings
- droid-config-@DEVICE@-preinit-plugin
+- droid-config-@DEVICE@-flashing
- droid-hal-version-@DEVICE@
- pulseaudio-modules-droid
@@ -44,7 +45,6 @@
- usb-moded
- usb-moded-defaults-android
- usb-moded-developer-mode-android
-- usb-moded-pc-suite-mode-android
# Extra useful modes not officially supported:
# might need some configuration to get working
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-iyokan-0.0.11.tar.bz2/droid-configs-device/patterns/templates/jolla-ui-configuration-@DEVICE@.yaml
^
|
| @@ -3,5 +3,9 @@
Requires:
- jolla-ambient-z@ICON_RES@
- ambient-icons-closed-z@ICON_RES@
-Summary: Jolla UI Configuration @DEVICE@
+# Introduced starting Sailfish OS 2.0.4.x:
+# 3rd party accounts like Twitter, VK, cloud services, etc
+- jolla-settings-accounts-extensions-3rd-party-all
+
+Summary: Jolla UI Configuration @DEVICE@
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-iyokan-0.0.11.tar.bz2/droid-configs-device/sparse/etc/usb-moded/dyn-modes/mtp_mode-droid.ini
^
|
| @@ -0,0 +1,12 @@
+[mode]
+name = mtp_mode
+module = none
+
+[options]
+sysfs_path = /sys/class/android_usb/android0/functions
+sysfs_value = ffs
+sysfs_reset_value = none
+softconnect_path = /sys/class/android_usb/android0/enable
+softconnect = 1
+softconnect_disconnect = 0
+idProduct = 0A07
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-iyokan-0.0.11.tar.bz2/droid-configs-device/sparse/lib/systemd/system/adbd-prepare.service
^
|
| @@ -4,14 +4,13 @@
[Unit]
Description=functionfs setup for adbd
-Before=adbd.service
-PartOf=adbd.service
[Service]
Type=notify
RemainAfterExit=yes
ExecStart=/usr/sbin/adbd-functionfs.sh
-ExecStop=/bin/umount adb
+ExecStopPost=/bin/umount adb
+ExecStopPost=/bin/umount adb
[Install]
WantedBy=graphical.target
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-iyokan-0.0.11.tar.bz2/droid-configs-device/sparse/lib/systemd/system/adbd.service
^
|
| @@ -1,5 +1,8 @@
[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
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-iyokan-0.0.11.tar.bz2/droid-configs-device/sparse/lib/systemd/system/droid-hal-init.service
^
|
| @@ -2,7 +2,7 @@
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 sensord.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
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-iyokan-0.0.11.tar.bz2/droid-configs-device/sparse/lib/systemd/system/droid-late-start.service
^
|
| @@ -1,7 +1,7 @@
[Unit]
Description=droid-late-start
After=droid-hal-init.service
-Before=network.target start-user-session@USER.service bluetooth.service ofono.service sensord.service
+Before=network.target start-user-session@USER.service bluetooth.service ofono.service sensorfwd.service
Conflicts=shutdown.target
[Service]
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-iyokan-0.0.11.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/ihf
^
|
| @@ -1,2 +1,2 @@
x-nemo.mainvolume.call = "0:-6000,1:-1400,2:-800,3:-450,4:-190,5: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.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-iyokan-0.0.11.tar.bz2/patterns/jolla-hw-adaptation-2011xperia.yaml
^
|
| @@ -5,7 +5,7 @@
Name: jolla-hw-adaptation-2011xperia
Requires:
- pattern:jolla-hw-adaptation-hybris
-- pattern:jolla-hw-adaptation-hybris-droid-vibrator
+#- pattern:jolla-hw-adaptation-hybris-droid-vibrator
- pattern:jolla-ui-configuration-2011xperia
- pulseaudio-modules-droid
@@ -34,7 +34,6 @@
- usb-moded
- usb-moded-defaults-android
- usb-moded-developer-mode-android
-- usb-moded-pc-suite-mode-android
# Extra useful modes not officially supported:
# working but careful with roaming!
@@ -64,5 +63,8 @@
# Flashlight
- jolla-settings-system-flashlight
+# ffmemless vibrator
+- qt5-feedback-haptics-ffmemless
+
Summary: Jolla HW Adaptation 2011 Xperias
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-iyokan-0.0.11.tar.bz2/patterns/jolla-ui-configuration-2011xperia.yaml
^
|
| @@ -6,4 +6,9 @@
Requires:
- jolla-ambient-z@ICON_RES@
- ambient-icons-closed-z@ICON_RES@
+
+# Introduced starting Sailfish OS 2.0.4.x:
+# 3rd party accounts like Twitter, VK, cloud services, etc
+- jolla-settings-accounts-extensions-3rd-party-all
+
Summary: Jolla UI Configuration 2011 Xperias
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-iyokan-0.0.11.tar.bz2/sparse/usr/lib/qt5/plugins/feedback/qtfeedback-2011xperia.ini
^
|
| @@ -0,0 +1,19 @@
+ACTUATOR_SPIN_UP=2
+ACTUATOR_SPIN_DOWN=4
+ACTUATOR_RUMBLE_MIN=8191
+ACTUATOR_RUMBLE_MAX=32767
+ACTUATOR_MAGNITUDE_MAX=16000
+ACTUATOR_MAGNITUDE_MEAN=12000
+LONG_PRESS_DURATION=250
+LONG_PRESS_DELAY=4
+LONG_PRESS_MAX=16384
+LONG_PRESS_MIN=8191
+BUTTON_PRESS_DURATION=35
+BUTTON_PRESS_DELAY=4
+BUTTON_PRESS_MAX=24576
+BUTTON_PRESS_MIN=20478
+KEYPAD_PRESS_DURATION=23
+KEYPAD_PRESS_DELAY=4
+KEYPAD_PRESS_MAX=32767
+KEYPAD_PRESS_MIN=32767
+
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-iyokan-0.0.11.tar.bz2/sparse/usr/share/ngfd/plugins.d/ngf-vibra-2011xperia.ini
^
|
| @@ -0,0 +1,134 @@
+[ffmemless]
+
+# System wide effect settings file evironment variable.
+# The if there are parameters for any effects in the system settings file
+# pointed by the given environment variable, they will override the effect
+# settings for those effects. Other effects remain unchanged.
+system_effects_env = NGF_FFMEMLESS_SETTINGS
+
+# EXAMPLE: re-define NGF_SHORT in system settings file
+# export NGF_FFMEMLESS_SETTINGS=/path/to/my/feedback.ini
+# contents of "feedback.ini" would look like this
+#[ffmemless]
+#NGF_SHORT_TYPE = rumble
+#NGF_SHORT_DURATION = 110
+#NGF_SHORT_DELAY = 1
+#NGF_SHORT_MAGNITUDE = 56000
+#
+# Please note that the [ffmemless] tag is needed for glib to find the effects.
+# Now this will change the NGF_SHORT settings to what they are above.
+
+
+# All effect names must be listed here, otherwise they don't get created
+supported_effects = NGF_SHORT;NGF_LONG;NGF_STRONG;NGF_BATTERYLOW;NGF_RINGTONE;NGF_CLOCK;NGF_SMS
+
+# Setting up the effect parameters.
+# - The only mandatory parameter is _TYPE, if it's missing effect is not created
+# - Full list of valid parameter value ranges below
+#
+# - Generic parameters for all effect types
+#
+# _TYPE = [rumble|periodic], no default, mandatory parameter
+# _DIRECTION = [forward|reverse], defaults to forward
+# _DURATION = [0,65535], milliseconds, defaults to NGF_DEFAULT_DURATION
+# _DELAY = [0,65535], milliseconds before starting playback, defaults to 0
+#
+# _REPEAT = [1,4294967295], how many times to repeat effect, defaults to 1
+# Please note that if the event has "sound.repeat" enabled,
+# the effect is repeated until stop signal regardless of _REPEAT
+# value.
+#
+# - Type specific parameters for rumble effects:
+#
+# _MAGNITUDE = [0,65535], defaults to NGF_DEFAULT_RMAGNITUDE
+#
+# -Type specific parameters for periodic effects
+#
+# _WAVEFORM = [sine|triangle|square], defaults to sine
+# _PERIOD = [0,65535], defaults to 0
+# _MAGNITUDE = [0,32767], defaults to NGF_DEFAULT_PMAGNITUDE
+# _OFFSET = [0,32767], defaults to 0
+# _PHASE = [0,65535], in milliseconds, defaults to 0
+# _ATTACK = [0,65535], in milliseconds, defaults to 0
+# _ALEVEL = [0,32767], defaults to 0
+# _FADE = [0,65535], in milliseconds, defaults to 0
+# _FLEVEL = [0,32767], defaults to 0
+
+NGF_SHORT_TYPE = rumble
+NGF_SHORT_DURATION = 240
+NGF_SHORT_DELAY = 0
+NGF_SHORT_MAGNITUDE = 27000
+
+NGF_LONG_TYPE = periodic
+NGF_LONG_WAVEFORM = sine
+NGF_LONG_DURATION = 850
+NGF_LONG_PERIOD = 150
+NGF_LONG_MAGNITUDE = 15383
+NGF_LONG_ATTACK = 0
+NGF_LONG_ALEVEL = 0
+NGF_LONG_FADE = 180
+NGF_LONG_FLEVEL = 0
+
+NGF_STRONG_TYPE = rumble
+NGF_STRONG_DURATION = 320
+NGF_STRONG_DELAY = 0
+NGF_STRONG_MAGNITUDE = 65535
+
+NGF_BATTERYLOW_TYPE = periodic
+NGF_BATTERYLOW_WAVEFORM = sine
+NGF_BATTERYLOW_DURATION = 120
+NGF_BATTERYLOW_REPEAT = 2
+NGF_BATTERYLOW_DELAY = 40
+NGF_BATTERYLOW_PERIOD = 150
+NGF_BATTERYLOW_MAGNITUDE = 19383
+NGF_BATTERYLOW_OFFSET = 0
+NGF_BATTERYLOW_PHASE = 0
+NGF_BATTERYLOW_DIRECTION = forward
+NGF_BATTERYLOW_ATTACK = 0
+NGF_BATTERYLOW_ALEVEL = 0
+NGF_BATTERYLOW_FADE = 180
+NGF_BATTERYLOW_FLEVEL = 0
+
+NGF_SMS_TYPE = periodic
+NGF_SMS_WAVEFORM = sine
+NGF_SMS_DURATION = 240
+NGF_SMS_REPEAT = 2
+NGF_SMS_DELAY = 140
+NGF_SMS_PERIOD = 50
+NGF_SMS_MAGNITUDE = 27000
+NGF_SMS_OFFSET = 0
+NGF_SMS_PHASE = 0
+NGF_SMS_DIRECTION = forward
+NGF_SMS_ATTACK = 0
+NGF_SMS_ALEVEL = 0
+NGF_SMS_FADE = 80
+NGF_SMS_FLEVEL = 0
+
+NGF_RINGTONE_TYPE = periodic
+NGF_RINGTONE_WAVEFORM = sine
+NGF_RINGTONE_DURATION = 2400
+NGF_RINGTONE_DELAY = 400
+NGF_RINGTONE_PERIOD = 100
+NGF_RINGTONE_MAGNITUDE = 16383
+NGF_RINGTONE_OFFSET = 0
+NGF_RINGTONE_PHASE = 0
+NGF_RINGTONE_DIRECTION = forward
+NGF_RINGTONE_ATTACK = 500
+NGF_RINGTONE_ALEVEL = 2560
+NGF_RINGTONE_FADE = 300
+NGF_RINGTONE_FLEVEL = 4096
+
+NGF_CLOCK_TYPE = periodic
+NGF_CLOCK_WAVEFORM = sine
+NGF_CLOCK_DURATION = 4000
+NGF_CLOCK_DELAY = 500
+NGF_CLOCK_PERIOD = 100
+NGF_CLOCK_MAGNITUDE = 8000
+NGF_CLOCK_OFFSET = 0
+NGF_CLOCK_PHASE = 0
+NGF_CLOCK_DIRECTION = forward
+NGF_CLOCK_ATTACK = 1000
+NGF_CLOCK_ALEVEL = 0
+NGF_CLOCK_FADE = 400
+NGF_CLOCK_FLEVEL = 0
+
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-iyokan-0.0.11.tar.bz2/sparse/var/lib/environment/nemo/60-2011xperia-vibra.conf
^
|
| @@ -0,0 +1,2 @@
+FF_MEMLESS_SETTINGS=/usr/lib/qt5/plugins/feedback/qtfeedback-2011xperia.ini
+NGF_FFMEMLESS_SETTINGS=/usr/share/ngfd/plugins.d/ngf-vibra-2011xperia.ini
|
