Changes - SailfishOS Open Build Service

Changes of Revision 15

[-] [+]	Changed	_service:tar_git:droid-config-pinetab.spec
@@ -45,6 +45,10 @@ # Nexus 4: pixel_ratio=1.3 (then icon_res becomes 1.25) # packages_own_system: adaptation gets /system from rpm instead of device partition +# Image configuration: +# remove_sailfish_applications: set this if you do not want sailfish applications pattern +# remove_sailfish_ui: set this if you do not want sailfish ui pattern + # Overwriting other configs: # If your droid-config-$DEVICE needs to provide one or more device-specific # configuration files, do the following: @@ -87,7 +91,7 @@ Name: droid-config-%{rpm_device} Provides: droid-config Summary: Config packages for Droid HAL adaptations -Version: 1+master.20210825143300.9ae5eeb +Version: 1+master.20231103193419.c010c02 %if 0%{?_obs_build_project:1} Release: 1 %else @@ -100,7 +104,6 @@ BuildRequires: ssu-kickstart-configuration BuildRequires: pkgconfig(android-headers) %endif -BuildRequires: repomd-pattern-builder BuildRequires: qt5-qttools-kmap2qmap BuildRequires: sed Requires: sed @@ -252,36 +255,6 @@ ################################################################ %if 0%{?have_bluetooth:1} -%package bluez4 -Summary: %{rpm_device} packages for BlueZ 4 -Conflicts: droid-config-%{rpm_device}-bluez5 -Provides: %{rpm_device}-bluez-configs - -Requires: bluez -Conflicts: bluez5 - -Requires: bluez-libs -Conflicts: bluez5-libs - -Requires: obexd -Conflicts: bluez5-obexd - -Requires: obexd-server -# no obexd-server equivalent in BlueZ 5, so no conflict - -Requires: kf5bluezqt-bluez4 -Conflicts: kf5bluezqt-bluez5 - -Provides: bluez-configs -Conflicts: bluez5-configs -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 @@ -324,7 +297,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 @@ -343,9 +316,12 @@ do_not_move_to_lib64=( "firmware" "modules" + "oneshot.d" "startup" + "sysctl.d" "systemd/system" "systemd/user" + "sysusers.d" "tmpfiles.d" "udev" ) @@ -387,7 +363,7 @@ local files=$1 local file=$2 local dorm=$3 - [ "x$dorm" == "x1" ] && rm $RPM_BUILD_ROOT/$file + [ "x$dorm" == "x1" ] && rm -f $RPM_BUILD_ROOT/$file grep -vE "$file" $files > tmp/$$.files mv tmp/$$.files $files } @@ -419,7 +395,7 @@ # Copy from common; erase any we don't want; overlay from # android version-specific sparse (if exists), then -# vendor (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} @@ -428,9 +404,9 @@ 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_sparse}-%{vendor}-%{android_version_major} +copy_files_from %{dcd_path}/sparse-%{vendor}/sparse-%{android_version_major} delete_files tmp/droid-config.files \ - %{dcd_common}/delete_file_sparse-vendor-%{android_version_major}.list 1 + %{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 @@ -481,8 +457,6 @@ # We want to keep some files in separate subpackages. # NOTE: some files might get to wrong place with this because of string assumption. %if 0%{?have_bluetooth:1} -grep bluez4 tmp/droid-config.files > tmp/bluez4.files \|\| true -sed --in-place '/bluez4/d' tmp/droid-config.files grep bluez5 tmp/droid-config.files > tmp/bluez5.files \|\| true sed --in-place '/bluez5/d' tmp/droid-config.files %endif @@ -492,7 +466,7 @@ echo "%defattr(-,root,root,-)" > tmp/pulseaudio-settings.files grep pulse tmp/droid-config.files > tmp/pulseaudio-settings.files sed --in-place '/pulse/d' tmp/droid-config.files -sed --in-place '/preinit/d' tmp/droid-config.files +sed --in-place '/\/startup\/preinit\//d' tmp/droid-config.files grep "/dconf/db/" tmp/droid-config.files > tmp/sailfish-settings.files sed --in-place '/\/dconf\/db\//d' tmp/droid-config.files grep -e "flash-partition" -e "platform-updates" tmp/droid-config.files > tmp/flashing.files @@ -727,17 +701,10 @@ %endif %if 0%{?have_bluetooth:1} -%posttrans bluez4 -rm -rf /etc/bluetooth \|\| : -ln -s bluez4/bluetooth /etc/bluetooth \|\| : - %posttrans bluez5 rm -rf /etc/bluetooth \|\| : ln -s bluez5/bluetooth /etc/bluetooth \|\| : -%files bluez4 -f tmp/bluez4.files -%defattr(644,root,root,-) - %files bluez5 -f tmp/bluez5.files %defattr(644,root,root,-) %endif @@ -745,8 +712,12 @@ %package -n patterns-sailfish-device-configuration-common-%{rpm_device} Summary: Jolla Configuration common +%if 0%{!?remove_sailfish_applications:1} Requires: patterns-sailfish-applications +%endif +%if 0%{!?remove_sailfish_ui:1} Requires: patterns-sailfish-ui +%endif # Sailfish OS CSD tool for hardware testing # needs some configuration to get all features working
	Deleted	_service:tar_git:droid-config-pinetab-1+master.20210825143300.9ae5eeb.tar.bz2 ^
	Added	_service:tar_git:droid-config-pinetab-1+master.20231103193419.c010c02.tar.bz2 ^