|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,8 +2,9 @@
<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">1f6720efc02219ab7eabc185c8d07b44ebcfd421</param>
+ <param name="revision">48a190a282e160502beab69d2423cae425f974da</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
-</service></services>
+ </service>
+</services>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.75.tar.bz2/sparse/usr/bin/droid/droid-cameradetect.sh
^
|
| @@ -1,47 +0,0 @@
-#!/bin/sh
-
-main_module_config_file="/etc/droid-cameradetect-module-main.conf"
-front_module_config_file="/etc/droid-cameradetect-module-front.conf"
-
-main_modules="-e ov8865_q8v18a -e ov12870"
-front_modules="-e ov2685 -e ov5670"
-
-if [ ! -f "$main_module_config_file" ] || [ ! -f "$front_module_config_file" ]
-then
- main_module=""
- front_module=""
-else
- main_module=$(cat $main_module_config_file)
- front_module=$(cat $front_module_config_file)
-fi
-
-detect_camera()
-(
- camera_detect_params="$*"
- found_module=$(cat /sys/devices/fd8c0000.qcom,msm-cam/video4linux/*/name | grep $camera_detect_params)
- echo "$found_module"
-)
-
-found_main_module=$(detect_camera "$main_modules")
-found_front_module=$(detect_camera "$front_modules")
-
-if [ "$found_main_module" != "$main_module" ] || [ "$found_front_module" != "$front_module" ]; then
- ret=1
- for i in 1 2 3 4 5
- do
- echo "Camera module changed. Updating camera configuration file. Attempt ${i}"
- /usr/bin/droid-camres -platform hwcomposer -w /etc/dconf/db/vendor.d/jolla-camera-hw.txt
- ret=$?
- if [ "$ret" -eq 0 ]; then
- break
- fi
- done
- if [ "$ret" -ne 0 ]; then
- echo "Failed to generate camera configuration, exiting!"
- exit $ret
- fi
- echo "$found_main_module" > $main_module_config_file
- echo "$found_front_module" > $front_module_config_file
- touch /etc/dconf/db/vendor.d/
- dconf update
-fi
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.75.tar.bz2/sparse/usr/lib/qt5/plugins/feedback/droid-vibrator-device.ini
^
|
| @@ -1,13 +0,0 @@
-Press = 30
-Release = 28
-PressWeak = 20
-ReleaseWeak = 17
-PressStrong = 40
-ReleaseStrong = 35
-DragStart = 20
-DragDropInZone = 30
-DragDropOutOfZone = 23
-DragCrossBoundary = 25
-Appear = 0
-Disappear = 0
-Move = 0
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.75.tar.bz2/sparse/usr/lib/systemd/system/droid-cameradetect.service
^
|
| @@ -1,9 +0,0 @@
-[Unit]
-Description=Detect camera module change
-After=init-done.service
-Conflicts=shutdown.target actdead.target
-
-[Service]
-Type=oneshot
-ExecStart=/bin/sh /usr/bin/droid/droid-cameradetect.sh
-RemainAfterExit=yes
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.75.tar.bz2/sparse/usr/lib/systemd/system/graphical.target.wants/droid-cameradetect.service
^
|
| -(symlink to ../droid-cameradetect.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.77.tar.bz2/droid-configs-device/patterns/templates/patterns-sailfish-device-adaptation-@DEVICE@.inc
^
|
| @@ -21,7 +21,7 @@
# Vibra
Requires: ngfd-plugin-native-vibrator
-Requires: qt5-feedback-haptics-native-vibrator
+Requires: libngf-qt5-qtfeedback
# Needed for /dev/touchscreen symlink
Requires: qt5-plugin-generic-evdev
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.77.tar.bz2/droid-configs-device/sparse-sony-10/oem
^
|
| +(symlink to /vendor/oem)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.77.tar.bz2/droid-configs-device/sparse/boot/flash.sh
^
|
| @@ -90,12 +90,14 @@
# Message to show with successful flashing.
# "
-SCRIPT_VERSION=1.0
+SCRIPT_VERSION=1.2
OS_VERSION=
FASTBOOT_BIN_PATH=
# Detect from fastboot command
FLASHCMD_FLASH_BOOT=
+USB_AUTOSUSPEND=
+USB_AUTOSUSPEND_PATH=/sys/module/usbcore/parameters/autosuspend
DRY_RUN=1
@@ -154,6 +156,14 @@
done
}
+restore_autosuspend() {
+ if [ -z "$USB_AUTOSUSPEND" ]; then
+ return
+ fi
+
+ echo "$USB_AUTOSUSPEND" > $USB_AUTOSUSPEND_PATH
+}
+
usage() {
cat <<EOF
Flash utility v$SCRIPT_VERSION
@@ -169,6 +179,7 @@
--blob-path Where possible vendor specific image files are located
--extra-opts Custom extra options for fastboot
--config Specify location for flash ops
+ --dry-run Only dry run, don't do any changes to device
EOF
}
@@ -202,6 +213,9 @@
shift
FLASH_CONFIG="$1"
;;
+ --dry-run)
+ ONLY_DRY_RUN=1
+ ;;
--help)
usage
exit 0
@@ -230,9 +244,10 @@
# Do not need root for fastboot on Mac OS X
if [ "$UNAME" != "Darwin" ] && [ "$(id -u)" -ne 0 ]; then
- exec sudo -E bash -c "FORCE=$FORCE FASTBOOT_BIN_NAME=\"$FASTBOOT_BIN_NAME\" IMAGE_PATH=\"$IMAGE_PATH\" BLOB_PATH=\"$BLOB_PATH\" FASTBOOTEXTRAOPTS=\"$FASTBOOTEXTRAOPTS\" FLASH_CONFIG=\"$FLASH_CONFIG\" $0"
+ exec sudo -E bash -c "FORCE=$FORCE FASTBOOT_BIN_NAME=\"$FASTBOOT_BIN_NAME\" IMAGE_PATH=\"$IMAGE_PATH\" BLOB_PATH=\"$BLOB_PATH\" FASTBOOTEXTRAOPTS=\"$FASTBOOTEXTRAOPTS\" FLASH_CONFIG=\"$FLASH_CONFIG\" ONLY_DRY_RUN=$ONLY_DRY_RUN $0"
fi
+echo "Flash utility v$SCRIPT_VERSION"
case $UNAME in
Linux)
@@ -275,6 +290,13 @@
fi
fi
+# Store current autosuspend value and set to -1 to disable
+if [ -f $USB_AUTOSUSPEND_PATH ]; then
+ USB_AUTOSUSPEND="$(cat $USB_AUTOSUSPEND_PATH)"
+ echo -1 > $USB_AUTOSUSPEND_PATH
+ trap restore_autosuspend EXIT
+fi
+
if [ -z "$FLASHCMD_FLASH_BOOT" ]; then
### Detect fastboot flash commands
@@ -297,25 +319,6 @@
exit 1
fi
-# Workaround for kickstart files until they are modified to not alter
-# flash.sh script directly.
-# If the valid product from flash-config.sh still contains @VALID_PRODUCTS@ placeholder,
-# assume this script is still being modified and set the product name here.
-# There are two variations of the modification, one uses DEVICE and other DEVICES
-# but both contain one or more of '-e "product_name"'
-for test_valid in "${VALID_PRODUCTS[@]}"; do
- if [ "$test_valid" == "@VALID_PRODUCTS@" ]; then
- old_IFS=$"$IFS"
- IFS=" "
- VALID_PRODUCTS=($(printf %s "@DEVICES@" | sed 's/-e //g'))
- if [ "${VALID_PRODUCTS[0]}" == '@DEVICES@' ]; then
- VALID_PRODUCTS=($(printf %s "@DEVICE@" | sed 's/-e //g'))
- fi
- IFS=$"$old_IFS"
- break
- fi
-done
-
TARGET_SERIALNO=
count=0
for SERIALNO in $FASTBOOT_DEVICES; do
@@ -451,11 +454,16 @@
fi
echo ">> $FASTBOOTCMD getvar $var_name"
+ local val_line
+ val_line="$($FASTBOOTCMD getvar "$var_name" 2>&1 | head -n1)"
+ echo "<< $val_line"
local val
- val="$($FASTBOOTCMD getvar "$var_name" 2>&1 | head -n1 | awk '{ print $2 }')"
- echo "<< getvar $var_name: $val"
+ val="$(echo "$val_line" | awk '{ print $2 }')"
- if [ "$val" == "$getvar_fail" ]; then
+ if [ "$val" == "FAILED" ]; then
+ # getvar:foo FAILED (remote: ERROR_MESSAGE)
+ exit 1
+ elif [ "$val" == "$getvar_fail" ]; then
eval echo -e \"\$GETVAR_ERROR_$var_name\"
exit 1
fi
@@ -517,8 +525,11 @@
DRY_RUN=1
run_flash_ops
-DRY_RUN=0
-run_flash_ops
+
+if [ -z "$ONLY_DRY_RUN" ]; then
+ DRY_RUN=0
+ run_flash_ops
+fi
echo
echo "Flashing completed."
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.77.tar.bz2/patterns/patterns-sailfish-device-adaptation-fp2-sibon.inc
^
|
| @@ -22,7 +22,7 @@
# Vibra
Requires: ngfd-plugin-native-vibrator
-Requires: qt5-feedback-haptics-native-vibrator
+Requires: libngf-qt5-qtfeedback
# Needed for /dev/touchscreen symlink
Requires: qt5-plugin-generic-evdev
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.77.tar.bz2/sparse/usr/share/ngfd/plugins.d/60-droid-vibrator-device.ini
^
|
| @@ -0,0 +1,13 @@
+[droid-vibrator]
+drag_start = on=20
+release_weak = on=17
+drag_fail = on=23
+drag_boundary = on=25
+touch_weak = on=25
+drag_end = on=30
+short = on=28
+release = on=28
+touch = on=35
+release_strong = on=35
+touch_strong = on=40
+strong = on=66
|
