From 7ff545d2de69e6beb41a008020d27bc06864636231130a84ccb07307809af756 Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Tue, 10 Mar 2020 16:55:24 +0000 Subject: [PATCH] Accepting request 783503 from home:rwill:branches:hardware:nvdimm Update to version 02.00.00.3733 [bsc#1162844] OBS-URL: https://build.opensuse.org/request/show/783503 OBS-URL: https://build.opensuse.org/package/show/hardware:nvdimm/ipmctl?expand=0&rev=37 --- ChangeLog.xz | 4 +- ipmctl-01.00.00.3497.tar.gz | 3 - ipmctl-02.00.00.3733.tar.gz | 3 + ipmctl.changes | 8 ++ ipmctl.spec | 86 +++++---------------- mkSafeC | 70 ----------------- safeclib-3.3.v03032018+git7.59eba324.tar.xz | 3 - safeclib-patches.tar | 0 8 files changed, 31 insertions(+), 146 deletions(-) delete mode 100644 ipmctl-01.00.00.3497.tar.gz create mode 100644 ipmctl-02.00.00.3733.tar.gz delete mode 100644 mkSafeC delete mode 100644 safeclib-3.3.v03032018+git7.59eba324.tar.xz delete mode 100644 safeclib-patches.tar diff --git a/ChangeLog.xz b/ChangeLog.xz index 0e04355..f963ccc 100644 --- a/ChangeLog.xz +++ b/ChangeLog.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9efd49d272280e63040ef528295933579ef2817c59841ef23c8980d8820f9816 -size 1184 +oid sha256:6af69b16c2643f0005de067875c838cc1a32ede2e0986c199e5897e2b757e7dd +size 40300 diff --git a/ipmctl-01.00.00.3497.tar.gz b/ipmctl-01.00.00.3497.tar.gz deleted file mode 100644 index 717895a..0000000 --- a/ipmctl-01.00.00.3497.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2c892e0a81a715b164b1c843fc2b0299914be2c1951956f07e53efb26825bd4 -size 10322671 diff --git a/ipmctl-02.00.00.3733.tar.gz b/ipmctl-02.00.00.3733.tar.gz new file mode 100644 index 0000000..4cfe556 --- /dev/null +++ b/ipmctl-02.00.00.3733.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7647f06d8b64bba9566acd63c1ca638e2039a35d61dfc3aae226fff0ce1e9adc +size 10455836 diff --git a/ipmctl.changes b/ipmctl.changes index 140ea77..001e0c6 100644 --- a/ipmctl.changes +++ b/ipmctl.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 10 14:06:35 UTC 2020 - rw@suse.com + +- Update to version 02.00.00.3733 + - Sidestep feature process, hardware enablement via bugzilla. + [bsc#1162844] + (For detailed changes see 'ChangeLog.xz') + ------------------------------------------------------------------- Wed Feb 26 15:25:31 UTC 2020 - rw@suse.com diff --git a/ipmctl.spec b/ipmctl.spec index 34348a1..6a7ac70 100644 --- a/ipmctl.spec +++ b/ipmctl.spec @@ -16,16 +16,14 @@ # -%define abi 3 +%define abi 4 #define vgit .1547861714.b7a59da %define vgit %{nil} -%define vSafeC 3.3.v03032018+git7.59eba324 -%bcond_with precompiledSafeC Name: ipmctl -Version: 01.00.00.3497 +Version: 02.00.00.3733 Release: 0 -Summary: Utility for managing Intel Optane DC persistent memory modules +Summary: Utility for managing Intel Optane persistent memory modules License: BSD-3-Clause Group: System/Management URL: https://github.com/intel/ipmctl @@ -36,9 +34,6 @@ Source: %{name}-%{version}%{vgit}.tar.gz %endif Source1: ChangeLog.xz Source2: %{name}-rpmlintrc -Source10: safeclib-%{vSafeC}.tar.xz -Source11: mkSafeC -Source12: safeclib-patches.tar Patch1: ipmctl-python3.patch Recommends: logrotate @@ -53,17 +48,8 @@ BuildRequires: pkgconfig BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(libndctl) >= 58.2 BuildRequires: pkgconfig(systemd) -# required for man-pages -%if %{defined rubygem(asciidoctor)} +# required for documentation BuildRequires: rubygem(asciidoctor) -%else -BuildRequires: asciidoc -%endif -# for SafeC -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gcc -BuildRequires: libtool # no 'Conflicts' for 'zypper patch' Obsoletes: lib%{name}2 @@ -82,24 +68,15 @@ Obsoletes: libixpdimm-core < 01.00.00.3000 ExclusiveArch: x86_64 %description -Utility for managing Intel Optane DC persistent memory modules +Utility for managing Intel Optane persistent memory modules (PMem module) Supports functionality to: -* Discover PMMs on the platform. -* Provision the platform memory configuration. -* View and update the firmware on PMMs. -* Configure data-at-rest security on PMMs. -* Monitor PMM health. -* Track performance of PMMs. -* Debug and troubleshoot PMMs. - -%package monitor -Summary: Daemon for monitoring the status of Intel PMM -Group: System/Monitoring -%{?systemd_requires} -Obsoletes: ixpdimm-monitor < 01.00.00.3000 - -%description monitor -A monitor daemon for monitoring the health and status of Intel Optane DC persistent memory modules +- Discover PMem modules on the platform. +- Provision the platform memory configuration. +- View and update the firmware on PMem modules. +- Configure data-at-rest security on PMem modules. +- Monitor PMem module health. +- Track performance of PMem modules. +- Debug and troubleshoot PMem modules. %package devel Summary: Development packages for %{name} @@ -109,28 +86,22 @@ Obsoletes: ixpdimm-devel < 01.00.00.3000 Obsoletes: ixpdimm_sw-devel < 01.00.00.3000 %description devel -API for development of Intel Optane DC persistent memory management utilities. +API for development of Intel Optane persistent memory management utilities. %prep -%setup -q -n %{name}-%{version}%{vgit} -a 10 +%setup -q -n %{name}-%{version}%{vgit} %patch1 -p1 perl -pi.00 -e ' s[(CMAKE_INSTALL_)DATAROOT(DIR\})/ipmctl][${1}SYSCONF${2}]; + s[(INI_INSTALL_FILEPATH "\$\{CMAKE_INSTALL_)DATAROOT(DIR\}")][${1}SYSCONF${2}]; + s[(-DINI_INSTALL_FILEPATH="\$\{INI_INSTALL_FILEPATH\})/ipmctl][${1}]; ' CMakeLists.txt -#diff -u CMakeLists.txt{.00,} || sleep 2 -perl -pi.00 -e 's{/usr/share/ipmctl}{/etc}' src/os/ini/ini.c -#diff -u src/os/ini/ini.c{.00,} || sleep 4 +diff -u CMakeLists.txt{.00,} || sleep 4 ! grep -lri 'INTEL CONFIDENTIAL' || exit 1 -%if %{with precompiledSafeC} - tar xfJ ../../SOURCES/safeclib-prebuild.tar.xz || sleep 5 -%endif - %build -/bin/bash -ex "%{SOURCE11}" "%{SOURCE12}" "%{?_smp_mflags}" -export PKG_CONFIG_PATH=$PWD/contrib/lib/pkgconfig %cmake -DBUILDNUM=%{version} -DCMAKE_INSTALL_PREFIX=/ \ -DLINUX_PRODUCT_NAME=%{name} \ -DCMAKE_INSTALL_LIBDIR=%{_libdir} \ @@ -148,31 +119,17 @@ export PKG_CONFIG_PATH=$PWD/contrib/lib/pkgconfig %install %cmake_install mkdir -p %{buildroot}%{_sbindir} -ln -sf service %{buildroot}%{_sbindir}/rc%{name}-monitor rm -f %{buildroot}%{_datadir}/doc/ipmctl/ipmctl_default.conf rm -f %{buildroot}%{_libdir}/*.so.%{abi} install -m 444 -p "%{SOURCE1}" . -rm -f %{buildroot}%{_mandir}/man1/*.tmp.* %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%pre monitor -%service_add_pre ipmctl-monitor.service - -%post monitor -%service_add_post ipmctl-monitor.service - -%preun monitor -%service_del_preun ipmctl-monitor.service - -%postun monitor -%service_del_postun ipmctl-monitor.service - %files %defattr(-,root,root) -%license LICENSE contrib/COPYING.* +%license LICENSE %doc README.md CONTRIBUTING.md %doc ChangeLog.xz %{_bindir}/%{name} @@ -186,13 +143,6 @@ rm -f %{buildroot}%{_mandir}/man1/*.tmp.* #files -n lib%%{name}%%{abi} %{_libdir}/lib%{name}.so.%{abi}.* -%files monitor -%defattr(-,root,root) -%license LICENSE -%{_bindir}/%{name}-monitor -%{_sbindir}/rc%{name}-monitor -%{_unitdir}/%{name}-monitor.service - %files devel %defattr(-,root,root) %{_libdir}/lib%{name}.so diff --git a/mkSafeC b/mkSafeC deleted file mode 100644 index 3546c4e..0000000 --- a/mkSafeC +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash - -#SafeC=libsafec -SafeC=safeclib -SafeCpatches="$1"; shift - -[ -r CMakeLists.txt ] - -perl -pi.10 -e ' - s<(\$\{CMAKE_THREAD_LIBS_INIT\})>; - if (!$f) { - $f=1 if (s<(\$\{LIBSAFEC)(_LIBRARIES)>); - } - $_ .= " RENAME ipmctl\n" if (m{/logrotate\.d}); -' CMakeLists.txt -#diff -u CMakeLists.txt{.10,} || sleep 2 - -CONTRIB=$PWD/contrib -if [ -d $CONTRIB/include ]; then - cd $CONTRIB/src/${SafeC}* - LSC=${PWD##*/} - cp -p COPYING $CONTRIB/COPYING.$LSC - sleep 2 - exit 0 -fi - -mkdir -p contrib/{src,patches/${SafeC}} - -mv ${SafeC}* contrib/src - -cd contrib/src/${SafeC}* -LSC=${PWD##*/} -API="$(perl -n -e 'print "$1\n" - if (m{AC_SUBST\(\[SAFEC_API_VERSION\], \[([0-9]+\.[0-9+])\]\)}) - ' configure.ac)" -SafeCver="${LSC##*-$API.v}" -[ "$SafeCtar" != "$SafeCver" ] || { - echo "unsupported $SafeC version!" >&2 - exit 1 -} -SafeCver="${SafeCver%.tar.*}" -SafeCver="${SafeCver/+git/-}" - -if [ -n "$SafeCpatches" -a -s "$SafeCpatches" ]; then - tar xvfC "$SafeCpatches" ../../patches/${SafeC} - for p in ../../patches/${SafeC}/*.patch; do - patch -p1 < $p - done -else - echo "$SafeCver" > .tarball-version - perl -pi.10 -e ' - s{\[libsafec\]}{[safec-'"$API"']} - ' configure.ac - diff -u configure.ac{.10,} || sleep 4 -fi - -autoreconf -Wall --install || exit -./configure --disable-shared --disable-doc \ - --enable-static --enable-strmax=0x8000 \ - --prefix=$CONTRIB \ - CFLAGS="$RPM_OPT_FLAGS -DHAVE_C99 -DNO_MSABI_VA_FUNCS -fPIC" -make "$@" -make install - -cp -p COPYING $CONTRIB/COPYING.$LSC - -[ -r $CONTRIB/include/*/safe_mem_lib.h ] || exit 1 - -cd $CONTRIB/.. -tar cf /tmp/${SafeC}-prebuild.tar contrib diff --git a/safeclib-3.3.v03032018+git7.59eba324.tar.xz b/safeclib-3.3.v03032018+git7.59eba324.tar.xz deleted file mode 100644 index 0027b05..0000000 --- a/safeclib-3.3.v03032018+git7.59eba324.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edc4d793d89f1b9a67e0228ab3c810ad1bec099214dc87a20ff84d9dddac41bf -size 1833672 diff --git a/safeclib-patches.tar b/safeclib-patches.tar deleted file mode 100644 index 473a0f4..0000000