|
[-]
[+]
|
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">f9bd6737dd14ec1f12c32a799bf6e41057066820</param>
+ <param name="revision">c681571200b857c04ea121ecb98320009b838191</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.66.tar.bz2/droid-configs-device/sparse/usr/share/environment/nemo/hybris.conf
^
|
| @@ -1,2 +0,0 @@
-# Ensure that we can find hybris libs from any hybris-enabled binary
-HYBRIS_LD_LIBRARY_PATH=/usr/libexec/droid-hybris/system/lib:/vendor/lib:/system/lib
|
|
[-]
[+]
|
Deleted |
_service:tar_git:droid-config-fp2-sibon-0.0.66.tar.bz2/droid-configs-device/sparse/var/lib/environment/nemo/99-hybris.conf
^
|
| @@ -1,2 +0,0 @@
-# Ensure that we can find hybris libs from any hybris-enabled binary
-HYBRIS_LD_LIBRARY_PATH=/usr/libexec/droid-hybris/system/lib:/vendor/lib:/system/lib
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -70,8 +70,12 @@
Provides: droid-config
Summary: Config packages for Droid HAL adaptations
Version: 1
+%if 0%{?_obs_build_project:1}
Release: 1
-Group: Configs
+%else
+%define rel_date %(date +'%%Y%%m%%d%%H%%M')
+Release: %{rel_date}
+%endif
License: GPLv2
Source0: %{name}-%{version}.tar.bz2
BuildRequires: ssu-kickstart-configuration
@@ -190,7 +194,6 @@
%package sailfish
Provides: droid-config-sailfish
Provides: theme-configs
-Group: System
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: oneshot
@@ -204,7 +207,6 @@
%package flashing
Provides: droid-config-flashing
-Group: System
# Sparse image flashing support for flash-partition
Requires: droid-hal-tools
Summary: On device flashing files for %{rpm_device} hw
@@ -217,7 +219,6 @@
%if 0%{?out_of_image_files:1}
%package out-of-image-files
-Group: System
BuildArch: noarch
Summary: Files that are used for flashing and are not needed on device.
@@ -233,8 +234,6 @@
%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
@@ -263,25 +262,29 @@
%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
+Obsoletes: bluez
Requires: bluez5-libs
Conflicts: bluez-libs
+Obsoletes: bluez-libs
Requires: bluez5-obexd
Conflicts: obexd
+Obsoletes: obexd
Requires: kf5bluezqt-bluez5
Conflicts: kf5bluezqt-bluez4
+Obsoletes: kf5bluezqt-bluez4
+Obsoletes: kf5bluezqt-bluez4-declarative
Provides: bluez5-configs
Conflicts: bluez-configs
Obsoletes: bluez-configs-sailfish
+Obsoletes: bluez-configs-mer
%description bluez5
%{summary}.
@@ -305,13 +308,49 @@
mkdir -p tmp/
echo "%defattr(-,root,root,-)" > tmp/droid-config.files
-# Prefer files from sparse/ in the HA specific
-# area over sparse/ in the dcd area
+# On 64-bit ARM certain subdirs should not be moved to lib64 but kept under lib.
+# Algorithm below autodetects cases under sparse/ so adaptations do not have to
+# make any changes to their trees when going from armv7hl to aarch64.
+do_not_move_to_lib64=(
+ "firmware"
+ "modules"
+ "startup"
+ "systemd/system"
+ "systemd/user"
+ "tmpfiles.d"
+ "udev"
+ )
copy_files_from() {
config_dir=$1
if [ -d $config_dir ]; then
- (cd $config_dir; find . \( -type f -o -type l \) -print ) | sed 's/^.//' >> tmp/droid-config.files
- cp -Rf $config_dir/* $RPM_BUILD_ROOT/
+ olddir=$PWD
+ cd $config_dir
+ for f in $(find . \( -type f -o -type l \) -print); do
+ dst=$(echo $f | sed 's/^.//')
+ if echo $dst | grep -qE "^/usr/lib/|^/lib/"; then
+ move_to_lib64=true
+ for stay_in_lib in "${do_not_move_to_lib64[@]}"; do
+ if echo $dst | grep -qE "^/usr/lib/$stay_in_lib/|^/lib/$stay_in_lib/"; then
+ move_to_lib64=false
+ break
+ fi
+ done
+ if [ "$move_to_lib64" = true ]; then
+ if echo $dst | grep -q "^/usr/lib/"; then
+ dst=$(echo $dst | sed 's /usr/lib/ %{_libdir}/ ')
+ else
+ dst=$(echo $dst | sed 's /lib/ /%{_lib}/ ')
+ fi
+ fi
+ fi
+ dstdir=$RPM_BUILD_ROOT$(dirname $dst)
+ if [ ! -d $dstdir ]; then
+ mkdir -p $dstdir
+ fi
+ cp -Pv $f $dstdir
+ echo $dst >> $olddir/tmp/droid-config.files
+ done
+ cd - >/dev/null
fi
}
@@ -512,12 +551,20 @@
%endif
%endif
+%if 0%{?_obs_build_project:1}
# build rnd kickstarts on devel and branch_devel level, release kickstarts on all other levels
%if 0%{?qa_stage_devel:1} || 0%{?qa_stage_branch_devel:1}
KS_LEVELS=true
%else
KS_LEVELS=false
%endif
+%else
+ if ssu s 2>/dev/null | grep -q "Release (rnd): latest (devel)"; then
+ KS_LEVELS=true
+ else
+ KS_LEVELS=false
+ fi
+%endif
# build variant ks files if name file exist
%if 0%{?variant_name_list:1}
@@ -534,12 +581,12 @@
%endif
# Preinit plugins
-ln -s /bin/false $RPM_BUILD_ROOT%{_libdir}/startup/preinit/is_total_erase_supported
+ln -s /bin/false $RPM_BUILD_ROOT%{_prefix}/lib/startup/preinit/is_total_erase_supported
# Create keyboard map file
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/qt5/keymaps
-/usr/lib/qt5/bin/kmap2qmap %{dcd_common}/configs/droid.kmap %{dcd_common}/configs/us.kmap $RPM_BUILD_ROOT/%{_datadir}/qt5/keymaps/droid.qmap
-/usr/lib/qt5/bin/kmap2qmap %{dcd_path}/configs/droid.kmap %{dcd_path}/configs/us.kmap $RPM_BUILD_ROOT/%{_datadir}/qt5/keymaps/droid.qmap || true
+%{_libdir}/qt5/bin/kmap2qmap %{dcd_common}/configs/droid.kmap %{dcd_common}/configs/us.kmap $RPM_BUILD_ROOT/%{_datadir}/qt5/keymaps/droid.qmap
+%{_libdir}/qt5/bin/kmap2qmap %{dcd_path}/configs/droid.kmap %{dcd_path}/configs/us.kmap $RPM_BUILD_ROOT/%{_datadir}/qt5/keymaps/droid.qmap || true
clean_files() { sed 's_^./_/_'; }
@@ -602,7 +649,7 @@
%files preinit-plugin
%defattr(-,root,root,-)
-%{_libdir}/startup/preinit/*
+%{_prefix}/lib/startup/preinit/*
%files pulseaudio-settings -f tmp/pulseaudio-settings.files
%defattr(644,root,root,-)
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -28,6 +28,13 @@
- qt5-plugin-generic-evdev
- pulseaudio-modules-droid
+- pulseaudio-modules-droid-hidl
+
+# The -dummy-af is needed for newer devices that run the main
+# audiosystem-passthrough in qti mode (e.g. >=Android 9 Qualcomm),
+# to fix non-responding Camera app and/or voice during a phone call:
+#- audiosystem-passthrough-dummy-af
+
# for audio recording to work:
- qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
@@ -36,14 +43,8 @@
- qt5-qpa-hwcomposer-plugin
- qtscenegraph-adaptation
-# 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
+- gstreamer1.0-droid
# This is needed for notification LEDs
- mce-plugin-libhybris
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/droid-configs-device/sparse/etc/bluez5/bluetooth/main.conf
^
|
| @@ -14,17 +14,16 @@
# 0 = disable timer, i.e. stay discoverable forever
DiscoverableTimeout = 0
+# Always allow pairing even if there are no agent registered
+# Possible values: true, false
+# Default: false
+#AlwaysPairable = false
+
# 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
-# 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. Default is 60.
-AutoConnectTimeout = 60
-
# 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.
@@ -32,9 +31,11 @@
#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'.
+# us. For BR/EDR this option is really only needed for qualification since the
+# BITE tester doesn't like us doing reverse SDP for some test cases, for LE
+# this disables the GATT client functionally so it can be used in system which
+# can only operate as peripheral.
+# Defaults to 'true'.
ReverseServiceDiscovery = true
# Enable name resolving after inquiry. Set it to 'false' if you don't need
@@ -72,6 +73,11 @@
# Defaults to "off"
# Privacy = off
+# Specify the policy to the JUST-WORKS repairing initiated by peer
+# Possible values: "never", "confirm", "always"
+# Defaults to "never"
+#JustWorksRepairing = never
+
[GATT]
# GATT attribute cache.
# Possible values:
@@ -84,6 +90,21 @@
# Default: always
#Cache = always
+# Minimum required Encryption Key Size for accessing secured characteristics.
+# Possible values: 0 and 7-16. 0 means don't care.
+# Defaults to 0
+#KeySize = 0
+
+# Exchange MTU size.
+# Possible values: 23-517
+# Defaults to 517
+#ExchangeMTU = 517
+
+# Number of ATT channels
+# Possible values: 1-5 (1 disables EATT)
+# Default to 3
+#Channels = 3
+
[Policy]
#
# The ReconnectUUIDs defines the set of remote services that should try
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/patterns/jolla-hw-adaptation-fp2-sibon.yaml
^
|
| @@ -37,13 +37,7 @@
- qt5-qpa-hwcomposer-plugin
- qtscenegraph-adaptation
-# 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
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.67.tar.bz2/sparse/etc/ofono/ril_subscription.conf
^
|
| @@ -17,6 +17,8 @@
# Required entry, defines the RIL socket path
socket=/dev/socket/rild
+ecclistFile=/run/ofono/ril.ecclist
+
# Subscription string. Some (mostly, older) RILs require that 4 bytes
# (usually SUB1 or SUB2) are written to the socket before rild starts
# talking to us.
@@ -64,3 +66,5 @@
# Required entry, defines the RIL socket path
socket=/dev/socket/rild2
+
+ecclistFile=/run/ofono/ril.ecclist1
|
