|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-version-latte.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -1,6 +1,6 @@
<services>
<service name="tar_git">
- <param name="url">https://github.com/piggz/droid-hal-version-latte.git</param>
+ <param name="url">https://github.com/sailfish-on-latte/droid-hal-version-latte.git</param>
<param name="branch">master</param>
<param name="revision"></param>
<param name="token"/>
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-version-latte-0.0.1+master.20240107191150.7176492.tar.gz/.gitmodules
^
|
| @@ -1,3 +1,3 @@
[submodule "droid-hal-version"]
path = droid-hal-version
- url = https://github.com/piggz/droid-hal-version
+ url = https://github.com/sailfish-on-dontbeevil/droid-hal-version
|
|
[-]
[+]
|
Changed |
_service:tar_git:droid-hal-version-latte-0.0.1+master.20240107191150.7176492.tar.gz/droid-hal-version/droid-hal-version.inc
^
|
| @@ -1,5 +1,5 @@
%if 0%{?_obs_build_project:1}
-%define _build_flavour %(echo %{_obs_build_project} | awk -F : '{if ($NF == "testing" || $NF == "release") print $NF; else if ($NF ~ /[0-9]\.[0-9]\.[0-9]/ && NF == 3) print strdevel; else if (NF == 2) print strdevel; else print strunknown}' strdevel=devel strunknown=unknown)
+%define _build_flavour %{?qa_stage_name}%{!?qa_stage_name:unknown}
%else
%define _build_flavour unknown
%endif
@@ -23,19 +23,31 @@
%define rpm_vendor %{vendor}
%endif
+%if 0%{!?home_url:1}
+%define home_url "https://sailfishos.org/"
+%endif
+
Name: droid-hal-version-%{rpm_device}
Version: 0.0.1
+%if 0%{?_obs_build_project:1}
Release: 1
+%else
+%define rel_date %(date +'%%Y%%m%%d%%H%%M')
+Release: %{rel_date}
+%endif
Summary: SailfishOS HW Adaptation droid version package %{_shortened_version}.%{_obs_build_count} (%{_build_flavour})
Group: System/Libraries
-License: BSD-3-Clause
+License: BSD
Source: %{name}-%{version}.tar.gz
+# For devices that were last reflashed before switching from patterns to
+# meta-packages, otherwise they will miss any patterns changes in the future:
+Requires: patterns-sailfish-device-configuration-%{rpm_device}
# Generic dependencies
BuildRequires: droid-hal
BuildRequires: droid-config
BuildRequires: droid-config-sailfish
-%if 0%{?!native_build:1}
+%if 0%{!?native_build:1}
BuildRequires: libhybris
%endif
@@ -51,8 +63,10 @@
# Kernel & Boot
BuildRequires: droid-hal-kernel
+%if 0%{?_obs_build_project:1}
BuildRequires: droid-hal-img-boot
BuildRequires: droid-hal-img-recovery
+%endif
BuildRequires: droid-config-preinit-plugins
# Kernel modules
@@ -61,33 +75,30 @@
%endif
# Audio
+%if 0%{!?native_build:1}
BuildRequires: pulseaudio-modules-droid
+%endif
BuildRequires: droid-config-pulseaudio-settings
# Haptics native
-%if 0%{?have_vibrator_native:1} && 0%{?!have_vibrator:1} && 0%{?!have_ffmemless:1}
+%if 0%{?have_vibrator_native:1} && 0%{!?have_vibrator:1} && 0%{!?have_ffmemless:1}
BuildRequires: ngfd-plugin-native-vibrator
-BuildRequires: qt5-feedback-haptics-native-vibrator
%endif
# Haptics
-%if 0%{?!have_vibrator_native:1} && 0%{?have_vibrator:1} && 0%{?!have_ffmemless:1}
+%if 0%{!?have_vibrator_native:1} && 0%{?have_vibrator:1} && 0%{!?have_ffmemless:1}
BuildRequires: ngfd-plugin-droid-vibrator
BuildRequires: qt5-feedback-haptics-droid-vibrator
%endif
-# Haptics with ffmemless
-%if 0%{?!have_vibrator_native:1} && 0%{?!have_vibrator:1} && 0%{?have_ffmemless:1}
-BuildRequires: qt5-feedback-haptics-ffmemless
-%endif
# Sensors
-%if 0%{?!native_build:1}
+%if 0%{!?native_build:1}
BuildRequires: hybris-libsensorfw-qt5
%endif
# Graphics
-%if 0%{?!native_build:1}
+%if 0%{!?native_build:1}
BuildRequires: qt5-qpa-hwcomposer-plugin
BuildRequires: qtscenegraph-adaptation
%endif
@@ -127,10 +138,10 @@
MER_HA_VENDOR=%{rpm_vendor}
VERSION="%{version}.%{_obs_build_count}%{_version_appendix}"
VERSION_ID=%{version}.%{_obs_build_count}
-PRETTY_NAME="$DEVICE %{version}.%{_obs_build_count}%{_version_appendix}"
+PRETTY_NAME="%{device_pretty} %{version}.%{_obs_build_count}%{_version_appendix}"
SAILFISH_BUILD=%{_obs_build_count}
SAILFISH_FLAVOUR=%{_build_flavour}
-HOME_URL="https://sailfishos.org/"
+HOME_URL=%{home_url}
EOF
cat %{buildroot}/%{_sysconfdir}/hw-release
|
