|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-find5.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/Nokius/droid-config-find5.git</param>
<param name="branch">master</param>
- <param name="revision"/>
+ <param name="revision">b3c10f96eb25fff73b696f859e35b61ca115eb1a</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/droid-config-@DEVICE@.spec.template
^
|
| @@ -8,11 +8,11 @@
%define dcd_path ./
+# Community HW adaptations need this
+%define community_adaptation 1
+
# Adjust this for your device
%define pixel_ratio 1.0
-# We assume most devices will
-%define have_modem 1
-
%include droid-configs-device/droid-configs.inc
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -1,6 +1,8 @@
# This file should be %%included into a device specific spec file
# where macros are defined:
#
+# community_adaptation: needs to be defined for community HW adaptations
+#
# Device information:
# device: should be the CM codename or the AOSP TARGET_PRODUCT
# vendor: determine the droid-side directory used for ./device/<vendor>/<device>
@@ -12,7 +14,8 @@
# ofono_disable_plugins: any ofono plugins that you want explicitly disabled
# Device capabilities:
-# have_modem: set this if your device ships a modem
+# remove_modem: set this if your device has no modem (e.g. a WiFi-only tablet)
+# remove_bluetooth: set this if your device does not have a Bluetooth chip
# pixel_ratio: UI scaling factor, choose from 1.0, 1.5, 2.0. Any other value will
# default the icon pack to 1.0 resolution (it is a bug)!
# Read more on ways to do-it-together: https://bugs.nemomobile.org/show_bug.cgi?id=814
@@ -38,6 +41,16 @@
# * add "Provides: PACKAGE" to your droid-config-$DEVICE.spec (e.g. Provides: ofono-configs)
+# We assume all devices have a cellular modem, unless explicitly removed:
+%if 0%{!?remove_modem:1}
+%define have_modem 1
+%endif
+
+# We assume all devices have Bluetooth, unless explicitly removed:
+%if 0%{!?remove_bluetooth:1}
+%define have_bluetooth 1
+%endif
+
# dcd_path is the base when run from hadk
# dcd_common is the common stuff (!) and dcd_sparse is the common sparse
%if 0%{!?dcd_path:1}
@@ -70,7 +83,22 @@
BuildRequires: pkgconfig(android-headers)
BuildRequires: repomd-pattern-builder
BuildRequires: qt5-qttools-kmap2qmap
+%if 0%{?community_adaptation:1}
+# because it provides one ssu feature, do:
+Requires: community-adaptation
+# because it has a template for dhc to provide a ssu feature, do:
+BuildRequires: community-adaptation
+%endif
+%if 0%{?have_bluetooth:1}
Provides: bluetooth-rfkill-event-configs
+# Device-specific obexd configuration common to BlueZ 4 & 5
+Requires: obexd-calldata-provider
+Requires: obexd-contentfilter-helper
+Provides: obexd-configs
+
+# Require a BlueZ configuration
+Requires: %{rpm_device}-bluez-configs
+%endif
# 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
@@ -203,6 +231,40 @@
################################################################
+%if 0%{?have_bluetooth:1}
+%package bluez4
+Summary: %{rpm_device} packages for BlueZ 4
+Conflicts: droid-config-%{rpm_device}-bluez5
+Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
+Provides: %{rpm_device}-bluez-configs
+
+Requires: bluez
+Conflicts: bluez5
+
+Requires: bluez-libs
+Conflicts: bluez5-libs
+
+Requires: obexd
+Conflicts: bluez5-obexd
+
+Requires: obexd-server
+# no obexd-server equivalent in BlueZ 5, so no conflict
+
+Requires: kf5bluezqt-bluez4
+Conflicts: kf5bluezqt-bluez5
+
+Provides: bluez-configs
+Conflicts: bluez5-configs
+Obsoletes: bluez-configs-sailfish
+Obsoletes: bluez-configs-mer
+
+%description bluez4
+%{summary}.
+%endif
+
+################################################################
+
%prep
%if 0%{?_obs_build_project:1}
# For OBS builds we need to have tarball extracted after tar_git packaging it
@@ -308,6 +370,10 @@
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%{?have_bluetooth:1}
+grep bluez4 tmp/droid-config.files > tmp/bluez4.files || true
+sed --in-place '/bluez4/d' tmp/droid-config.files
+%endif
%if 0%{?out_of_image_files:1}
if [ -e out-of-image-files.files ]; then
@@ -331,13 +397,10 @@
sed --in-place 's|@PIXEL_RATIO@|%{pixel_ratio}|' %{buildroot}/etc/dconf/db/vendor.d/silica-configs.txt
-# icon_res can be only from a predefined set. Otherwise falls back to 1.0 (see NEMO#814 bug)
-%if "%{pixel_ratio}" != "1.0" && "%{pixel_ratio}" != "1.5" && "%{pixel_ratio}" != "2.0"
-%define icon_res 1.0
-%else
-%define icon_res %{pixel_ratio}
-%endif
+# 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/*
# SSU board mapping for hardware adaptation
@@ -350,6 +413,19 @@
-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}
+
+%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}
+# ...and make a separate adaptation repo for community:
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/
+sed -e 's|@DEVICE@|%{rpm_device}|g' \
+ -e 's|@VENDOR@|%{rpm_vendor}|g' \
+ %{_datadir}/community-adaptation/adaptation-community.ini.in \
+ >$RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/adaptation-community.ini
+%endif
+
%endif
# Copy kickstart packs (for %%{rpm_device}-kickstart-configuration)
@@ -443,6 +519,7 @@
%post
# Force an update of ssu repositories
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.
@@ -459,6 +536,9 @@
%{board_mapping_file}
%endif
%{_datadir}/qt5/keymaps/droid.qmap
+%if 0%{?community_adaptation:1}
+%{_datadir}/ssu/features.d/adaptation-community.ini
+%endif
%files ssu-kickstarts
%defattr(-,root,root,-)
@@ -491,3 +571,8 @@
%files out-of-image-files -f tmp/out-of-image-files.files
%endif
+%if 0%{?have_bluetooth:1}
+%files bluez4 -f tmp/bluez4.files
+%defattr(644,root,root,-)
+%endif
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/helpers/process_patterns.sh
^
|
| @@ -13,7 +13,7 @@
exit 1
fi
-RPMPATH="$ANDROID_ROOT/droid-local-repo/$DEVICE"
+RPMPATH="$ANDROID_ROOT/droid-local-repo/$DEVICE/droid-configs"
RPMPATTERN='*-patterns*.rpm'
RPMFILE="$RPMPATH/$RPMPATTERN"
RPMCOUNT=$(find $RPMPATH -type f -name $RPMPATTERN | wc -l)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -13,6 +13,7 @@
- droid-config-@DEVICE@-policy-settings
- droid-config-@DEVICE@-preinit-plugin
- droid-config-@DEVICE@-flashing
+- droid-config-@DEVICE@-bluez4
- droid-hal-version-@DEVICE@
- pulseaudio-modules-droid
@@ -54,8 +55,6 @@
# android diag mode only usable for certain android tools
- usb-moded-diag-mode-android
-# from update13, this is needed explicitly
-- bluez-configs-sailfish
# hammerhead, grouper, and maguro use this in scripts, so include for all
- rfkill
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/acdbdata
^
|
| +(symlink to /system/etc/acdbdata)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/audio_platform_info.xml
^
|
| +(symlink to /system/etc/audio_platform_info.xml)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/bluetooth/audio.conf
^
|
| @@ -0,0 +1,63 @@
+# Configuration file for the audio service
+
+# This section contains options which are not specific to any
+# particular interface
+[General]
+#Enable=Gateway
+# Switch to master role for incoming connections (defaults to true)
+#Master=true
+
+# If we want to disable support for specific services
+# Defaults to supporting all implemented services
+#Disable=Gateway,Source,Socket
+
+# SCO routing. Either PCM or HCI (in which case audio is routed to/from ALSA)
+# Defaults to HCI
+#SCORouting=PCM
+
+# Automatically connect both A2DP and HFP/HSP profiles for incoming
+# connections. Some headsets that support both profiles will only connect the
+# other one automatically so the default setting of true is usually a good
+# idea.
+#AutoConnect=true
+
+# Headset interface specific options (i.e. options which affect how the audio
+# service interacts with remote headset devices)
+[Headset]
+
+# Set to true to support HFP, false means only HSP is supported
+# Defaults to true
+HFP=true
+
+# Maximum number of connected HSP/HFP devices per adapter. Defaults to 1
+MaxConnected=1
+
+# Set to true to enable use of fast connectable mode (faster page scanning)
+# for HFP when incoming call starts. Default settings are restored after
+# call is answered or rejected. Page scan interval is much shorter and page
+# scan type changed to interlaced. Such allows faster connection initiated
+# by a headset.
+FastConnectable=false
+
+# Just an example of potential config options for the other interfaces
+#[A2DP]
+#SBCSources=1
+#MPEG12Sources=0
+
+# Limit features advertised to headsets
+[Telephony]
+Disable=ConferenceCalling,InBandRingtone,EnhancedCallControl
+
+# Where to retrieve battery charge info from
+BatteryInfo=Statefs
+
+# Where to retrieve last dialed number from
+LastDialedNumber=/home/nemo/.cache/last-dialed
+
+# Configure AVRCP features: TG category 1, CT disabled
+[AVRCP]
+EnableTarget=true
+TargetVersion=0x0100
+DisableTargetFeatures=Category2,Category3,Category4,PlayerSettings
+
+EnableControl=false
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/bluetooth/input.conf
^
|
| @@ -0,0 +1,9 @@
+# Configuration file for the input service
+
+# This section contains options which are not specific to any
+# particular interface
+[General]
+
+# Set idle timeout (in minutes) before the connection will
+# be disconnect (defaults to 0 for no timeout)
+#IdleTimeout=30
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/bluetooth/jolla.conf
^
|
| @@ -0,0 +1,5 @@
+[General]
+Wakelocks=true
+
+[Security]
+DBusAuthorizedGroups=root,privileged
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/bluetooth/main.conf
^
|
| @@ -0,0 +1,65 @@
+[General]
+
+# List of plugins that should not be loaded on bluetoothd startup
+#DisablePlugins = network,input
+
+# Default adaper name
+# %h - substituted for hostname
+# %d - substituted for adapter id
+Name=
+
+# Default device class. Only the major and minor device class bits are
+# considered.
+# Phone, smart-phone
+Class = 0x00020c
+
+# How long to stay in discoverable mode before going back to non-discoverable
+# The value is in seconds. Default is 180, i.e. 3 minutes.
+# 0 = disable timer, i.e. stay discoverable forever
+DiscoverableTimeout = 0
+
+# How long to stay in pairable mode before going back to non-discoverable
+# The value is in seconds. Default is 0.
+# 0 = disable timer, i.e. stay pairable forever
+PairableTimeout = 0
+
+# Use some other page timeout than the controller default one
+# which is 16384 (10 seconds).
+PageTimeout = 8192
+
+# Automatic connection for bonded devices driven by platform/user events.
+# If a platform plugin uses this mechanism, automatic connections will be
+# enabled during the interval defined below. Initially, this feature
+# intends to be used to establish connections to ATT channels.
+AutoConnectTimeout = 60
+
+# What value should be assumed for the adapter Powered property when
+# SetProperty(Powered, ...) hasn't been called yet. Defaults to true
+InitiallyPowered = true
+
+# Remember the previously stored Powered state when initializing adapters
+RememberPowered = true
+
+# Use vendor id source (assigner), vendor, product and version information for
+# DID profile support. The values are separated by ":" and assigner, VID, PID
+# and version.
+# Possible vendor id source values: bluetooth, usb (defaults to usb)
+#DeviceID = bluetooth:1234:5678:abcd
+
+# Do reverse service discovery for previously unknown devices that connect to
+# us. This option is really only needed for qualification since the BITE tester
+# doesn't like us doing reverse SDP for some test cases (though there could in
+# theory be other useful purposes for this too). Defaults to true.
+ReverseServiceDiscovery = true
+
+# Enable name resolving after inquiry. Set it to 'false' if you don't need
+# remote devices name and want shorter discovery cycle. Defaults to 'true'.
+NameResolving = true
+
+# Enable runtime persistency of debug link keys. Default is false which
+# makes debug link keys valid only for the duration of the connection
+# that they were created for.
+DebugKeys = false
+
+# Enable the GATT functionality. Default is false
+EnableGatt = false
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/bluetooth/network.conf
^
|
| @@ -0,0 +1,6 @@
+# Configuration file for the network service
+
+[General]
+
+# Disable link encryption: default=false
+#DisableSecurity=true
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/bluetooth/rfcomm.conf
^
|
| @@ -0,0 +1,17 @@
+#
+# RFCOMM configuration file.
+#
+
+#rfcomm0 {
+# # Automatically bind the device at startup
+# bind no;
+#
+# # Bluetooth address of the device
+# device 11:22:33:44:55:66;
+#
+# # RFCOMM channel for the connection
+# channel 1;
+#
+# # Description of the connection
+# comment "Example Bluetooth device";
+#}
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/bluetooth/serial.conf
^
|
| @@ -0,0 +1,10 @@
+# Configuration file for serial
+
+# There could be multiple proxy sections, the format is [Proxy <user chosen name>]
+#[Proxy DUN]
+
+# UUID for DUN proxy service
+#UUID=00001103-0000-1000-8000-00805F9B34FB
+
+# Address for device node
+#Address=/dev/ttyx
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/dconf/db/vendor.d/locks/silica-configs.txt
^
|
| @@ -1 +1,2 @@
/desktop/sailfish/silica/theme_pixel_ratio
+/desktop/sailfish/silica/theme_icon_subdir
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/dconf/db/vendor.d/silica-configs.txt
^
|
| @@ -1,3 +1,4 @@
[desktop/sailfish/silica]
theme_pixel_ratio=@PIXEL_RATIO@
+theme_icon_subdir='z@ICON_RES@'
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/gps.conf
^
|
| +(symlink to /system/etc/gps.conf)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/izat.conf
^
|
| +(symlink to /system/etc/izat.conf)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/media_codecs.xml
^
|
| +(symlink to /system/etc/media_codecs.xml)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/media_codecs_ffmpeg.xml
^
|
| +(symlink to /system/etc/media_codecs_ffmpeg.xml)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/media_codecs_google_audio.xml
^
|
| +(symlink to /system/etc/media_codecs_google_audio.xml)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/media_codecs_google_telephony.xml
^
|
| +(symlink to /system/etc/media_codecs_google_telephony.xml)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/media_codecs_google_video.xml
^
|
| +(symlink to /system/etc/media_codecs_google_video.xml)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/media_profiles.xml
^
|
| +(symlink to /system/etc/media_profiles.xml)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/mixer_paths.xml
^
|
| +(symlink to /system/etc/mixer_paths.xml)
|
|
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/obexd/excludes/bluetooth:pcsuite
^
|
|
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/obexd/noplugins/ftp
^
|
|
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/obexd/noplugins/irmc
^
|
|
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/obexd/noplugins/mas
^
|
|
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/obexd/noplugins/syncevolution
^
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/obexd/opp.conf
^
|
| @@ -0,0 +1,2 @@
+[OPP]
+DisableFormat=vMessage
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/obexd/pbap.conf
^
|
| @@ -0,0 +1,4 @@
+[PBAP]
+# By default PBAP server listens for incoming connections at channel 15.
+# That can be overridden by specifying a non-default channel.
+# Channel=21
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/obexd/root
^
|
| @@ -0,0 +1 @@
+$HOME
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
| @@ -45,6 +45,9 @@
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
+### Needed on many new devices. HADK guide explains how to implement this fully
+#load-module module-droid-glue
+
load-module module-policy-enforcement
load-module module-role-ducking trigger_roles=alarm,notification,warning ducking_roles=x-maemo volume=-200dB
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/sap.conf
^
|
| +(symlink to /system/etc/sap.conf)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/sec_config
^
|
| +(symlink to /system/etc/sec_config)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/xtra_root_cert.pem
^
|
| +(symlink to /system/etc/xtra_root_cert.pem)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/etc/xtwifi.conf
^
|
| +(symlink to /system/etc/xtwifi.conf)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/lib/systemd/system/actdead.target.wants/droid-hal-init.service
^
|
| +(symlink to ../droid-hal-init.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/lib/udev/platform-device
^
|
| @@ -1,5 +1,5 @@
#!/bin/sh
-RESULT=`echo "$1" | sed "s|/devices/\([^/]*\)/\([^/]*\)/.*|\1/\2|g"`
+RESULT=`echo "$1" | sed "s|/devices/\([^/]*\)/\([^/]*\)/.*|\1/\2|g"| cut -d'/' -f1`
echo ANDROID_BLOCK_DEVICE=$RESULT
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/droid-configs-device/sparse/lib/udev/rules.d/998-droid-system.rules
^
|
| @@ -10,4 +10,4 @@
SUBSYSTEM=="misc", KERNEL=="log_system", SYMLINK+="alog/system"
SUBSYSTEM=="misc", KERNEL=="log_main", SYMLINK+="alog/main"
-ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", IMPORT{program}="/bin/sh /lib/udev/platform-device $env{DEVPATH}", SYMLINK+="block/$env{ANDROID_BLOCK_DEVICE}/by-name/$env{ID_PART_ENTRY_NAME}"
+ENV{ID_PART_ENTRY_SCHEME}=="gpt", ENV{ID_PART_ENTRY_NAME}=="?*", IMPORT{program}="/bin/sh /lib/udev/platform-device $env{DEVPATH}", SYMLINK+="block/platform/$env{ANDROID_BLOCK_DEVICE}/by-name/$env{ID_PART_ENTRY_NAME}"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/patterns/jolla-configuration-find5.yaml
^
|
| @@ -10,15 +10,5 @@
# Early stages of porting benefit from these:
- pattern:sailfish-porter-tools
-# Pre-installed applications, since we don't support OTA well enough:
-- sailfish-office
-- jolla-calculator
-- jolla-email
-- jolla-notes
-- jolla-clock
-- jolla-mediaplayer
-- jolla-calendar
-- sailfish-weather
-
Summary: Jolla Configuration find5
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/patterns/jolla-hw-adaptation-find5.yaml
^
|
| @@ -12,6 +12,7 @@
- droid-hal-find5-detritus
- droid-hal-find5-img-boot
- droid-hal-find5-kernel-modules
+- droid-config-find5-flashing
- droid-config-find5-sailfish
- droid-config-find5-pulseaudio-settings
- droid-config-find5-policy-settings
@@ -58,8 +59,6 @@
# android diag mode only usable for certain android tools
- usb-moded-diag-mode-android
-# from update13, this is needed explicitly
-- bluez-configs-sailfish
# hammerhead, grouper, and maguro use this in scripts, so include for all
- rfkill
@@ -76,6 +75,9 @@
# For devices where test_gps eventually gets a fix:
- geoclue-provider-hybris
+# For offline location provider
+- geoclue-provider-mlsdb
+
# This is a temporary acceptable hack to have orientation sensors
# See README for full description: https://github.com/mer-hybris/unblank-restart-sensors
- unblank-restart-sensors
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/patterns/jolla-ui-configuration-find5.yaml
^
|
| @@ -9,7 +9,7 @@
# Introduced starting Sailfish OS 2.0.4.x:
# 3rd party accounts like Twitter, VK, cloud services, etc
-+- jolla-settings-accounts-extensions-3rd-party-all
+- jolla-settings-accounts-extensions-3rd-party-all
Summary: Jolla UI Configuration find5
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/sparse/etc/ofono/ril_subscription.conf
^
|
| @@ -7,6 +7,10 @@
# other sections are currently ignored.
#
+[Settings]
+
+dataCallFormat=11
+
[ril_0]
# Required entry, defines the RIL socket path
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/sparse/etc/sysconfig/connman
^
|
| @@ -0,0 +1 @@
+SYSCONF_ARGS="--noplugin=jolla_rfkill"
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/sparse/var/lib/flash-partition/device-info
^
|
| @@ -0,0 +1,7 @@
+CPUCHECK_STRING="QCT APQ8064 MTP"
+
+PART_1="boot"
+
+PART_REAL_1="mmcblk0p18"
+
+PART_I="1"
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-find5-0.0.1.tar.bz2/sparse/var/lib/platform-updates/flash-bootimg.sh
^
|
| @@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/sbin/flash-partition boot /boot/hybris-boot.img
|
