[packages/thunderbolt-software-user-space] - switched to master branch (software from fwupdate branch moved to thunderbolt-software-user-space-

qboosh qboosh at pld-linux.org
Sun Apr 22 16:25:28 CEST 2018 

commit 60f03421ba24c24a61826122b869f7af2d87dfd2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 22 16:25:36 2018 +0200

    - switched to master branch (software from fwupdate branch moved to thunderbolt-software-user-space-fwupdate.spec)
    - updated to 0.9.3 release

 thunderbolt-software-user-space-dbus-macros.patch |  44 ----
 thunderbolt-software-user-space-glibc.patch       |  13 --
 thunderbolt-software-user-space-install.patch     |  10 -
 thunderbolt-software-user-space-link.patch        |  11 -
 thunderbolt-software-user-space.spec              | 256 ++++++----------------
 5 files changed, 71 insertions(+), 263 deletions(-)
---
diff --git a/thunderbolt-software-user-space.spec b/thunderbolt-software-user-space.spec
index f1083f6..dd40172 100644
--- a/thunderbolt-software-user-space.spec
+++ b/thunderbolt-software-user-space.spec
@@ -1,217 +1,103 @@
-#
-# Conditional build:
-%bcond_without	static_libs	# don't build static libraries
-#
-Summary:	Thunderbolt(TM) Linux Software
-Summary(pl.UTF-8):	Oprogramowanie linuksowe do technologii Thunderbolt(TM)
+Summary:	User-space components for handling Thunderbolt controller and devices
+Summary(pl.UTF-8):	Komponenty przestrzeni użytkownika do obsługi kontrolerów i urządzeń Thunderbolt
 Name:		thunderbolt-software-user-space
-# use "0" until versioning is stabilized:
-# - github/dell release is tagged by date
-# - changelog says it's 16.2.59 release
-# - individual component versions acc. to changelogs:
-#   - daemon 16.2.57
-#   - libtbtfwu 1.0.0 release 16.2.59
-#   - tbtfwucli 0.0.2 release 16.2.59
-Version:	0
-%define	subver	2017.01.19
-Release:	0.%{subver}.2
+Version:	0.9.3
+Release:	1
 License:	BSD
 Group:		Libraries
-# primary repository is https://github.com/01org/thunderbolt-software-user-space, but release exists only in dell repository
-#Source0Download: https://github.com/dell/thunderbolt-software-user-space/releases
-Source0:	https://github.com/dell/thunderbolt-software-user-space/archive/%{subver}/%{name}-%{subver}.tar.gz
-# Source0-md5:	2876232d622eb83df0f8ec392826ab55
-Patch0:		%{name}-glibc.patch
-Patch1:		%{name}-dbus-macros.patch
-Patch2:		%{name}-install.patch
-Patch3:		%{name}-link.patch
+#Source0Download: https://github.com/01org/thunderbolt-software-user-space/releases
+Source0:	https://github.com/01org/thunderbolt-software-user-space/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	45047cb57cc7c70d2db473628bf29c12
 URL:		https://01.org/thunderbolt-sw/
-BuildRequires:	cmake >= 2.8.8
-BuildRequires:	dbus-c++-devel >= 0.5.0
-BuildRequires:	libnl-devel >= 1:3.2
-BuildRequires:	libstdc++-devel >= 6:4.7
+BuildRequires:	boost-devel
+BuildRequires:	cmake >= 3.5
+# C++14
+BuildRequires:	libstdc++-devel >= 6:5
+BuildRequires:	pkgconfig
+BuildRequires:	txt2tags
+BuildRequires:	udev-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# hardcoded in ThunderboltService/Linux/{CMakeLists.txt,config/*.service}
-%define		_libexecdir	/usr/lib
-
 %description
-Thunderbolt(TM) Linux Software.
-
-%description -l pl.UTF-8
-Oprogramowanie linuksowe do technologii Thunderbolt(TM).
-
-%package -n thunderbolt-software-daemon
-Summary:	Thunderbolt(TM) daemon
-Summary(pl.UTF-8):	Demon Thunderbolt(TM)
-Group:		Daemons
-
-%description -n thunderbolt-software-daemon
 Thunderbolt(TM) technology is a transformational high-speed, dual
 protocol I/O that provides unmatched performance with up to 40Gbps
 bi-directional transfer speeds. It provides flexibility and simplicity
 by supporting both data (PCIe, USB3.1) and video (DisplayPort) on a
 single cable connection that can daisy-chain up to six devices.
 
-In addition, the Thunderbolt Networking mode allows a connection of
-two computers through a Thunderbolt cable.
-
-The Thunderbolt daemon (thunderboltd) is a user-space daemon that
-implements 2 main functionalities:
-1. Completing the Thunderbolt Networking implementation.
-2. Implementing the host FW update functionality.
-
-%description -n thunderbolt-software-daemon -l pl.UTF-8
-Technologia Thunderbolt(TM) to szybkie, dwuprotokołowe operacje we/wy
-zapewniające wyjątkową przepustowość do 40Gbps w obie strony. Zapewnia
-elastyczność i prostotę, obsługując zarówno dane (PCIe, USB3.1), jak i
-obraz (DisplayPort) na pojedynczym połączeniu kablowym, którym można
-połączyć szeregowo do sześciu urządzeń.
+This package includes the user-space components for device approval
+support:
+- Easier interaction with the kernel module for approving connected
+  devices.
+- ACL for auto-approving devices white-listed by the user.
 
-Ponadto tryb sieciowy Thunderbolt pozwala na połączenie kablem dwóch
-komputerów.
-
-Demon Thunderbolt (thunderboltd) to demon przestrzeni użytkownika
-zapewniający dwie funkcje:
-1. Uzupełnienie implementacji Thunderbolt Networking.
-2. Aktualizacje firmware'u hosta.
-
-%package -n libtbtfwu
-Summary:	Thunderbolt(TM) FW update library
-Summary(pl.UTF-8):	Biblioteka do uaktualniania FW systemu Thunderbolt(TM)
-Group:		Libraries
-
-%description -n libtbtfwu
-This library supplies simpler, safer and higher-level interface of the
-FW update functionality supplied by Thunderbolt daemon. It currently
-supports FW update for host controller only.
-
-%description -n libtbtfwu -l pl.UTF-8
-Ta biblioteka udostępnia prostszy, bezpieczniejszy interfejs wyższego
-poziomu funkcji uaktualniania FW udostępnianej przez demona
-Thunderbolt. Obecnie obsługuje uaktualnianie firmware'u tylko
-kontrolera hosta.
-
-%package -n libtbtfwu-devel
-Summary:	Header files for libtbtfwu library
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libtbtfwu
-Group:		Development/Libraries
-Requires:	libtbtfwu = %{version}-%{release}
-
-%description -n libtbtfwu-devel
-Header files for libtbtfwu library.
-
-%description -n libtbtfwu-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki libtbtfwu.
-
-%package -n libtbtfwu-static
-Summary:	Static libtbtfwu library
-Summary(pl.UTF-8):	Statyczna biblioteka libtbtfwu
-Group:		Development/Libraries
-Requires:	libtbtfwu-devel = %{version}-%{release}
-
-%description -n libtbtfwu-static
-Static libtbtfwu library.
-
-%description -n libtbtfwu-static -l pl.UTF-8
-Statyczna biblioteka libtbtfwu.
-
-%package -n tbtfwucli
-Summary:	Thunderbold(TM) FW update sample tool
-Summary(pl.UTF-8):	Przykładowe narzędzie do uaktualniania FW systemu Thunderbolt(TM)
-Group:		Applications/System
-Requires:	libtbtfwu = %{version}-%{release}
-
-%description -n tbtfwucli
-This is a preliminary sample of a command line tool that uses the FW
-update library. It implements a simple user interface for testing
-current FW version of a Thunderbolt host controller, validating FW
-image file compatibility with current controller and writing a new FW
-image file to the controller flash.
-
-%description -n tbtfwucli -l pl.UTF-8
-Ten pakiet zawiera wczesne, przykładowe narzędzie linii poleceń
-wykorzystujące bibliotekę do uaktualniania FW. Implementuje prosty
-interfejs użytkownika do testowania aktualnej wersji FW kontrolera
-hosta Thunderbolt, sprawdzanie zgodności pliku obrazu FW z aktualnym
-kontrolerem oraz zapis nowego pliku obrazu FW do pamięci flash
-kontrolera.
+%description -l pl.UTF-8
+Technologia Thunderbolt(TM) to bardzo szybkie, używające dwóch
+protokołów wejście/wyjście, zapewniające wydajność przesyłu danych do
+40Gb/s w obie strony. Zapewnia elastyczność i prostotę, obsługując
+zarówno dane (PCIe, USB3.1), jak i obraz (DisplayPort) na połączeniu
+pojedynczym kablem, pozwalającym na połączenie szeregowe do sześciu
+urządzeń.
+
+Ten pakiet zawiera komponenty przestrzeni użytkownika do zatwierdzania
+urządzeń:
+- łatwej interakcji z modułem jądra do zatwierdzania podłączonych
+  urządzeń,
+- ACL do automatycznego zatwierdzania urządzeń zaakceptowanych przez
+  użytkownika.
+
+%package -n bash-completion-tbtadm
+Summary:	Bash completion for Thunderbolt tbtadm command
+Summary(pl.UTF-8):	Bashowe uzupełnianie parametrów polecenia tbtadm do sprzętu Thunderbolt
+Group:		Applications/Shells
+Requires:	%{name} = %{version}-%{release}
+Requires:	bash-completion >= 2.0
+
+%description -n bash-completion-tbtadm
+Bash completion for Thunderbolt tbtadm command.
+
+%description -n bash-completion-tbtadm -l pl.UTF-8
+Bashowe uzupełnianie parametrów polecenia tbtadm do sprzętu
+Thunderbolt.
 
 %prep
-%setup -q -n %{name}-%{subver}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%setup -q
 
 %build
-TOPDIR=$(pwd)
-install -d build-libtbtfwu
-cd build-libtbtfwu
-# CMakeFiles expect relative CMAKE_INSTALL_LIBDIR
-%cmake ../fwupdate/libtbtfwu \
-	-DCMAKE_INSTALL_LIBDIR:PATH=%{_lib}
-%{__make}
-cd ..
+install -d build
+cd build
+%cmake ..
 
-install -d build-tbtfwucli
-cd build-tbtfwucli
-%cmake ../fwupdate/tbtfwucli \
-	-DTBT_LIBRARY="$TOPDIR/build-libtbtfwu/libtbtfwu.so"
 %{__make}
-cd ..
-
-install -d build-daemon
-cd build-daemon
-%cmake ../ThunderboltService/Linux
-%{__make}
-cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/var/lib/thunderbolt/acl
 
-%{__make} -C build-libtbtfwu install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-%{__make} -C build-tbtfwucli install \
+%{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} -C build-daemon install \
-	DESTDIR=$RPM_BUILD_ROOT
+# packaged as %doc COPYING
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/thunderbolt-user-space/copyright
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-n libtbtfwu -p /sbin/ldconfig
-%postun	-n libtbtfwu -p /sbin/ldconfig
-
-%files -n thunderbolt-software-daemon
+%files
 %defattr(644,root,root,755)
-%doc AUTHORS.daemon COPYING.daemon ChangeLog.daemon README README.daemon
-%dir %{_libexecdir}/thunderbolt
-%attr(755,root,root) %{_libexecdir}/thunderbolt/thunderboltd
-%{_datadir}/dbus-1/system-services/com.Intel.Thunderbolt.service
-%{systemdunitdir}/thunderbolt.service
-/etc/dbus-1/system.d/thunderbolt.conf
-/etc/udev/rules.d/10-thunderbolt.rules
-
-%files -n libtbtfwu
-%defattr(644,root,root,755)
-%doc AUTHORS.libtbtfwu COPYING.libtbtfwu ChangeLog.libtbtfwu README.libtbtfwu
-%attr(755,root,root) %{_libdir}/libtbtfwu.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libtbtfwu.so.1
-
-%files -n libtbtfwu-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libtbtfwu.so
-%{_includedir}/tbt
-%{_pkgconfigdir}/libtbtfwu.pc
-
-%files -n libtbtfwu-static
-%defattr(644,root,root,755)
-%{_libdir}/libtbtfwu.a
-
-%files -n tbtfwucli
+%doc AUTHORS COPYING Description MAINTAINERS README.md
+# udev service
+%attr(755,root,root) /lib/udev/tbtacl
+%attr(755,root,root) /lib/udev/tbtacl-write
+%attr(755,root,root) /lib/udev/tbtxdomain
+/lib/udev/rules.d/60-tbtacl.rules
+/lib/udev/rules.d/60-tbtxdomain.rules
+%dir /var/lib/thunderbolt
+%dir /var/lib/thunderbolt/acl
+# CLI utility (controls kernel module and udev service)
+%attr(755,root,root) %{_bindir}/tbtadm
+%{_mandir}/man1/tbtadm.1*
+
+%files -n bash-completion-tbtadm
 %defattr(644,root,root,755)
-%doc AUTHORS.tbtfwucli COPYING.tbtfwucli ChangeLog.tbtfwucli README.tbtfwucli
-%attr(755,root,root) %{_bindir}/tbtfwucli
+%{bash_compdir}/tbtadm
diff --git a/thunderbolt-software-user-space-dbus-macros.patch b/thunderbolt-software-user-space-dbus-macros.patch
deleted file mode 100644
index 2427c62..0000000
--- a/thunderbolt-software-user-space-dbus-macros.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-PLD-specific: adapt to renamed dbus-c++ macros (which had too common names).
---- thunderbolt-software-user-space-2017.01.19/ThunderboltService/Linux/include/dbus/dbus_controller_adapter.h.orig	2017-03-12 20:34:36.412302472 +0100
-+++ thunderbolt-software-user-space-2017.01.19/ThunderboltService/Linux/include/dbus/dbus_controller_adapter.h	2017-03-12 19:15:33.792356624 +0100
-@@ -22,11 +22,11 @@
-     controller_adaptor()
-     : ::DBus::InterfaceAdaptor("com.Intel.Thunderbolt1.controller")
-     {
--        register_method(controller_adaptor, GetControllerID, _GetControllerID_stub);
--        register_method(controller_adaptor, IsInSafeMode, _IsInSafeMode_stub);
--        register_method(controller_adaptor, UpdateFirmware, _UpdateFirmware_stub);
--        register_method(controller_adaptor, GetCurrentNVMVersion, _GetCurrentNVMVersion_stub);
--        register_method(controller_adaptor, ReadFirmware, _ReadFirmware_stub);
-+        DBus_register_method(controller_adaptor, GetControllerID, _GetControllerID_stub);
-+        DBus_register_method(controller_adaptor, IsInSafeMode, _IsInSafeMode_stub);
-+        DBus_register_method(controller_adaptor, UpdateFirmware, _UpdateFirmware_stub);
-+        DBus_register_method(controller_adaptor, GetCurrentNVMVersion, _GetCurrentNVMVersion_stub);
-+        DBus_register_method(controller_adaptor, ReadFirmware, _ReadFirmware_stub);
-     }
- 
-     // The introspection API changed from DBus-C++ library version 0.5 to 
---- thunderbolt-software-user-space-2017.01.19/ThunderboltService/Linux/include/dbus/dbus_controllers_adapter.h.orig	2017-01-19 15:35:27.000000000 +0100
-+++ thunderbolt-software-user-space-2017.01.19/ThunderboltService/Linux/include/dbus/dbus_controllers_adapter.h	2017-03-12 20:40:15.498965263 +0100
-@@ -21,7 +21,7 @@
-     controllers_adaptor()
-     : ::DBus::InterfaceAdaptor("com.Intel.Thunderbolt1.controllers")
-     {
--        register_method(controllers_adaptor, GetControllerList, _GetControllerList_stub);
-+        DBus_register_method(controllers_adaptor, GetControllerList, _GetControllerList_stub);
-     }
- 
-     // The introspection API changed from DBus-C++ library version 0.5 to 
---- thunderbolt-software-user-space-2017.01.19/ThunderboltService/Linux/include/logind_manager_proxy.h.orig	2017-01-19 15:35:27.000000000 +0100
-+++ thunderbolt-software-user-space-2017.01.19/ThunderboltService/Linux/include/logind_manager_proxy.h	2017-03-12 21:00:03.842285033 +0100
-@@ -45,8 +45,8 @@
-         _shutdown_cb(shutdown_cb),
-         _sleep_cb(sleep_cb)
-    {
--      connect_signal(LogindManagerProxy, PrepareForShutdown, PrepareForShutdownCb);
--      connect_signal(LogindManagerProxy, PrepareForSleep, PrepareForSleepCb);
-+      DBus_connect_signal(LogindManagerProxy, PrepareForShutdown, PrepareForShutdownCb);
-+      DBus_connect_signal(LogindManagerProxy, PrepareForSleep, PrepareForSleepCb);
-    };
- 
- private:
diff --git a/thunderbolt-software-user-space-glibc.patch b/thunderbolt-software-user-space-glibc.patch
deleted file mode 100644
index c3495c0..0000000
--- a/thunderbolt-software-user-space-glibc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix name clash with glibc macros.
---- thunderbolt-software-user-space-2017.01.19/ThunderboltService/Shared/include/Utils.h.orig	2017-01-19 15:35:27.000000000 +0100
-+++ thunderbolt-software-user-space-2017.01.19/ThunderboltService/Shared/include/Utils.h	2017-03-12 18:36:13.712383572 +0100
-@@ -40,6 +40,9 @@
- #include "tbtException.h"
- #include "boost/optional.hpp"
- 
-+#undef major
-+#undef minor
-+
- template <typename T>
- void ignore(T&&)
- {
diff --git a/thunderbolt-software-user-space-install.patch b/thunderbolt-software-user-space-install.patch
deleted file mode 100644
index 440ee27..0000000
--- a/thunderbolt-software-user-space-install.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- thunderbolt-software-user-space-2017.01.19/ThunderboltService/Linux/CMakeLists.txt.orig	2017-01-19 15:35:27.000000000 +0100
-+++ thunderbolt-software-user-space-2017.01.19/ThunderboltService/Linux/CMakeLists.txt	2017-03-13 21:21:13.041284010 +0100
-@@ -163,7 +163,6 @@
-     install(FILES ${CONFIG_DIR}/thunderbolt.conf DESTINATION ${DBUS_CONFIG_DIR} COMPONENT config)
-     install(FILES ${CONFIG_DIR}/10-thunderbolt.rules DESTINATION ${UDEV_RULES_DIR} COMPONENT config)
-     install(TARGETS thunderboltd DESTINATION ${DAEMON_INSTALL_DIR} COMPONENT binary)
--    install(SCRIPT post_install_script.cmake COMPONENT script)
- else()
-     message(WARNING
-             "Can't install Thunderbolt daemon because systemd or dbus couldn't be found")
diff --git a/thunderbolt-software-user-space-link.patch b/thunderbolt-software-user-space-link.patch
deleted file mode 100644
index 31ae43d..0000000
--- a/thunderbolt-software-user-space-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- thunderbolt-software-user-space-2017.01.19/fwupdate/libtbtfwu/CMakeLists.txt.orig	2017-01-19 15:35:27.000000000 +0100
-+++ thunderbolt-software-user-space-2017.01.19/fwupdate/libtbtfwu/CMakeLists.txt	2017-03-13 21:39:05.651271759 +0100
-@@ -73,7 +73,7 @@
- add_library(tbt_static STATIC ${LIB_SRC_FILES})
- set_target_properties(tbt_static PROPERTIES OUTPUT_NAME tbtfwu)
- 
--target_link_libraries(tbtfwu ${LIBDBUS-C++-1_LIBRARIES})
-+target_link_libraries(tbtfwu ${LIBDBUS-C++-1_LIBRARIES} pthread)
- 
- set_target_properties(tbtfwu
-     PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/visibility.map)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/thunderbolt-software-user-space.git/commitdiff/60f03421ba24c24a61826122b869f7af2d87dfd2

More information about the pld-cvs-commit mailing list