Changes - SailfishOS Open Build Service

Changes of Revision 6

[-] [+]	Changed	_service:tar_git:droid-config-gemini.spec
@@ -17,6 +17,8 @@ # We assume most devices will %define have_modem 1 +Provides: ofono-configs + # This file should be %%included into a device specific spec file # where macros are defined: # @@ -88,7 +90,7 @@ Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 1+master.20170720142441.ba4fe5b +Version: 1+master.20171112031821.c96ff33 Release: 1 Group: Configs License: GPLv2 @@ -442,12 +444,24 @@ sed --in-place 's\|@PIXEL_RATIO@\|%{pixel_ratio}\|' %{buildroot}/etc/dconf/db/vendor.d/silica-configs.txt +%define start_drag_distance %(awk 'BEGIN{print int(%{pixel_ratio}20)}') +sed --in-place 's\|@START_DRAG_DISTANCE@\|%{start_drag_distance}\|' %{buildroot}/etc/xdg/QtProject/QPlatformTheme.conf + # 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/* +# In localbuilds it will break the system, because droid-hal-version-$DEVICE is +# not built yet. Also it will pull many unnecessary things into the SDK target. +%if 0%{?_obs_build_project:1} +sed --in-place 's\|@DEVICE@\|%{rpm_device}\|' %{buildroot}/etc/zypp/systemCheck.d/.check +%else +sed --in-place '/systemCheck.d/d' tmp/droid-config.files +rm -f %{buildroot}/etc/zypp/systemCheck.d/.check +%endif + # SSU board mapping for hardware adaptation %if 0%{!?provides_own_board_mapping:1} mkdir -p $RPM_BUILD_ROOT/%{board_mapping_dir} @@ -458,11 +472,12 @@ -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} +%endif %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} +sed --in-place '/adaptation-repos=/d' $RPM_BUILD_ROOT/%{board_mapping_dir}/.ini # ...and make a separate adaptation repo for community: mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/ sed -e 's\|@DEVICE@\|%{rpm_device}\|g' \ @@ -471,8 +486,6 @@ >$RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/adaptation-community.ini %endif -%endif - # Copy kickstart packs (for %%{rpm_device}-kickstart-configuration) mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/pack/%{rpm_device} DEST_UPDATER=$RPM_BUILD_ROOT/%{_datadir}/ssu/kickstart/pack/%{rpm_device}/hybris @@ -558,8 +571,8 @@ ################################################################ %post # Force an update of ssu repositories -touch %{board_mapping_dir}/ -touch %{_datadir}/ssu/features.d/* +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.
[-] [+]	Changed	_service ^
@@ -6,6 +6,6 @@ <service name="tar_git"> <param name="url">https://github.com/zhxt/droid-config-gemini.git</param> <param name="branch">master</param> - <param name="revision">ba4fe5bea01194079a93c90c3e4ad7741832cdb9</param> + <param name="revision">c96ff33c206dc483c56feec6359abbbad316e45c</param> </service> </services>
	Deleted	_service:tar_git:droid-config-gemini-1+master.20170720142441.ba4fe5b.tar.bz2 ^
	Added	_service:tar_git:droid-config-gemini-1+master.20171112031821.c96ff33.tar.bz2 ^