Changes - SailfishOS Open Build Service

Changes of Revision 34

[-] [+]	Changed	_service:tar_git:droid-config-h8324.spec
@@ -35,9 +35,6 @@ # # community_adaptation: needs to be defined for community HW adaptations # -# use_meta_package: define to use meta package jolla-configuration-%{rpm_device} with -# all dependencies instead of patterns -# # Device information: # device: should be the CM codename or the AOSP TARGET_PRODUCT # vendor: determine the droid-side directory used for ./device/<vendor>/<device> @@ -94,13 +91,19 @@ %define rpm_vendor %{vendor} %endif +%if 0%{?android_version_major:1} +# If defined also use android version specfic sparse +# Supersedes the base sparse and is superseded by device specific sparse +%define dcd_sparse_android_version_major droid-configs-device/sparse-%{android_version_major} +%endif + %define board_mapping_dir %{_datadir}/ssu/board-mappings.d %define board_mapping_file %{board_mapping_dir}/05-%{rpm_vendor}-%{rpm_device}.ini Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 0.4.3 +Version: 0.4.3+master.20210307130820.1.g134d58f %if 0%{?_obs_build_project:1} Release: 1 %else @@ -329,6 +332,12 @@ %setup -q -n %{name}-%{version} %endif +%if 0%{?android_version_major:1} +# If defined also use android version specfic sparse +# Supersedes the base sparse and is superseded by device specific sparse +case %{android_version_major} in 8\|9\|10) : ;; ) echo unsupported android_version_major; exit 1; esac +%endif + %install rm -rf %{buildroot} mkdir -p %{buildroot} @@ -415,8 +424,17 @@ # Copy from common; erase any we don't want; overlay from device # specific sparse/ : copy_files_from %{dcd_path}/%{dcd_sparse} +%if 0%{?dcd_sparse_android_version_major:1} +copy_files_from %{dcd_path}/%{dcd_sparse_android_version_major} +%endif delete_files tmp/droid-config.files delete_file.list 1 copy_files_from %{dcd_path}/sparse +%if 0%{?dcd_sparse_android_version_major:1} +if [ -e droid-config-device/delete_file_android_version_major_%{android_version_major}.list ] ; then + delete_files tmp/droid-config.files \ + droid-config-device/delete_file_android_version_major_%{android_version_major}.list +fi +%endif delete_files tmp/droid-config.files delete_file_%{rpm_device}.list 1 # This add %config to %files section for files from rpm-config-files.files config_files tmp/droid-config.files rpm-config-files.files @@ -543,15 +561,19 @@ %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_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' \ - -e 's\|@VENDOR@\|%{rpm_vendor}\|g' \ - %{_datadir}/community-adaptation/adaptation-community.ini.in \ - >$RPM_BUILD_ROOT/%{_datadir}/ssu/features.d/adaptation-community.ini +if [ ! "$(ls -A %{dcd_path}/sparse/%{_datadir}/ssu/repos.d 2> /dev/null)" ]; then + # Community ports that do not override repos in ssu/repos.d are catered by + # the community-adaptation package. + # Prevent the default adaptation0 from being created: + sed --in-place '/adaptation-repos=/d' $RPM_BUILD_ROOT/%{board_mapping_dir}/.ini + # 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 + echo "%{_datadir}/ssu/features.d/adaptation-community.ini" >> tmp/droid-config.files +fi %endif %if 0%{!?lvm_root_size:1} @@ -617,16 +639,10 @@ while read line; do %gen_ks "$line" sed -i s/@VARIANT_NAME@/$line/g %{buildroot}/%{_datadir}/kickstarts/$line.ks - %if 0%{?use_meta_package:1} - sed -i "s/@Jolla Configuration /jolla-configuration-/g" %{buildroot}/%{_datadir}/kickstarts/.ks - %endif done) fi %else %gen_ks %{rpm_device} - %if 0%{?use_meta_package:1} - sed -i "s/@Jolla Configuration %{rpm_device}/jolla-configuration-%{rpm_device}/g" %{buildroot}/%{_datadir}/kickstarts/.ks - %endif %endif # Preinit plugins @@ -663,6 +679,15 @@ touch %{board_mapping_dir}/ &> /dev/null \|\| : touch %{_datadir}/ssu/features.d/* &> /dev/null \|\| : +%if 0%{?community_adaptation:1} +if [ "$(find /%{_datadir}/ssu/repos.d -maxdepth 1 -type f -not -name 10-jolla.ini 2> /dev/null)" ] \ + && ssu lr \| grep -q adaptation-community; then + # Switching to a self-hosted removes adaptation-community*.ini files + # but those feature repos will still exist until we clear its cache: + rm -f /var/cache/ssu/features.ini +fi +%endif + # To add additional post scripts, one can define those as part # of additional_post_scripts macro. %{?additional_post_scripts} @@ -678,9 +703,6 @@ %{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,-)
[-] [+]	Changed	_service ^
@@ -6,4 +6,4 @@ <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param> -</service><!-- Bump Config: 2021-03-07 12:51:44 --></services> \ No newline at end of file +</service><!-- Bump Config: 2021-03-07 15:18:55 --></services> \ No newline at end of file
	Added	_service:tar_git:droid-config-h8324-0.4.3+master.20210307130820.1.g134d58f.tar.bz2 ^
	Deleted	_service:tar_git:droid-config-h8324-0.4.3.tar.bz2 ^
[-] [+]	Added	_service:tar_git:patterns-sailfish-device-configuration.inc ^
@@ -0,0 +1,6 @@ +Name: patterns-sailfish-device-configuration-%{rpm_device} +Summary: Jolla Configuration %{rpm_device} +Version: 0.0.1 +Release: 1 +License: BSD-3-Clause +Source: %{name}-%{version}.tar.gz