|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<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">effbd6483e0fe8d38a01470ebbf79575d3a72e59</param>
+ <param name="revision">300ab776d75998ed1ff6adef6f300277c2401e8d</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/droid-configs-device/patterns/hybris/jolla-hw-adaptation-hybris-droid-vibrator.yaml
^
|
| @@ -1,8 +0,0 @@
-Description: Hybris HW Adaptation Pattern for Droid Vibrator
-Name: jolla-hw-adaptation-hybris-droid-vibrator
-Requires:
-- ngfd-plugin-droid-vibrator
-- qt5-feedback-haptics-droid-vibrator
-
-Summary: Jolla HW Adaptation Hybris Droid Vibrator
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/droid-configs-device/patterns/hybris/jolla-hw-adaptation-hybris.yaml
^
|
| @@ -1,22 +0,0 @@
-Description: Pattern with packages for the generic Hybris HW Adaptation
-Name: jolla-hw-adaptation-hybris
-Requires:
-- libhybris
-- libhybris-libEGL
-- libhybris-libGLESv1
-- libhybris-libGLESv2
-- libhybris-libOpenCL
-- libhybris-libOpenVG
-- libhybris-libhardware
-- libhybris-libnfc
-- libhybris-libsync
-- libhybris-libwayland-egl
-- libhybris-tests
-- libhybris-libvibrator
-
-- hybris-libsensorfw-qt5
-
-- qt5-plugin-generic-evdev
-
-Summary: Jolla HW Adaptation Hybris
-
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/droid-configs-device/patterns/templates/jolla-ui-configuration-@DEVICE@.yaml
^
|
| @@ -1,11 +0,0 @@
-Description: Pattern with UI related packages for @DEVICE@ configurations
-Name: jolla-ui-configuration-@DEVICE@
-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 @DEVICE@
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/droid-configs-device/sparse/lib/systemd/system/basic.target.wants/droid-battery-monitor.service
^
|
| -(symlink to ../droid-battery-monitor.service)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/droid-configs-device/sparse/lib/systemd/system/droid-battery-monitor.service
^
|
| @@ -1,11 +0,0 @@
-[Unit]
-Description=Load and save battery aging data
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/system/bin/battery_monitor
-ExecStop=/system/bin/battery_shutdown
-
-[Install]
-WantedBy=basic.target
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/patterns/jolla-ui-configuration-fp2-sibon.yaml
^
|
| @@ -1,14 +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 UI related packages for fp2-sibon configurations
-Name: jolla-ui-configuration-fp2-sibon
-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 fp2-sibon
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/sparse/etc/acdbdata
^
|
| -(symlink to /system/etc/acdbdata)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/sparse/etc/gps.conf
^
|
| -(symlink to /system/etc/gps.conf)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/sparse/etc/izat.conf
^
|
| -(symlink to /system/etc/izat.conf)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/sparse/etc/media_codecs.xml
^
|
| -(symlink to /system/etc/media_codecs.xml)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/sparse/etc/media_codecs_google_audio.xml
^
|
| -(symlink to /system/etc/media_codecs_google_audio.xml)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/sparse/etc/media_codecs_google_telephony.xml
^
|
| -(symlink to /system/etc/media_codecs_google_telephony.xml)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/sparse/etc/media_codecs_google_video.xml
^
|
| -(symlink to /system/etc/media_codecs_google_video.xml)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/sparse/etc/media_profiles.xml
^
|
| -(symlink to /system/etc/media_profiles.xml)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/sparse/etc/mixer_paths.xml
^
|
| -(symlink to /system/etc/mixer_paths.xml)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/sparse/etc/sap.conf
^
|
| -(symlink to /system/etc/sap.conf)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/sparse/etc/sec_config
^
|
| -(symlink to /system/etc/sec_config)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/sparse/etc/xtra_root_cert.pem
^
|
| -(symlink to /system/etc/xtra_root_cert.pem)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/sparse/etc/xtwifi.conf
^
|
| -(symlink to /system/etc/xtwifi.conf)
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.31.tar.bz2/sparse/lib/systemd/system/basic.target.wants/wifi-module-load.service
^
|
| -(symlink to ../wifi-module-load.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/droid-config-@DEVICE@.spec.template
^
|
| @@ -1,4 +1,5 @@
# These and other macros are documented in ../droid-configs-device/droid-configs.inc
+# Feel free to cleanup this file by removing comments, once you have memorised them ;)
%define device @DEVICE@
%define vendor @VENDOR@
@@ -6,13 +7,19 @@
%define vendor_pretty @VENDOR_PRETTY@
%define device_pretty @DEVICE_PRETTY@
-%define dcd_path ./
-
# Community HW adaptations need this
%define community_adaptation 1
-# Adjust this for your device
+# Sailfish OS is considered to-scale, if in app grid you get 4-in-a-row icons
+# and 2x2 or 3x3 covers when up-to-4 or 5-or-more apps are open respectively.
+# For 4-5.5" device screen sizes of 16:9 ratio, use this formula (hold portrait):
+# pixel_ratio = 4.5/DiagonalDisplaySizeInches * HorizontalDisplayResolution/540
+# Other screen sizes and ratios will require more trial-and-error.
%define pixel_ratio 1.0
%include droid-configs-device/droid-configs.inc
+# IMPORTANT if you want to comment out any macros in your .spec, delete the %
+# sign, otherwise they will remain defined! E.g.:
+#define some_macro "I'll not be defined because I don't have % in front"
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -27,10 +27,6 @@
# Nexus 5: 2.0
# Nexus 4: pixel_ratio=1.3 (icon resolution then drops to 1.0)
-# IMPORTANT if you want to comment out any macros in your .spec, delete the %
-# sign, otherwise they will remain defined! E.g.:
-#define some_macro "I'll not be defined because I don't have % in front"
-
# Overwriting other configs:
# If your droid-config-$DEVICE needs to provide one or more device-specific
# configuration files, do the following:
@@ -51,12 +47,11 @@
%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}
-%define dcd_path hybris/droid-configs
-%endif
+# dcd_path is defined for hysterical reasons (coming from dhd builds on OBS)
+# now obsolete, hence always the default:
+%define dcd_path .
+# 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
@@ -257,9 +252,36 @@
Provides: bluez-configs
Conflicts: bluez5-configs
Obsoletes: bluez-configs-sailfish
+Obsoletes: bluez-configs-mer
%description bluez4
%{summary}.
+
+%package bluez5
+Summary: %{rpm_device} packages for BlueZ 5
+Conflicts: droid-config-%{rpm_device}-bluez4
+Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}
+Provides: %{rpm_device}-bluez-configs
+
+Requires: bluez5
+Conflicts: bluez
+
+Requires: bluez5-libs
+Conflicts: bluez-libs
+
+Requires: bluez5-obexd
+Conflicts: obexd
+
+Requires: kf5bluezqt-bluez5
+Conflicts: kf5bluezqt-bluez4
+
+Provides: bluez5-configs
+Conflicts: bluez-configs
+Obsoletes: bluez-configs-sailfish
+
+%description bluez5
+%{summary}.
%endif
################################################################
@@ -286,7 +308,7 @@
config_dir=$1
if [ -d $config_dir ]; then
(cd $config_dir; find . \( -type f -or -type l \) -print ) | sed 's/^.//' >> tmp/droid-config.files
- cp -R $config_dir/* $RPM_BUILD_ROOT/
+ cp -Rf $config_dir/* $RPM_BUILD_ROOT/
fi
}
@@ -355,9 +377,19 @@
done)
%endif
+# 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
# We want to keep some files in separate subpackages.
# NOTE: some files might get to wrong place with this because of string assumption.
+%if 0%{?have_bluetooth:1}
+grep bluez4 tmp/droid-config.files > tmp/bluez4.files || true
+sed --in-place '/bluez4/d' tmp/droid-config.files
+grep bluez5 tmp/droid-config.files > tmp/bluez5.files || true
+sed --in-place '/bluez5/d' tmp/droid-config.files
+%endif
echo "%defattr(-,root,root,-)" > tmp/policy-settings.files
grep ohm tmp/droid-config.files > tmp/policy-settings.files
sed --in-place '/ohm/d' tmp/droid-config.files
@@ -369,10 +401,6 @@
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
@@ -387,7 +415,6 @@
# 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_common}/patterns/hybris -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}
%if 0%{!?pixel_ratio:1}
@@ -396,13 +423,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.25" && "%{pixel_ratio}" != "1.5" && "%{pixel_ratio}" != "1.75" && "%{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
@@ -512,15 +536,11 @@
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}/*
+touch %{_datadir}/ssu/features.d/*
# To add additional post scripts, one can define those as part
# of additional_post_scripts macro.
@@ -575,5 +595,7 @@
%if 0%{?have_bluetooth:1}
%files bluez4 -f tmp/bluez4.files
%defattr(644,root,root,-)
-%endif
+%files bluez5 -f tmp/bluez5.files
+%defattr(644,root,root,-)
+%endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/patterns/common/sailfish-porter-tools.yaml
^
|
| @@ -3,6 +3,7 @@
Requires:
- jolla-developer-mode
- sailfishsilica-qt5-demos
+- libhybris-tests
- busybox-static
- net-tools
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/patterns/templates/jolla-configuration-@DEVICE@.yaml
^
|
| @@ -4,8 +4,26 @@
- pattern:jolla-hw-adaptation-@DEVICE@
- pattern:jolla-sailfish-applications
- pattern:jolla-ui-wayland
+# For devices with cellular modem. Those without one, please comment out:
+- pattern:jolla-sailfish-cellular-apps
# Early stages of porting benefit from these:
- pattern:sailfish-porter-tools
+- sailfish-content-graphics-z@ICON_RES@
+
+# For multi-SIM devices
+#- jolla-settings-networking-multisim
+
+# Introduced starting Sailfish OS 2.0.4.x:
+# 3rd party accounts like Twitter, VK, cloud services, etc
+- jolla-settings-accounts-extensions-3rd-party-all
+
+# For Mozilla location services (online)
+- geoclue-provider-mlsdb
+
+# Sailfish OS CSD tool for hardware testing
+# needs some configuration to get all features working
+- csd
+
Summary: Jolla Configuration @DEVICE@
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -1,10 +1,6 @@
Description: Pattern with packages for @DEVICE@ HW Adaptation
Name: jolla-hw-adaptation-@DEVICE@
Requires:
-- pattern:jolla-hw-adaptation-hybris
-- pattern:jolla-hw-adaptation-hybris-droid-vibrator
-- pattern:jolla-ui-configuration-@DEVICE@
-
- droid-hal-@DEVICE@
- droid-hal-@DEVICE@-img-boot
- droid-hal-@DEVICE@-kernel-modules
@@ -13,8 +9,24 @@
- droid-config-@DEVICE@-policy-settings
- droid-config-@DEVICE@-preinit-plugin
- droid-config-@DEVICE@-flashing
+- droid-config-@DEVICE@-bluez4
- droid-hal-version-@DEVICE@
+# Hybris packages
+- libhybris-libEGL
+- libhybris-libGLESv2
+- libhybris-libwayland-egl
+
+# Sensors
+- hybris-libsensorfw-qt5
+
+# Vibra
+- ngfd-plugin-droid-vibrator
+- qt5-feedback-haptics-droid-vibrator
+
+# Needed for /dev/touchscreen symlink
+- qt5-plugin-generic-evdev
+
- pulseaudio-modules-droid
# for audio recording to work:
- qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
@@ -24,18 +36,14 @@
- qt5-qpa-hwcomposer-plugin
- qtscenegraph-adaptation
-# GStreamer v0.10 multimedia support is being deprecated
-#- gstreamer0.10-droidcamsrc
-#- gstreamer0.10-omx
-#- gstreamer0.10-droideglsink
-#- nemo-qtmultimedia-plugins-gstvideotexturebackend
-
# Add GStreamer v1.0 as standard
- gstreamer1.0
- gstreamer1.0-plugins-good
- gstreamer1.0-plugins-base
- gstreamer1.0-plugins-bad
- nemo-gstreamer1.0-interfaces
+# For devices with droidmedia and gst-droid built, see HADK pdf for more information
+#- gstreamer1.0-droid
# This is needed for notification LEDs
- mce-plugin-libhybris
@@ -48,29 +56,24 @@
# Extra useful modes not officially supported:
# might need some configuration to get working
-- usb-moded-mass-storage-android-config
+#- usb-moded-mass-storage-android-config
# working but careful with roaming!
- usb-moded-connection-sharing-android-config
# android diag mode only usable for certain android tools
-- usb-moded-diag-mode-android
+#- 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
# enable device lock and allow to select untrusted software
- jolla-devicelock-plugin-encsfa
-# Settings app needs this since update15
-- jolla-settings-layout
-
-# For devices with working cellular modem:
-#- pattern:jolla-sailfish-cellular-apps
-#- telepathy-ring
+# For GPS
+- geoclue-provider-hybris
-# For devices where test_gps eventually gets a fix:
-#- geoclue-provider-hybris
+# For FM radio on some QCOM devices
+#- qt5-qtmultimedia-plugin-mediaservice-irisradio
+#- jolla-mediaplayer-radio
Summary: Jolla HW Adaptation @DEVICE@
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/sparse/etc/acdbdata
^
|
| +(symlink to /system/etc/acdbdata)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/sparse/etc/audio_platform_info.xml
^
|
| +(symlink to /system/etc/audio_platform_info.xml)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.32.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-fp2-sibon-0.0.32.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-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/sparse/etc/gps.conf
^
|
| +(symlink to /system/etc/gps.conf)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/sparse/etc/izat.conf
^
|
| +(symlink to /system/etc/izat.conf)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/sparse/etc/media_codecs.xml
^
|
| +(symlink to /system/etc/media_codecs.xml)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.32.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-fp2-sibon-0.0.32.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-fp2-sibon-0.0.32.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-fp2-sibon-0.0.32.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-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/sparse/etc/media_profiles.xml
^
|
| +(symlink to /system/etc/media_profiles.xml)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/sparse/etc/mixer_paths.xml
^
|
| +(symlink to /system/etc/mixer_paths.xml)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
| @@ -41,6 +41,11 @@
load-module module-droid-card rate=48000 mute_routing_before=24576 mute_routing_after=4096
+### Needed on many new devices. HADK guide explains how to implement this fully
+.ifexists module-droid-glue.so
+load-module module-droid-glue
+.endif
+
load-module module-null-sink sink_name=sink.fake.sco rate=8000 channels=1
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
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/sparse/etc/sap.conf
^
|
| +(symlink to /system/etc/sap.conf)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/sparse/etc/sec_config
^
|
| +(symlink to /system/etc/sec_config)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.32.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-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/sparse/etc/xtwifi.conf
^
|
| +(symlink to /system/etc/xtwifi.conf)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/droid-configs-device/sparse/usr/bin/droid/droid-hal-startup.sh
^
|
| @@ -1,6 +1,5 @@
#!/bin/sh
cd /
-sh /usr/libexec/droid/android-permission-fixup.sh &> /dev/null
touch /dev/.coldboot_done
export LD_LIBRARY_PATH=/usr/libexec/droid-hybris/system/lib/:/vendor/lib:/system/lib
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/patterns/jolla-configuration-fp2-sibon.yaml
^
|
| @@ -1,14 +1,29 @@
-# 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 fp2-sibon configurations
Name: jolla-configuration-fp2-sibon
Requires:
- pattern:jolla-hw-adaptation-fp2-sibon
- pattern:jolla-sailfish-applications
- pattern:jolla-ui-wayland
+# For devices with cellular modem. Those without one, please comment out:
+- pattern:jolla-sailfish-cellular-apps
# Early stages of porting benefit from these:
- pattern:sailfish-porter-tools
+- sailfish-content-graphics-z@ICON_RES@
+
+# For multi-SIM devices
+- jolla-settings-networking-multisim
+
+# Introduced starting Sailfish OS 2.0.4.x:
+# 3rd party accounts like Twitter, VK, cloud services, etc
+- jolla-settings-accounts-extensions-3rd-party-all
+
+# For Mozilla location services (online)
+- geoclue-provider-mlsdb
+
+# Sailfish OS CSD tool for hardware testing
+# needs some configuration to get all features working
+- csd
+
Summary: Jolla Configuration fp2-sibon
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/patterns/jolla-hw-adaptation-fp2-sibon.yaml
^
|
| @@ -1,13 +1,6 @@
-# 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 fp2-sibon HW Adaptation
Name: jolla-hw-adaptation-fp2-sibon
Requires:
-- pattern:jolla-hw-adaptation-hybris
-- pattern:jolla-hw-adaptation-hybris-droid-vibrator
-- pattern:jolla-ui-configuration-fp2-sibon
-
- droid-hal-fp2-sibon
- droid-hal-fp2-sibon-detritus
- droid-hal-fp2-sibon-img-boot
@@ -17,8 +10,24 @@
- droid-config-fp2-sibon-policy-settings
- droid-config-fp2-sibon-preinit-plugin
- droid-config-fp2-sibon-flashing
+- droid-config-fp2-sibon-bluez4
- droid-hal-version-fp2-sibon
+# Hybris packages
+- libhybris-libEGL
+- libhybris-libGLESv2
+- libhybris-libwayland-egl
+
+# Sensors
+- hybris-libsensorfw-qt5
+
+# Vibra
+- ngfd-plugin-droid-vibrator
+- qt5-feedback-haptics-droid-vibrator
+
+# Needed for /dev/touchscreen symlink
+- qt5-plugin-generic-evdev
+
- pulseaudio-modules-droid
# for audio recording to work:
- qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
@@ -28,12 +37,6 @@
- qt5-qpa-hwcomposer-plugin
- qtscenegraph-adaptation
-# GStreamer v0.10 multimedia support is being deprecated
-#- gstreamer0.10-droidcamsrc
-#- gstreamer0.10-omx
-#- gstreamer0.10-droideglsink
-#- nemo-qtmultimedia-plugins-gstvideotexturebackend
-
# Add GStreamer v1.0 as standard
- gstreamer1.0
- gstreamer1.0-plugins-good
@@ -66,16 +69,8 @@
# enable device lock and allow to select untrusted software
- jolla-devicelock-plugin-encsfa
-# Settings app needs this since update15
-- jolla-settings-layout
-
-# For devices with working cellular modem:
-- pattern:jolla-sailfish-cellular-apps
-- telepathy-ring
-
-# For devices where test_gps eventually gets a fix:
+# For GPS
- geoclue-provider-hybris
-- geoclue-provider-mlsdb
# for audio during calls
- pulseaudio-modules-droid-glue
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/sparse/lib/systemd/system/basic.target.wants/wlan-module-load.service
^
|
| +(symlink to ../wlan-module-load.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/sparse/lib/systemd/system/wlan-module-load.service
^
|
| (renamed from sparse/lib/systemd/system/wifi-module-load.service)
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.32.tar.bz2/sparse/usr/share/csd/settings.d/hw-settings.ini
^
|
| @@ -0,0 +1,43 @@
+[features]
+AudioMic1=1
+AudioMic2=1
+BackCamera=1
+Backlight=1
+Battery=1
+Bluetooth=1
+CellularData=1
+ECompass=1
+FmRadio=1
+FrontCamera=1
+GPS=1
+CellInfo=1
+GSensor=1
+Gyro=1
+Headset=1
+Key=1
+LCD=1
+LED=1
+LightSensor=1
+Loudspeaker=1
+ProxSensor=1
+Receiver=1
+SDCard=1
+SIM=1
+StereoLoudspeaker=0
+Touch=1
+UsbCharging=1
+UsbOtg=1
+Vibrator=1
+Wifi=1
+
+[BackCamera]
+Flash=1
+
+[FrontBackCamera]
+RunInTestPassRateRequirement=0.95
+
+[SIM]
+ModemCount=2
+
+[FmRadio]
+DefaultFrequency=98.7
|
