diff --git a/.gitignore b/.gitignore index 4fea161..435ca78 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /v0.1.4.tar.gz /v0.1.5.tar.gz /v0.1.5-1.tar.gz +/v1.0.0.tar.gz diff --git a/intel-cmt-cat.spec b/intel-cmt-cat.spec index 2e1a3b5..ee281b4 100644 --- a/intel-cmt-cat.spec +++ b/intel-cmt-cat.spec @@ -1,4 +1,4 @@ -# Copyright (c) 2016, Intel Corporation +# Copyright (c) 2016-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -23,39 +23,28 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -%global ver014 0.1.4 -%global ver015 0.1.5 -%global ver0151 0.1.5 -%global githubname intel-cmt-cat -%global githubver %{ver0151} +%global githubname intel-cmt-cat +%global githubver 1.0.0 -%if "%{githubver}" == "%{ver0151}" -%global githubfull %{githubname}-%{githubver}-1 +%if %{defined githubsubver} +%global githubfull %{githubname}-%{githubver}.%{githubsubver} %else -%global githubfull %{githubname}-%{githubver} +%global githubfull %{githubname}-%{githubver} %endif -%global pkgname intel-cmt-cat -%if 0%{!?_licensedir} -%global _licensedir %{_docdir} -%endif +# disable producing debuginfo for this package +%global debug_package %{nil} + Summary: Provides command line interface to CMT, MBM, CAT and CDP technologies -Name: %{pkgname} -Version: %{githubver} - -%if "%{githubver}" == "%{ver015}" +Name: %{githubname} Release: 1%{?dist} -%endif -%if "%{githubver}" == "%{ver014}" -Release: 3%{?dist} -%endif - +Version: %{githubver} License: BSD Group: Development/Tools ExclusiveArch: x86_64 i686 i586 -%if "%{githubver}" == "%{ver0151}" -Source0: https://github.com/01org/%{githubname}/archive/v%{githubver}-1.tar.gz +%if %{defined githubsubver} +Source0: https://github.com/01org/%{githubname}/archive/v%{githubver}.%{githubsubver}.tar.gz %else Source0: https://github.com/01org/%{githubname}/archive/v%{githubver}.tar.gz %endif @@ -74,13 +63,26 @@ obtained through a standard Linux* interface. The virtual file system provides an interface to read and write the MSR registers but it requires root privileges. -%prep +%package -n intel-cmt-cat-devel +Summary: Library and sample code to use CMT, MBM, CAT and CDP technologies +License: BSD +Requires: intel-cmt-cat == %{version} +Group: Development/Tools +ExclusiveArch: x86_64 i686 i586 +%description -n intel-cmt-cat-devel +This software package provides basic support for +Cache Monitoring Technology (CMT), Memory Bandwidth Monitoring (MBM) +and Cache Allocation Technology (CAT) and Code Data Prioratization (CDP). +The package includes library, header file and sample code. + +For additional information please refer to: +https://github.com/01org/%{githubname} + +%prep %autosetup -n %{githubfull} -%if "%{githubver}" == "%{ver015}" %post -p /sbin/ldconfig -%endif %build make %{?_smp_mflags} @@ -88,9 +90,10 @@ make %{?_smp_mflags} %install # Not doing make install as it strips the symbols. # Using files from the build directory. -%if "%{githubver}" == "%{ver015}" || "%{githubver}" == "%{ver0151}" install -d %{buildroot}/%{_bindir} install %{_builddir}/%{githubfull}/pqos/pqos %{buildroot}/%{_bindir} +install %{_builddir}/%{githubfull}/pqos/pqos-os %{buildroot}/%{_bindir} +install %{_builddir}/%{githubfull}/pqos/pqos-msr %{buildroot}/%{_bindir} install -d %{buildroot}/%{_mandir}/man8 install -m 0644 %{_builddir}/%{githubfull}/pqos/pqos.8 %{buildroot}/%{_mandir}/man8 @@ -104,44 +107,62 @@ install -m 0644 %{_builddir}/%{githubfull}/rdtset/rdtset.8 %{buildroot}/%{_mand install -d %{buildroot}/%{_licensedir}/%{name}-%{version} install -m 0644 %{_builddir}/%{githubfull}/LICENSE %{buildroot}/%{_licensedir}/%{name}-%{version} + +# Install the library install -d %{buildroot}/%{_libdir} -%if "%{githubver}" == "%{ver0151}" -install %{_builddir}/%{githubfull}/lib/libpqos-0.1.6.so %{buildroot}/%{_libdir} -%else -install %{_builddir}/%{githubfull}/lib/libpqos-0.1.5.so %{buildroot}/%{_libdir} -%endif -%endif +install %{_builddir}/%{githubfull}/lib/libpqos-*.so %{buildroot}/%{_libdir} +cp -a %{_builddir}/%{githubfull}/lib/libpqos.so %{buildroot}/%{_libdir} +cp -a %{_builddir}/%{githubfull}/lib/libpqos.so.0 %{buildroot}/%{_libdir} -%if "%{githubver}" == "%{ver014}" -install -d %{buildroot}/%{_bindir} -install %{_builddir}/%{githubfull}/pqos %{buildroot}/%{_bindir} +# Install the header file +install -d %{buildroot}/%{_includedir} +install -m 0644 %{_builddir}/%{githubfull}/lib/pqos.h %{buildroot}/%{_includedir} -install -d %{buildroot}/%{_mandir}/man8 -install -m 0644 %{_builddir}/%{githubfull}/pqos.8 %{buildroot}/%{_mandir}/man8 +# Install license and sample code +install -d %{buildroot}/%{_usrsrc}/%{githubfull} +install -m 0644 %{_builddir}/%{githubfull}/LICENSE %{buildroot}/%{_usrsrc}/%{githubfull} -install -d %{buildroot}/%{_licensedir}/%{name}-%{version} -install -m 0644 %{_builddir}/%{githubfull}/LICENSE %{buildroot}/%{_licensedir}/%{name}-%{version} -%endif +install -d %{buildroot}/%{_usrsrc}/%{githubfull}/c + +install -d %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT +install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT/Makefile %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT +install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT/reset_app.c %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT +install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT/allocation_app.c %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT +install -m 0644 %{_builddir}/%{githubfull}/examples/c/CAT/association_app.c %{buildroot}/%{_usrsrc}/%{githubfull}/c/CAT + +install -d %{buildroot}/%{_usrsrc}/%{githubfull}/c/CMT_MBM +install -m 0644 %{_builddir}/%{githubfull}/examples/c/CMT_MBM/Makefile %{buildroot}/%{_usrsrc}/%{githubfull}/c/CMT_MBM +install -m 0644 %{_builddir}/%{githubfull}/examples/c/CMT_MBM/monitor_app.c %{buildroot}/%{_usrsrc}/%{githubfull}/c/CMT_MBM %files %{_bindir}/pqos +%{_bindir}/pqos-os +%{_bindir}/pqos-msr %{_mandir}/man8/pqos.8.gz - -%if "%{githubver}" == "%{ver015}" || "%{githubver}" == "%{ver0151}" %{_bindir}/rdtset %{_mandir}/man8/rdtset.8.gz -%if "%{githubver}" == "%{ver0151}" -%{_libdir}/libpqos-0.1.6.so -%else -%{_libdir}/libpqos-0.1.5.so -%endif -%endif +%{_libdir}/libpqos-*.so %{!?_licensedir:%global license %%doc} %license %{_licensedir}/%{name}-%{version}/LICENSE %doc ChangeLog README +%files -n intel-cmt-cat-devel +%{_libdir}/libpqos.so +%{_libdir}/libpqos.so.0 +%{_includedir}/pqos.h +%{_usrsrc}/%{githubfull}/c/CAT/Makefile +%{_usrsrc}/%{githubfull}/c/CAT/reset_app.c +%{_usrsrc}/%{githubfull}/c/CAT/association_app.c +%{_usrsrc}/%{githubfull}/c/CAT/allocation_app.c +%{_usrsrc}/%{githubfull}/c/CMT_MBM/Makefile +%{_usrsrc}/%{githubfull}/c/CMT_MBM/monitor_app.c +%doc %{_usrsrc}/%{githubfull}/LICENSE + %changelog +* Fri May 19 2017 Aaron Hetherington , Michal Aleksinski 1.0.0-1 +- new release + * Tue Feb 14 2017 Aaron Hetherington 0.1.5-1 - new release diff --git a/sources b/sources index 2087110..2dee416 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (v0.1.4.tar.gz) = feae676619972b69039e9e0718a15630c6f11437e6012be44d4025ba1af596051341ac5adc7c253cd0a54bef38f5703fc6064618734a4af81130e19db934ab87 -SHA512 (v0.1.5.tar.gz) = 0c4c4f5ce05a2147204e8b5924343d135105e59fdbbafc115c75b03e31c809481966f2fc2b5edac2739979db8e8f34916bbe6690345a87bebc42a7fa3485bcf4 -SHA512 (v0.1.5-1.tar.gz) = 506a3b49ad570738be08ab058902f28a544ed108ac3c4280a4c144b31ecc8a5a083375d03e0a82af1c020b6ff4b6f4e7c517123509121423d80b3a509c258132 +SHA512 (v1.0.0.tar.gz) = 8a5ca62d085261d1644d480d41f2f38059edb8b2a28661f58cc2038bc7c9ea4ead61eaca8c1cfd13a3d0a680609f2096e6bd59517e88f656413ab6577a896021