Changes - SailfishOS Open Build Service

Changes of Revision 2

[-] [+]	Added	_service:tar_git:sailfish-fpd-community.changes
@@ -0,0 +1,3 @@ +* Sat Oct 10 2020 Adam Pigg <adam@piggz.co.uk> - 1.1.1 +- [packaging] Install systemd file by rpm +
[-] [+]	Changed	_service:tar_git:sailfish-fpd-community.spec ^
@@ -1,62 +1,54 @@ Name: sailfish-fpd-community Summary: FPD Community -Version: 1.0.0 +Version: 1.1.1 Release: 1 -Group: Qt/Qt License: LICENSE URL: http://example.org/ Source0: %{name}-%{version}.tar.bz2 -Requires: sailfishsilica-qt5 >= 0.10.9 Requires: droid-biometry-fp >= 1.0.0 -BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Qml) -BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: desktop-file-utils BuildRequires: libhybris-devel +BuildRequires: systemd Provides: sailfish-fpd %description SailfishOS Community Fingerprint Daemon %prep -%setup -q -n %{name}-%{version} +%autosetup -n %{name}-%{version} %build -# >> build pre -# << build pre -%qmake5 -make %{?_smp_mflags} +%qmake5 +%make_build %install rm -rf %{buildroot} -# >> install pre -# << install pre %qmake5_install +mkdir -p %{buildroot}/%{_unitdir}/multi-user.target.wants +cp sailfish-fpd-community.service %{buildroot}/%{_unitdir}/ +ln -s ../sailfish-fpd-community.service %{buildroot}/%{_unitdir}/multi-user.target.wants/sailfish-fpd-community.service + %files %defattr(-,root,root,-) %{_bindir} %{_sysconfdir}/dbus-1/system.d/org.sailfishos.fingerprint1.conf -/lib/systemd/system/sailfish-fpd-community.service +%{_unitdir}/sailfish-fpd-community.service +%{_unitdir}/multi-user.target.wants/sailfish-fpd-community.service %post systemctl daemon-reload \|\| : -systemctl enable sailfish-fpd-community.service \|\| : -systemctl start sailfish-fpd-community.service \|\| : - -%pre -# In case of update, stop -if [ "$1" = "2" ]; then - systemctl stop sailfish-fpd-community.service \|\| : -fi +systemctl reload-or-restart sailfish-fpd-community.service \|\| : %preun -# in case of complete removal, stop and disable +# in case of complete removal, stop if [ "$1" = "0" ]; then systemctl stop sailfish-fpd-community.service \|\| : - systemctl disable sailfish-fpd-community.service \|\| : fi + +%postun +systemctl daemon-reload \|\| :
[-] [+]	Changed	_service ^
@@ -2,6 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/piggz/sailfish-fpd-community.git</param> <param name="branch">master</param> + <param name="revision">1.1.1</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Changed	_service:tar_git:copy-hal.sh ^
@@ -9,9 +9,18 @@ exit 1 fi + + fold=$(dirname "$0")/../out rm -rf $fold mkdir $fold -cp ./out/target/product/${OUT_DEVICE}/system/lib/libbiometry_fp_api.so $fold +mv ./out/target/product/${OUT_DEVICE}/system/lib/libbiometry_fp_api.so $fold + +if [ -f ./out/target/product/${OUT_DEVICE}/system/bin/fake_crypt ]; then +mv ./out/target/product/${OUT_DEVICE}/system/bin/fake_crypt $fold +mv ./out/target/product/${OUT_DEVICE}/system/etc/init/fake_crypt.rc $fold +sed -i 's+/system/bin/fake_crypt+/usr/libexec/droid-hybris/system/bin/fake_crypt+g' $fold/fake_crypt.rc +fi + ls -lh $fold
[-] [+]	Changed	_service:tar_git:sailfish-fpd-community-1.1.1.tar.bz2/README.md ^
@@ -20,7 +20,7 @@ ## How to build for a device -### Android Library +### Android Library/Binary In HADK: @@ -29,11 +29,24 @@ export USE_CCACHE=1 lunch aosp_$DEVICE-user (or appropriate name) make libbiometry_fp_api_32 + +If the device uses keymaster 4, then an additional service called fake_crypt is required + + git clone https://github.com/erfanoabdi/fake_crypt.git external/fake_crypt + make fake_crypt + +Copy the android parts for packaging + hybris/mw/sailfish-fpd-community/rpm/copy-hal.sh In SDK: rpm/dhd/helpers/build_packages.sh --build=hybris/mw/sailfish-fpd-community --spec=rpm/droid-biometry-fp.spec --do-not-install + +If fake_crypt is required + + rpm/dhd/helpers/build_packages.sh --build=hybris/mw/sailfish-fpd-community --spec=rpm/droid-fake-crypt.spec --do-not-install + ### Daemon
[-] [+]	Changed	_service:tar_git:sailfish-fpd-community-1.1.1.tar.bz2/sailfish-fpd-community.pro ^
@@ -12,10 +12,9 @@ # The name of your application TARGET = sailfish-fpd-community +QT -= gui QT += dbus -CONFIG += sailfishapp - LIBS += -lhybris-common SOURCES += src/sailfish-fpd-community.cpp \ @@ -33,7 +32,7 @@ # to disable building translations every time, comment out the # following CONFIG line -CONFIG += sailfishapp_i18n +# CONFIG += sailfishapp_i18n HEADERS += \ src/androidfp.h \ @@ -43,13 +42,10 @@ src/util/property_store.h target.path = /usr/bin/ -systemd_services.path = /lib/systemd/system/ -systemd_services.files = sailfish-fpd-community.service dbus.files = org.sailfishos.fingerprint1.conf dbus.path = /etc/dbus-1/system.d/ INSTALLS += target \ - systemd_services \ dbus