Changes - SailfishOS Open Build Service

Changes of Revision 34

[-] [+]	Changed	_service:tar_git:droid-config-titan.spec
@@ -41,6 +41,7 @@ # Jolla Tablet: 1.5 # Nexus 5: 2.0 # Nexus 4: pixel_ratio=1.3 (then icon_res becomes 1.25) +# packages_own_system: adaptation gets /system from rpm instead of device partition # Overwriting other configs: # If your droid-config-$DEVICE needs to provide one or more device-specific @@ -68,7 +69,7 @@ # dcd_common is the common stuff and dcd_sparse is the common sparse %define dcd_common %{dcd_path}/droid-configs-device -%define dcd_sparse droid-configs-device/sparse +%define dcd_sparse %{dcd_common}/sparse # Set defaults if not defined already: %if 0%{!?rpm_device:1} @@ -78,19 +79,13 @@ %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: 1.2.3+master.20210508203741.19.gc385ee9 +Version: 1.2.3+master.20211104234542.21.gf7adb47 %if 0%{?_obs_build_project:1} Release: 1 %else @@ -101,7 +96,6 @@ Source0: %{name}-%{version}.tar.bz2 BuildRequires: ssu-kickstart-configuration BuildRequires: pkgconfig(android-headers) -BuildRequires: repomd-pattern-builder BuildRequires: qt5-qttools-kmap2qmap BuildRequires: sed Requires: sed @@ -140,15 +134,6 @@ %{summary}. ################################################################ -%package patterns -Summary: Repository patterns for %{rpm_device} hw -Provides: droid-config-patterns -Provides: package-groups - -%description patterns -%{summary}. - -################################################################ %package policy-settings Summary: Policy settings for %{rpm_device} hw Provides: droid-config-policy-settings @@ -277,6 +262,8 @@ Obsoletes: bluez-configs-sailfish Obsoletes: bluez-configs-mer +Requires: pulseaudio-modules-bluez4 + %description bluez4 %{summary}. @@ -322,7 +309,7 @@ %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 +case %{android_version_major} in 8\|9\|10\|11) : ;; ) echo unsupported android_version_major; exit 1; esac %endif %install @@ -381,16 +368,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 } @@ -408,20 +402,25 @@ fi } -# 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 +# Copy from common; erase any we don't want; overlay from +# android version-specific sparse (if exists), then +# vendor sparse submodule (if exists), then +# sparse for adaptation that package own /system (if applicable), then +# device specific sparse: +copy_files_from %{dcd_sparse} 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 +%if 0%{?android_version_major:1} +copy_files_from %{dcd_sparse}-%{android_version_major} +delete_files tmp/droid-config.files \ + %{dcd_common}/delete_file_sparse-%{android_version_major}.list 1 +copy_files_from %{dcd_path}/sparse-%{vendor}/sparse-%{android_version_major} +delete_files tmp/droid-config.files \ + %{dcd_path}/sparse-%{vendor}/delete_file_sparse-%{android_version_major}.list 1 +%endif +%if 0%{?packages_own_system:1} +copy_files_from %{dcd_sparse}-ownsystem %endif +copy_files_from %{dcd_path}/sparse 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 @@ -489,28 +488,13 @@ 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 # which need some kind of substitution or generating -# patterns -mkdir -p %{buildroot}/usr/share/package-groups/ -/usr/bin/repomd-pattern-builder.py --patternxml -p %{dcd_common}/patterns/common -o %{buildroot}/usr/share/package-groups/ --version=%{version} --release=%{release} -/usr/bin/repomd-pattern-builder.py --patternxml -p %{dcd_path}/patterns/ -o %{buildroot}/usr/share/package-groups/ --version=%{version} --release=%{release} - -delete_patterns() { - deletelist=$1 - if [ -e $deletelist ]; then - egrep -v '^#\|^$' $deletelist \| ( - while read file; do - rm $RPM_BUILD_ROOT/$file - done) - fi -} - -delete_patterns delete_pattern_%{rpm_device}.list - %if 0%{!?pixel_ratio:1} %define pixel_ratio 1.0 %endif @@ -524,7 +508,6 @@ %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. @@ -695,10 +678,6 @@ %defattr(-,root,root,-) %{_datadir}/kickstarts/.ks -%files patterns -%defattr(-,root,root,-) -%{_datadir}/package-groups/.xml - %files policy-settings -f tmp/policy-settings.files %defattr(644,root,root,-) @@ -894,21 +873,7 @@ Requires: jolla-keyboard-layout-all Requires: patterns-sailfish-rnd -# dev-tools pattern will be fixed in the next release -# for now we'll use its 'exploded' version: -#Requires: patterns-sailfish-dev-tools -Recommends: jolla-developer-mode -Requires: strace -Requires: gdb -Requires: gdb-gdbserver -Requires: vim-enhanced -Requires: less -Requires: valgrind -Requires: lipstick-qt5-tools -Requires: libhybris-tests -Requires: busybox-static -Requires: openssh-server -Requires: zypper +Requires: patterns-sailfish-device-tools %description -n patterns-sailfish-device-configuration-titan Pattern with packages for titan configurations
	Deleted	_service:tar_git:droid-config-titan-1.2.3+master.20210508203741.19.gc385ee9.tar.bz2 ^
	Added	_service:tar_git:droid-config-titan-1.2.3+master.20211104234542.21.gf7adb47.tar.bz2 ^