Changes - SailfishOS Open Build Service

Changes of Revision 20

[-] [+]	Changed	_service:tar_git:droid-config-fp2-sibon.changes
@@ -1,3 +1,6 @@ +* Thu Dec 15 2016 Matti Lehtimäki <matti.lehtimaki@gmail.com> - 0.0.30 +- [patterns] Update submodule and adapt patterns and spec accordingly. + * Sun Nov 27 2016 Matti Lehtimäki <matti.lehtimaki@gmail.com> - 0.0.29 - [bluetooth] Fix remembering bluetooth state during reboot.
[-] [+]	Changed	_service:tar_git:droid-config-fp2-sibon.spec ^
@@ -12,18 +12,17 @@ # We assume most devices will %define have_modem 1 -Provides: bluez-configs -Conflicts: bluez-configs-sailfish -Obsoletes: bluez-configs-sailfish -Provides: obexd-configs -Conflicts: obexd-configs-sailfish -Obsoletes: obexd-configs-sailfish +# Community HW adaptations need this +%define community_adaptation 1 + Provides: ofono-configs Provides: sensord-configs # 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> @@ -35,7 +34,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 @@ -61,6 +61,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} @@ -84,7 +94,7 @@ Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 0.0.29+2.0.5.20161201200723.2.gdcc63ab +Version: 0.0.30 Release: 1 Group: Configs License: GPLv2 @@ -93,7 +103,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 @@ -226,6 +251,39 @@ ################################################################ +%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 + +%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 @@ -331,6 +389,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 @@ -355,7 +417,7 @@ 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" +%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} @@ -373,6 +435,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) @@ -482,6 +557,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,-) @@ -514,3 +592,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 ^
@@ -5,8 +5,8 @@ </service> <service name="tar_git"> <param name="url">https://github.com/mlehtima/droid-config-fp2-sibon.git</param> - <param name="branch">2.0.5</param> - <param name="revision">dcc63ab424249b8d2bfe7fabcce878686b93db50</param> + <param name="branch">master</param> + <param name="revision">ff4473ed0c4e0a62099a7974aa91edf1f49866ed</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.29+2.0.5.20161201200723.2.gdcc63ab.tar.bz2/sparse/etc/obexd/excludes/bluetooth:pcsuite ^
	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.29+2.0.5.20161201200723.2.gdcc63ab.tar.bz2/sparse/etc/obexd/noplugins/ftp ^
	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.29+2.0.5.20161201200723.2.gdcc63ab.tar.bz2/sparse/etc/obexd/noplugins/irmc ^
	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.29+2.0.5.20161201200723.2.gdcc63ab.tar.bz2/sparse/etc/obexd/noplugins/mas ^
	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.29+2.0.5.20161201200723.2.gdcc63ab.tar.bz2/sparse/etc/obexd/noplugins/syncevolution ^
[-] [+]	Deleted	_service:tar_git:droid-config-fp2-sibon-0.0.29+2.0.5.20161201200723.2.gdcc63ab.tar.bz2/sparse/etc/obexd/opp.conf ^
@@ -1,2 +0,0 @@ -[OPP] -DisableFormat=vCal1.0,iCal2.0,vNote,vMessage
[-] [+]	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.30.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-fp2-sibon-0.0.30.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,39 @@ ################################################################ +%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 + +%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 +369,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 @@ -332,7 +397,7 @@ 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" +%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} @@ -350,6 +415,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) @@ -459,6 +537,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 +572,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-fp2-sibon-0.0.30.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-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/bluetooth/audio.conf ^
(renamed from sparse/etc/bluetooth/audio.conf)
[-] [+]	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/bluetooth/input.conf ^
(renamed from sparse/etc/bluetooth/input.conf)
[-] [+]	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/bluetooth/jolla.conf ^
(renamed from sparse/etc/bluetooth/jolla.conf)
[-] [+]	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/bluetooth/main.conf ^
(renamed from sparse/etc/bluetooth/main.conf)
[-] [+]	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/bluetooth/network.conf ^
(renamed from sparse/etc/bluetooth/network.conf)
[-] [+]	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/bluetooth/rfcomm.conf ^
(renamed from sparse/etc/bluetooth/rfcomm.conf)
[-] [+]	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/bluetooth/serial.conf ^
(renamed from sparse/etc/bluetooth/serial.conf)
	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/obexd/excludes/bluetooth:pcsuite ^
	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/obexd/noplugins/ftp ^
	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/obexd/noplugins/irmc ^
	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/obexd/noplugins/mas ^
	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/obexd/noplugins/syncevolution ^
[-] [+]	Added	_service:tar_git:droid-config-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/obexd/opp.conf ^
@@ -0,0 +1,2 @@ +[OPP] +DisableFormat=vMessage
[-] [+]	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/obexd/pbap.conf ^
(renamed from sparse/etc/obexd/pbap.conf)
[-] [+]	Added	_service:tar_git:droid-config-fp2-sibon-0.0.30.tar.bz2/droid-configs-device/sparse/etc/obexd/root ^
@@ -0,0 +1 @@ +$HOME
[-] [+]	Changed	_service:tar_git:droid-config-fp2-sibon-0.0.30.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-fp2-sibon-0.0.30.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-fp2-sibon-0.0.30.tar.bz2/patterns/jolla-hw-adaptation-fp2-sibon.yaml ^
@@ -60,10 +60,6 @@ # android diag mode only usable for certain android tools #- usb-moded-diag-mode-android -# from update13, this is needed explicitly -#- bluez-configs-sailfish -# configurations for OBEX -#- obexd-configs-sailfish # hammerhead, grouper, and maguro use this in scripts, so include for all - rfkill