Changes - SailfishOS Open Build Service

Changes of Revision 18

[-] [+]	Changed	_service:tar_git:droid-config-titan.spec
@@ -86,7 +86,7 @@ Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 1.2 +Version: 1.2+hybris.12.1.20171107192838.1.ga03853e Release: 1 Group: Configs License: GPLv2 @@ -449,7 +449,14 @@ 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} @@ -461,11 +468,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' \ @@ -474,8 +482,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 @@ -561,8 +567,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.
	Added	_service:tar_git:droid-config-titan-1.2+hybris.12.1.20171107192838.1.ga03853e.tar.bz2 ^
	Deleted	_service:tar_git:droid-config-titan-1.2.tar.bz2 ^