[-]
[+]
|
Changed |
_service:tar_git:droid-config-vince.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-vince.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/Sailfish-On-Vince/droid-config-vince.git</param>
<param name="branch">master</param>
- <param name="revision">HEAD</param>
+ <param name="revision">e618fdbdbd0cbc155ffad12caabcdc98e562507b</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-vince-0.4.5.tar.bz2/droid-configs-device/helpers/process_patterns.sh
^
|
@@ -1,41 +0,0 @@
-#!/bin/sh
-# create/update patterns in local repo
-# Copyright (c) 2014 Jolla Ltd.
-# Contact: Simonas Leleiva <simonas.leleiva@jollamobile.com>
-
-if [ ! -d hybris ]; then
- echo $0: launch this script from the $ANDROID_ROOT directory
- exit 1
-fi
-
-if [ -z $DEVICE ]; then
- echo 'Error: $DEVICE is undefined. Please run hadk'
- exit 1
-fi
-
-RPMPATH="$ANDROID_ROOT/droid-local-repo/$DEVICE/droid-configs"
-RPMPATTERN='*-patterns*.rpm'
-RPMFILE="$RPMPATH/$RPMPATTERN"
-RPMCOUNT=$(find $RPMPATH -type f -name $RPMPATTERN | wc -l)
-echo "checking for $RPMFILE..."
-if [ $RPMCOUNT -gt 1 ]; then
- echo 'Error: more than one patterns RPM found. Please leave only one version'
- exit 1
-elif [ $RPMCOUNT == 0 ]; then
- echo 'Error: no patterns RPM found'
- exit 1
-fi
-
-mkdir -p tmp/patterns
-cd tmp/patterns
-rpm2cpio $RPMFILE | cpio -uidv
-COUNT=$(find . -type f -name "*.xml" | wc -l)
-echo "<patterns count=\"$COUNT\">" > ../patterns.xml
-find . -type f -name "*.xml" -exec cat {} + >> ../patterns.xml
-echo "</patterns>" >> ../patterns.xml
-modifyrepo_c ../patterns.xml $ANDROID_ROOT/droid-local-repo/$DEVICE/repodata ||
- modifyrepo ../patterns.xml $ANDROID_ROOT/droid-local-repo/$DEVICE/repodata
-cd ../..
-rm -rf tmp/patterns
-rm tmp/patterns.xml
-
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-vince-0.4.5.tar.bz2/droid-configs-device/patterns/common/sailfish-porter-tools.yaml
^
|
@@ -1,6 +0,0 @@
-Description: Pattern with packages for common debugging tools used by porters
-Name: sailfish-porter-tools
-Requires:
-- patterns-sailfish-device-porter-tools
-
-Summary: Sailfish OS Porter Tools
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-vince-0.4.5.tar.bz2/droid-configs-device/patterns/templates/jolla-configuration-@DEVICE@.yaml
^
|
@@ -1,6 +0,0 @@
-Description: Pattern with packages for @DEVICE@ configurations
-Name: jolla-configuration-@DEVICE@
-Requires:
-- patterns-sailfish-device-configuration-@DEVICE@
-
-Summary: Jolla Configuration @DEVICE@
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-vince-0.4.5.tar.bz2/patterns/jolla-configuration-vince.yaml
^
|
@@ -1,10 +0,0 @@
-# Feel free to disable non-critical HA parts during devel by commenting lines out
-# Generated in hadk by executing: rpm/dhd/helpers/add_new_device.sh
-
-Description: Pattern with packages for vince configurations
-Name: jolla-configuration-vince
-Requires:
-- patterns-sailfish-device-configuration-vince
-
-Summary: Jolla Configuration vince
-
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-vince-0.4.5.tar.bz2/sparse/usr/bin/droid/droid-hcismd-up.sh
^
|
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-#Maximum number of attempts to enable hcismd to try to get
-# hci0 to come online. Writing to sysfs too early seems to
-# not work, so we loop.
-MAXTRIES=15
-
-#setprop bluetooth.hciattach true
-setprop ro.qualcomm.bt.hci_transport smd
-setprop qcom.bt.dev_power_class 2
-setprop qcom.bt.le_dev_pwr_class 2
-
-i=1
-while [ ! $i -gt $MAXTRIES ] ; do
- echo 1 > /sys/module/hci_smd/parameters/hcismd_set
- if [ -e /sys/class/bluetooth/hci0 ] ; then
- # found hci0, get/set BT MAC address
- echo 0 > /sys/module/hci_smd/parameters/hcismd_set
- bt_mac=$(/system/bin/hci_qcomm_init -e -p 2 -P 2 -d /dev/ttyHSL0 2>1 | grep -oE '([0-9a-f]{2}:){5}([0-9a-f]{2})')
- echo "BT MAC: $bt_mac"
- if [ ! -z "$bt_mac" ] ; then
- echo $bt_mac > /var/lib/bluetooth/board-address
- echo "BT MAC: $bt_mac"
- fi
- echo 1 > /sys/module/hci_smd/parameters/hcismd_set
- exit 0
- fi
- sleep 1
- if [ $i == $MAXTRIES ] ; then
- # must have gotten through all our retries, fail
- exit 1
- fi
- i=$(( i + 1 ))
-done
-
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-vince-0.5.2.tar.bz2/droid-configs-device/droid-configs.inc
^
|
@@ -22,6 +22,7 @@
# Jolla Tablet: 1.5
# Nexus 5: 2.0
# Nexus 4: pixel_ratio=1.3 (then icon_res becomes 1.25)
+# packages_own_system: adaptation gets /system from rpm instead of device partition
# Overwriting other configs:
# If your droid-config-$DEVICE needs to provide one or more device-specific
@@ -49,7 +50,7 @@
# dcd_common is the common stuff and dcd_sparse is the common sparse
%define dcd_common %{dcd_path}/droid-configs-device
-%define dcd_sparse droid-configs-device/sparse
+%define dcd_sparse %{dcd_common}/sparse
# Set defaults if not defined already:
%if 0%{!?rpm_device:1}
@@ -59,12 +60,6 @@
%define rpm_vendor %{vendor}
%endif
-%if 0%{?android_version_major:1}
-# If defined also use android version specfic sparse
-# Supersedes the base sparse and is superseded by device specific sparse
-%define dcd_sparse_android_version_major droid-configs-device/sparse-%{android_version_major}
-%endif
-
%define board_mapping_dir %{_datadir}/ssu/board-mappings.d
%define board_mapping_file %{board_mapping_dir}/05-%{rpm_vendor}-%{rpm_device}.ini
@@ -82,7 +77,6 @@
Source0: %{name}-%{version}.tar.bz2
BuildRequires: ssu-kickstart-configuration
BuildRequires: pkgconfig(android-headers)
-BuildRequires: repomd-pattern-builder
BuildRequires: qt5-qttools-kmap2qmap
BuildRequires: sed
Requires: sed
@@ -121,15 +115,6 @@
%{summary}.
################################################################
-%package patterns
-Summary: Repository patterns for %{rpm_device} hw
-Provides: droid-config-patterns
-Provides: package-groups
-
-%description patterns
-%{summary}.
-
-################################################################
%package policy-settings
Summary: Policy settings for %{rpm_device} hw
Provides: droid-config-policy-settings
@@ -398,20 +383,25 @@
fi
}
-# Copy from common; erase any we don't want; overlay from device
-# specific sparse/ :
-copy_files_from %{dcd_path}/%{dcd_sparse}
-%if 0%{?dcd_sparse_android_version_major:1}
-copy_files_from %{dcd_path}/%{dcd_sparse_android_version_major}
-%endif
+# Copy from common; erase any we don't want; overlay from
+# android version-specific sparse (if exists), then
+# vendor (android version-specific) sparse (if exists), then
+# sparse for adaptation that package own /system (if applicable), then
+# device specific sparse:
+copy_files_from %{dcd_sparse}
delete_files tmp/droid-config.files delete_file.list 1
-copy_files_from %{dcd_path}/sparse
-%if 0%{?dcd_sparse_android_version_major:1}
-if [ -e droid-config-device/delete_file_android_version_major_%{android_version_major}.list ] ; then
- delete_files tmp/droid-config.files \
- droid-config-device/delete_file_android_version_major_%{android_version_major}.list
-fi
+%if 0%{?android_version_major:1}
+copy_files_from %{dcd_sparse}-%{android_version_major}
+delete_files tmp/droid-config.files \
+ %{dcd_common}/delete_file_sparse-%{android_version_major}.list 1
+copy_files_from %{dcd_sparse}-%{vendor}-%{android_version_major}
+delete_files tmp/droid-config.files \
+ %{dcd_common}/delete_file_sparse-vendor-%{android_version_major}.list 1
%endif
+%if 0%{?packages_own_system:1}
+copy_files_from %{dcd_sparse}-ownsystem
+%endif
+copy_files_from %{dcd_path}/sparse
delete_files tmp/droid-config.files delete_file_%{rpm_device}.list 1
# This add %config to %files section for files from rpm-config-files.files
config_files tmp/droid-config.files rpm-config-files.files
@@ -486,23 +476,6 @@
# Now the majority of the sparse tree is made we can handle configs
# which need some kind of substitution or generating
-# patterns
-mkdir -p %{buildroot}/usr/share/package-groups/
-/usr/bin/repomd-pattern-builder.py --patternxml -p %{dcd_common}/patterns/common -o %{buildroot}/usr/share/package-groups/ --version=%{version} --release=%{release}
-/usr/bin/repomd-pattern-builder.py --patternxml -p %{dcd_path}/patterns/ -o %{buildroot}/usr/share/package-groups/ --version=%{version} --release=%{release}
-
-delete_patterns() {
- deletelist=$1
- if [ -e $deletelist ]; then
- egrep -v '^#|^$' $deletelist | (
- while read file; do
- rm $RPM_BUILD_ROOT/$file
- done)
- fi
-}
-
-delete_patterns delete_pattern_%{rpm_device}.list
-
%if 0%{!?pixel_ratio:1}
%define pixel_ratio 1.0
%endif
@@ -516,7 +489,6 @@
%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.
@@ -687,10 +659,6 @@
%defattr(-,root,root,-)
%{_datadir}/kickstarts/*.ks
-%files patterns
-%defattr(-,root,root,-)
-%{_datadir}/package-groups/*.xml
-
%files policy-settings -f tmp/policy-settings.files
%defattr(644,root,root,-)
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-vince-0.5.2.tar.bz2/droid-configs-device/helpers/migrate_patterns.sh
^
|
@@ -76,22 +76,7 @@
while IFS= read -r f; do
if (echo "$f" | grep -q "^- pattern:\s*sailfish-porter-tools"); then
echo "Please replace '- pattern:sailfish-porter-tools' with:"
- echo "- patterns-sailfish-rnd"
- echo "# dev-tools pattern will be fixed in the next release"
- echo "# for now we'll use its 'exploded' version:"
- echo "#- patterns-sailfish-dev-tools"
- echo "- jolla-developer-mode"
- echo "- strace"
- echo "- gdb"
- echo "- gdb-gdbserver"
- echo "- vim-enhanced"
- echo "- less"
- echo "- valgrind"
- echo "- lipstick-qt5-tools"
- echo "- libhybris-tests"
- echo "- busybox-static"
- echo "- openssh-server"
- echo "- zypper"
+ echo "- patterns-sailfish-device-tools"
echo
echo "and re-run this script"
exit 1
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-vince-0.5.2.tar.bz2/droid-configs-device/patterns/templates/patterns-sailfish-device-configuration-@DEVICE@.inc
^
|
@@ -7,22 +7,7 @@
Requires: patterns-sailfish-cellular-apps
# Early stages of porting benefit from these:
-Requires: patterns-sailfish-rnd
-# dev-tools pattern will be fixed in the next release
-# for now we'll use its 'exploded' version:
-#Requires: patterns-sailfish-dev-tools
-Recommends: jolla-developer-mode
-Requires: strace
-Requires: gdb
-Requires: gdb-gdbserver
-Requires: vim-enhanced
-Requires: less
-Requires: valgrind
-Requires: lipstick-qt5-tools
-Requires: libhybris-tests
-Requires: busybox-static
-Requires: openssh-server
-Requires: zypper
+Requires: patterns-sailfish-device-tools
Requires: sailfish-content-graphics-z%{icon_res}
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-vince-0.5.2.tar.bz2/droid-configs-device/sparse-10/usr/lib/systemd/user/lipstick.service.d/50-vendor.hwcomposer-2-3.conf
^
|
@@ -1,3 +1,4 @@
[Service]
# make unlock ui exit
ExecStartPre=/usr/sbin/dummy_compositor
+ExecStopPost=/usr/bin/setprop ctl.restart vendor.hwcomposer-2-3
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-vince-0.5.2.tar.bz2/droid-configs-device/sparse/boot/flash.sh
^
|
@@ -90,7 +90,7 @@
# Message to show with successful flashing.
# "
-SCRIPT_VERSION=1.0
+SCRIPT_VERSION=1.1
OS_VERSION=
FASTBOOT_BIN_PATH=
@@ -169,6 +169,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 +203,9 @@
shift
FLASH_CONFIG="$1"
;;
+ --dry-run)
+ ONLY_DRY_RUN=1
+ ;;
--help)
usage
exit 0
@@ -230,9 +234,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)
@@ -297,25 +302,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
@@ -517,8 +503,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-vince-0.5.2.tar.bz2/patterns/patterns-sailfish-device-adaptation-vince.inc
^
|
@@ -19,7 +19,7 @@
Requires: libhybris-libwayland-egl
# Sensors
-Requires: hybris-libsensorfw-qt5
+Requires: hybris-libsensorfw-qt5-hal
# Vibra
Requires: ngfd-plugin-native-vibrator
@@ -35,6 +35,10 @@
# for audio recording to work:
Requires: qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
+# for ofono
+Requires: ofono-ril-plugin
+Conflicts: ofono-ril-binder-plugin
+
# These need to be per-device due to differing backends (fbdev, eglfs, hwc, ..?)
Requires: qt5-qtwayland-wayland_egl
Requires: qt5-qpa-hwcomposer-plugin
@@ -70,7 +74,7 @@
#Requires: sailfish-devicelock-fpd
# For GPS
-Requires: geoclue-provider-hybris
+Requires: geoclue-provider-hybris-hal
# For FM radio on some QCOM devices
Requires: qt5-qtmultimedia-plugin-mediaservice-irisradio
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-vince-0.5.2.tar.bz2/patterns/patterns-sailfish-device-configuration-vince.inc
^
|
@@ -2,25 +2,17 @@
Summary: Jolla Configuration vince
Requires: patterns-sailfish-device-configuration-common-vince
Requires: patterns-sailfish-device-adaptation-vince
+
# For devices with cellular modem. Those without one, please comment out:
Requires: patterns-sailfish-cellular-apps
+
# Early stages of porting benefit from these:
-Requires: patterns-sailfish-rnd
-# dev-tools pattern will be fixed in the next release
-# for now we'll use its 'exploded' version:
-#Requires: patterns-sailfish-dev-tools
-Recommends: jolla-developer-mode
-Requires: strace
-Requires: gdb
-Requires: gdb-gdbserver
-Requires: vim-enhanced
-Requires: less
-Requires: valgrind
-Requires: lipstick-qt5-tools
-Requires: libhybris-tests
-Requires: busybox-static
-Requires: openssh-server
-Requires: zypper
+Requires: patterns-sailfish-device-tools
+
+# jolla-rnd-device will enable usb-moded even when UI is not yet
+# brought up (useful during development, available since update10)
+Requires: jolla-rnd-device
+
Requires: sailfish-content-graphics-z%{icon_res}
# For multi-SIM devices
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-vince-0.5.2.tar.bz2/sparse/usr/bin/droid/droid-get-bt-address.sh
^
|
@@ -0,0 +1,6 @@
+#!/bin/bash
+echo "droid-get-bt-address: Setting up bluetooth address"
+if [ ! -f /var/lib/bluetooth/board-address ];then
+ bt_mac=$(cat /data/misc/bluedroid/bt_config.conf|grep Address|awk '{print $NF}')
+ echo $bt_mac > /var/lib/bluetooth/board-address
+fi
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-vince-0.5.2.tar.bz2/sparse/usr/lib/systemd/system/droid-hcismd-up.service
^
|
@@ -5,7 +5,7 @@
[Service]
Type=oneshot
-ExecStart=/bin/sh /usr/bin/droid/droid-hcismd-up.sh
+ExecStart=/bin/sh /usr/bin/droid/droid-get-bt-address.sh
RemainAfterExit=yes
TimeoutStartSec=60
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-vince-0.5.2.tar.bz2/sparse/var/lib/environment/compositor/droid-hal-device.conf
^
|
@@ -1,8 +1,7 @@
-# Config for xaiomi/vince
+# Config for xiaomi/vince
EGL_PLATFORM=hwcomposer
QT_QPA_PLATFORM=hwcomposer
QPA_HWC_IDLE_TIME=5
QPA_HWC_BUFFER_COUNT=3
# Determine which node is your touchscreen by checking /dev/input/event*
-LIPSTICK_OPTIONS=-plugin evdevtouch -plugin evdevkeyboard:keymap=/usr/share/qt5/keymaps/droid.qmap
-
+LIPSTICK_OPTIONS=-plugin evdevtouch -plugin evdevmouse -plugin evdevkeyboard:keymap=/usr/share/qt5/keymaps/droid.qmap
|