Changes - SailfishOS Open Build Service

Changes of Revision 7

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-cosmocom.spec
@@ -39,16 +39,12 @@ # Device capabilities: # remove_modem: set this if your device has no modem (e.g. a WiFi-only tablet) # remove_bluetooth: set this if your device does not have a Bluetooth chip -# pixel_ratio: UI scaling factor, choose from 1.0, 1.5, 2.0. Any other value will -# default the icon pack to 1.0 resolution (it is a bug)! -# Read more on ways to do-it-together: https://bugs.nemomobile.org/show_bug.cgi?id=814 -# WARNING: pixel_ratio is experimental, and not yet ready for proper UI scalability -# tests! Please do not test/port your apps to other form factors for the time being. +# pixel_ratio: UI scaling factor. Calc shown in droid-config-@DEVICE@.spec.template # Ratio examples: # Jolla1: 1.0 # Jolla Tablet: 1.5 # Nexus 5: 2.0 -# Nexus 4: pixel_ratio=1.3 (icon resolution then drops to 1.0) +# Nexus 4: pixel_ratio=1.3 (then icon_res becomes 1.25) # Overwriting other configs: # If your droid-config-$DEVICE needs to provide one or more device-specific @@ -86,21 +82,34 @@ %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+master.20210311224515.18dfffb +Version: 1+master.20210507214729.b051dbb +%if 0%{?_obs_build_project:1} Release: 1 -Group: Configs +%else +%define rel_date %(date +'%%Y%%m%%d%%H%%M') +Release: %{rel_date} +%endif License: GPLv2 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 +Requires: droid-hal %if 0%{?community_adaptation:1} # because it provides one ssu feature, do: Requires: community-adaptation @@ -210,7 +219,6 @@ %package sailfish Provides: droid-config-sailfish Provides: theme-configs -Group: System BuildArch: noarch Requires: %{name} = %{version}-%{release} Requires: oneshot @@ -224,7 +232,6 @@ %package flashing Provides: droid-config-flashing -Group: System # Sparse image flashing support for flash-partition Requires: droid-hal-tools Summary: On device flashing files for %{rpm_device} hw @@ -237,7 +244,6 @@ %if 0%{?out_of_image_files:1} %package out-of-image-files -Group: System BuildArch: noarch Summary: Files that are used for flashing and are not needed on device. @@ -253,8 +259,6 @@ %package bluez4 Summary: %{rpm_device} packages for BlueZ 4 Conflicts: droid-config-%{rpm_device}-bluez5 -Requires: %{name} = %{version}-%{release} -Requires: %{name} = %{version} Provides: %{rpm_device}-bluez-configs Requires: bluez @@ -277,31 +281,37 @@ Obsoletes: bluez-configs-sailfish Obsoletes: bluez-configs-mer +Requires: pulseaudio-modules-bluez4 + %description bluez4 %{summary}. %package bluez5 Summary: %{rpm_device} packages for BlueZ 5 Conflicts: droid-config-%{rpm_device}-bluez4 -Requires: %{name} = %{version}-%{release} -Requires: %{name} = %{version} Provides: %{rpm_device}-bluez-configs Requires: bluez5 Conflicts: bluez +Obsoletes: bluez Requires: bluez5-libs Conflicts: bluez-libs +Obsoletes: bluez-libs Requires: bluez5-obexd Conflicts: obexd +Obsoletes: obexd Requires: kf5bluezqt-bluez5 Conflicts: kf5bluezqt-bluez4 +Obsoletes: kf5bluezqt-bluez4 +Obsoletes: kf5bluezqt-bluez4-declarative Provides: bluez5-configs Conflicts: bluez-configs Obsoletes: bluez-configs-sailfish +Obsoletes: bluez-configs-mer %description bluez5 %{summary}. @@ -315,6 +325,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} @@ -325,26 +341,69 @@ mkdir -p tmp/ echo "%defattr(-,root,root,-)" > tmp/droid-config.files -# Prefer files from sparse/ in the HA specific -# area over sparse/ in the dcd area +# On 64-bit ARM certain subdirs should not be moved to lib64 but kept under lib. +# Algorithm below autodetects cases under sparse/ so adaptations do not have to +# make any changes to their trees when going from armv7hl to aarch64. +do_not_move_to_lib64=( + "firmware" + "modules" + "startup" + "systemd/system" + "systemd/user" + "tmpfiles.d" + "udev" + ) copy_files_from() { config_dir=$1 if [ -d $config_dir ]; then - (cd $config_dir; find . $ -type f -o -type l $ -print ) \| sed 's/^.//' >> tmp/droid-config.files - cp -Rf $config_dir/ $RPM_BUILD_ROOT/ + olddir=$PWD + cd $config_dir + for f in $(find . $ -type f -o -type l $ -print); do + dst=$(echo $f \| sed 's/^.//') + if echo $dst \| grep -qE "^/usr/lib/\|^/lib/"; then + move_to_lib64=true + for stay_in_lib in "${do_not_move_to_lib64[@]}"; do + if echo $dst \| grep -qE "^/usr/lib/$stay_in_lib/\|^/lib/$stay_in_lib/"; then + move_to_lib64=false + break + fi + done + if [ "$move_to_lib64" = true ]; then + if echo $dst \| grep -q "^/usr/lib/"; then + dst=$(echo $dst \| sed 's /usr/lib/ %{_libdir}/ ') + else + dst=$(echo $dst \| sed 's /lib/ /%{_lib}/ ') + fi + fi + fi + dstdir=$RPM_BUILD_ROOT$(dirname $dst) + if [ ! -d $dstdir ]; then + mkdir -p $dstdir + fi + cp -Pv $f $dstdir + echo $dst >> $olddir/tmp/droid-config.files + done + cd - >/dev/null fi } +delete_file() { + local files=$1 + local file=$2 + local dorm=$3
	Deleted	_service:tar_git:droid-config-cosmocom-1+master.20210311224515.18dfffb.tar.bz2 ^
	Added	_service:tar_git:droid-config-cosmocom-1+master.20210507214729.b051dbb.tar.bz2 ^