|
[-]
[+]
|
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">4825b6f5a8d52eb61b4bdff97bf7e01bbaa6c5be</param>
+ <param name="revision">e8bc61a56da819c972cf308c36ae583342a9c2ad</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.27.tar.bz2/droid-configs-device/droid-configs.inc
^
|
| @@ -70,8 +70,13 @@
BuildRequires: pkgconfig(android-headers)
BuildRequires: repomd-pattern-builder
BuildRequires: qt5-qttools-kmap2qmap
-Provides: bluez-configs
Provides: bluetooth-rfkill-event-configs
+# 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
+# Config packages from usb-moded source with overlapping purposes
+Conflicts: usb-moded-mtp-mode-android-ffs
+Obsoletes: usb-moded-mtp-mode-android-ffs
%description
%{summary}.
@@ -171,6 +176,18 @@
################################################################
+%package flashing
+Provides: droid-config-flashing
+Group: System
+# Sparse image flashing support for flash-partition
+Requires: droid-hal-%{rpm_device}-tools
+Summary: On device flashing files for %{rpm_device} hw
+
+%description flashing
+%{summary}.
+
+################################################################
+
%if 0%{?out_of_image_files:1}
%package out-of-image-files
@@ -186,7 +203,6 @@
################################################################
-
%prep
%if 0%{?_obs_build_project:1}
# For OBS builds we need to have tarball extracted after tar_git packaging it
@@ -218,7 +234,7 @@
deletelist=$2
dorm=$3
if [ -e $deletelist ]; then
- egrep -v '^#' $deletelist | (
+ egrep -v '^#|^$' $deletelist | (
while read file; do
[ "x$dorm" == "x1" ] && rm $RPM_BUILD_ROOT/$file
grep -vE "$file" $files > tmp/$$.files
@@ -231,7 +247,7 @@
files=$1
configlist=$2
if [ -e $configlist ]; then
- egrep -v '^#' $configlist | (
+ egrep -v '^#|^$' $configlist | (
while read file; do
escape=$(echo "$file" | sed 's,/,\\\/,g')
sed -e "s/$escape/%config $escape/g" $files > tmp/$$.files
@@ -290,6 +306,8 @@
sed --in-place '/preinit/d' tmp/droid-config.files
grep "/dconf/db/" tmp/droid-config.files > tmp/sailfish-settings.files
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%{?out_of_image_files:1}
if [ -e out-of-image-files.files ]; then
@@ -378,7 +396,7 @@
%if 0%{?variant_name_list:1}
variants=variant_name.list
if [ -e $variants ]; then
- egrep -v '^#' $variants | (
+ egrep -v '^#|^$' $variants | (
while read line; do
%gen_ks "$line"
sed -i s/@VARIANT_NAME@/$line/g %{buildroot}/%{_datadir}/kickstarts/*$line*.ks
@@ -416,11 +434,20 @@
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}/*
+# To add additional post scripts, one can define those as part
+# of additional_post_scripts macro.
+%{?additional_post_scripts}
+
################################################################
%post sailfish
%{_bindir}/add-oneshot dconf-update || :
@@ -457,6 +484,9 @@
%files sailfish -f tmp/sailfish-settings.files
%defattr(-,root,root,-)
+%files flashing -f tmp/flashing.files
+%defattr(-,root,root,-)
+
%if 0%{?out_of_image_files:1}
%files out-of-image-files -f tmp/out-of-image-files.files
%endif
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.27.tar.bz2/droid-configs-device/patterns/templates/jolla-hw-adaptation-@DEVICE@.yaml
^
|
| @@ -12,6 +12,7 @@
- droid-config-@DEVICE@-pulseaudio-settings
- droid-config-@DEVICE@-policy-settings
- droid-config-@DEVICE@-preinit-plugin
+- droid-config-@DEVICE@-flashing
- droid-hal-version-@DEVICE@
- pulseaudio-modules-droid
@@ -44,7 +45,6 @@
- usb-moded
- usb-moded-defaults-android
- usb-moded-developer-mode-android
-- usb-moded-pc-suite-mode-android
# Extra useful modes not officially supported:
# might need some configuration to get working
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.27.tar.bz2/droid-configs-device/patterns/templates/jolla-ui-configuration-@DEVICE@.yaml
^
|
| @@ -3,5 +3,9 @@
Requires:
- jolla-ambient-z@ICON_RES@
- ambient-icons-closed-z@ICON_RES@
-Summary: Jolla UI Configuration @DEVICE@
+# 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@
|
|
[-]
[+]
|
Added |
_service:tar_git:droid-config-fp2-sibon-0.0.27.tar.bz2/droid-configs-device/sparse/etc/usb-moded/dyn-modes/mtp_mode-droid.ini
^
|
| @@ -0,0 +1,12 @@
+[mode]
+name = mtp_mode
+module = none
+
+[options]
+sysfs_path = /sys/class/android_usb/android0/functions
+sysfs_value = ffs
+sysfs_reset_value = none
+softconnect_path = /sys/class/android_usb/android0/enable
+softconnect = 1
+softconnect_disconnect = 0
+idProduct = 0A07
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.27.tar.bz2/droid-configs-device/sparse/var/lib/nemo-pulseaudio-parameters/algs/mainvolume/ihf
^
|
| @@ -1,2 +1,2 @@
x-nemo.mainvolume.call = "0:-6000,1:-1400,2:-800,3:-450,4:-190,5:0"
-x-nemo.mainvolume.media = "0:-20000,1:-5850,2:-5525,3:-5200,4:-4875,5:-4550,6:-4225,7:-3900,8:-3575,9:-3250,10:-2925,11:-2600,12:-2275,13:-1950,14:-1625,15:-1300,16:-975,17:-650,18:-325,19:0"
+x-nemo.mainvolume.media = "0:-20000,1:-3800,2:-3187,3:-2648,4:-2158,5:-1716,6:-1324,7:-932,8:-612,9:-368,10:-122,11:0"
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.27.tar.bz2/patterns/jolla-hw-adaptation-fp2-sibon.yaml
^
|
| @@ -16,6 +16,7 @@
- droid-config-fp2-sibon-pulseaudio-settings
- droid-config-fp2-sibon-policy-settings
- droid-config-fp2-sibon-preinit-plugin
+- droid-config-fp2-sibon-flashing
- droid-hal-version-fp2-sibon
- pulseaudio-modules-droid
@@ -50,7 +51,6 @@
- usb-moded
- usb-moded-defaults-android
- usb-moded-developer-mode-android
-- usb-moded-pc-suite-mode-android
# Extra useful modes not officially supported:
# might need some configuration to get working
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-config-fp2-sibon-0.0.27.tar.bz2/patterns/jolla-ui-configuration-fp2-sibon.yaml
^
|
| @@ -6,5 +6,9 @@
Requires:
- jolla-ambient-z@ICON_RES@
- ambient-icons-closed-z@ICON_RES@
-Summary: Jolla UI Configuration fp2-sibon
+# 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
|
