Changes - SailfishOS Open Build Service

Changes of Revision 2

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:droid-config-yggdrasil.spec
@@ -3,12 +3,14 @@ %define device yggdrasil %define vendor volla +%define rpm_device yggdrasil %define vendor_pretty Volla %define device_pretty Volla Phone # Community HW adaptations need this %define community_adaptation 1 +%define android_version_major 10 %define out_of_image_files 1 @@ -93,13 +95,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.0.1+master.20210326133919.16.gc3d7f83 +Version: 0.0.1+hybris.17.20210921103830.59.gf1562c8 %if 0%{?_obs_build_project:1} Release: 1 %else @@ -286,6 +294,8 @@ Obsoletes: bluez-configs-sailfish Obsoletes: bluez-configs-mer +Requires: pulseaudio-modules-bluez4 + %description bluez4 %{summary}. @@ -328,6 +338,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} @@ -384,16 +400,23 @@ fi } +delete_file() { + local files=$1 + local file=$2 + local dorm=$3 + [ "x$dorm" == "x1" ] && rm $RPM_BUILD_ROOT/$file + grep -vE "$file" $files > tmp/$$.files + mv tmp/$$.files $files +} + delete_files() { - files=$1 - deletelist=$2 - dorm=$3 + local files=$1 + local deletelist=$2 + local dorm=$3 if [ -e $deletelist ]; then egrep -v '^#\|^$' $deletelist \| ( while read file; do - [ "x$dorm" == "x1" ] && rm $RPM_BUILD_ROOT/$file - grep -vE "$file" $files > tmp/$$.files - mv tmp/$$.files $files + delete_file $files $file $dorm done) fi } @@ -414,8 +437,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 @@ -483,6 +515,8 @@ delete_files tmp/droid-config.files out-of-image-files.files 0 cp out-of-image-files.files tmp/out-of-image-files.files fi +%else + delete_file tmp/droid-config.files /boot/flash.sh 1 %endif # Now the majority of the sparse tree is made we can handle configs @@ -542,15 +576,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} @@ -656,6 +694,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} @@ -671,9 +718,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,-) @@ -757,6 +801,9 @@ Requires: qt5-plugin-generic-evdev +# Fixes off MTK behabiour +Requires: libtls-padding + # Hybris packages Requires: libhybris-libEGL Requires: libhybris-libGLESv2 @@ -797,6 +844,7 @@ Requires: qt5-qtwayland-wayland_egl Requires: qt5-qpa-hwcomposer-plugin Requires: qtscenegraph-adaptation +Requires: libtls-padding # Add GStreamer v1.0 as standard Requires: gstreamer1.0 @@ -823,10 +871,13 @@ Requires: sailfish-connman-plugin-tethering-wmtwifi # enable device lock and allow to select untrusted software -#Requires: jolla-devicelock-plugin-encsfa +Requires: jolla-devicelock-plugin-encsfa # Enable home encryption #Requires: sailfish-device-encryption +Requires: droid-hwcrypt +Requires: sailfish-device-encryption-community +Requires: sailfish-device-encryption-community-droid
	Changed	_service ^
	Added	_service:tar_git:droid-config-yggdrasil-0.0.1+hybris.17.20210921103830.59.gf1562c8.tar.bz2 ^
	Deleted	_service:tar_git:droid-config-yggdrasil-0.0.1+master.20210326133919.16.gc3d7f83.tar.bz2 ^