|
[-]
[+]
|
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">e6036c3505b0c0fee48a1c2598ad00d4a981f46a</param>
+ <param name="revision">433eeab0a959421dd46b50e072751daa04bd8eb0</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.63.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -78,6 +78,7 @@
BuildRequires: pkgconfig(android-headers)
BuildRequires: repomd-pattern-builder
BuildRequires: qt5-qttools-kmap2qmap
+Requires: droid-hal
%if 0%{?community_adaptation:1}
# because it provides one ssu feature, do:
Requires: community-adaptation
@@ -495,15 +496,18 @@
cp -rf %{dcd_path}/kickstart/* $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/
fi
-# if we are building on Mer OBS or locally, make a domain=sales .ks
-# so it works for HADK users:
-%define disturl_subst %(echo %{disturl} | grep jollamobile.com)
-%if "%{disturl_subst}" == ""
- echo "Setting domain to sales"
- %define ssu_override domain=sales
-%else
- echo "Setting domain to jolla"
- %define ssu_override domain=jolla
+# Do not set ssu_override if it is already defined
+%if 0%{!?ssu_override:1}
+ # if we are building on Mer OBS or locally, make a domain=sales .ks
+ # so it works for HADK users:
+ %define disturl_subst %(echo %{disturl} | grep jollamobile.com)
+ %if "%{disturl_subst}" == ""
+ echo "Setting domain to sales"
+ %define ssu_override domain=sales
+ %else
+ echo "Setting domain to jolla"
+ %define ssu_override domain=jolla
+ %endif
%endif
# build rnd kickstarts on devel level, release kickstarts on all other levels
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.63.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -75,5 +75,9 @@
#- qt5-qtmultimedia-plugin-mediaservice-irisradio
#- jolla-mediaplayer-radio
+# NFC for devices using Android 8 or newer as base
+#- nfcd-binder-plugin
+#- jolla-settings-system-nfc
+
Summary: Jolla HW Adaptation @DEVICE@
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.63.tar.bz2/droid-configs-device/sparse/etc/pulse/arm_droid_default.pa
^
|
| @@ -23,7 +23,12 @@
.fail
-load-module module-droid-keepalive
+# Transitional check as keepalive module is moved away from droid modules.
+.ifexists module-keepalive.so
+ load-module module-keepalive
+.else
+ load-module module-droid-keepalive
+.endif
### If droid-card needs other arguments than the default, have the new
### load-module line in /etc/pulse/arm_droid_card_custom.pa
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.63.tar.bz2/droid-configs-device/sparse/etc/pulse/xpolicy.conf
^
|
| @@ -570,6 +570,11 @@
set-property = module-name@equals:module-policy-enforcement, property:"x-nemo.voicecall.status", value@constant:"inactive"
[context-rule]
+variable = call
+value = equals:voip
+set-property = module-name@equals:module-policy-enforcement, property:"x-nemo.voicecall.status", value@constant:"voip"
+
+[context-rule]
variable = media_state
value = matches:"^[^t].*"
set-property = module-name@equals:module-policy-enforcement, property:"x-nemo.media.state", value@copy-from-context
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.63.tar.bz2/droid-configs-device/sparse/etc/selinux/config
^
|
| @@ -0,0 +1 @@
+SELINUX=disabled
|
