Accepting request 941243 from home:rwill:branches:hardware:nvdimm

Update to version 03.00.00.0407  [jsc#SLE-18904, jsc#SLE-19429]

OBS-URL: https://build.opensuse.org/request/show/941243
OBS-URL: https://build.opensuse.org/package/show/hardware:nvdimm/ipmctl?expand=0&rev=42

ChangeLog.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af5aab415192d288a3ff88f37ca2892906b3ab4e24ec2dc59e6b6fc12dc1db0c
+oid sha256:5185442fca0294fdd76163c1e0236909faac6370b8a524a21ff301adbd24e5d5
-size 13144
+size 93920

ipmctl-02.00.00.3847.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e071f92a606b75ad52aa749123fe1318d1cd13997ad3f1e699a2ee3d719eacf1
-size 10461850

ipmctl-03.00.00.0407.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b851e0a078bcb7653629fd4172ab324aa5015f455c228bb596990518a989f8c4
+size 877647

ipmctl-python3.patch

@@ -1,243 +0,0 @@
----
- BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc                      |    2 ++
- BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex                 |    2 ++
- BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds                   |    2 ++
- BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool               |    2 ++
- BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim                     |    2 ++
- BaseTools/Bin/CYGWIN_NT-5.1-i686/build                    |    2 ++
- BaseTools/BinWrappers/PosixLike/BPDG                      |    2 ++
- BaseTools/BinWrappers/PosixLike/Ecc                       |    2 ++
- BaseTools/BinWrappers/PosixLike/GenDepex                  |    2 ++
- BaseTools/BinWrappers/PosixLike/GenFds                    |    2 ++
- BaseTools/BinWrappers/PosixLike/GenPatchPcdTable          |    2 ++
- BaseTools/BinWrappers/PosixLike/PatchPcdValue             |    2 ++
- BaseTools/BinWrappers/PosixLike/Pkcs7Sign                 |    2 ++
- BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys |    2 ++
- BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign         |    2 ++
- BaseTools/BinWrappers/PosixLike/TargetTool                |    2 ++
- BaseTools/BinWrappers/PosixLike/Trim                      |    2 ++
- BaseTools/BinWrappers/PosixLike/UPT                       |    2 ++
- BaseTools/BinWrappers/PosixLike/build                     |    2 ++
- BaseTools/Tests/GNUmakefile                               |    2 +-
- 20 files changed, 39 insertions(+), 1 deletion(-)
-
---- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc
-+++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex
-+++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds
-+++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool
-+++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim
-+++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/build
-+++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/build
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/BinWrappers/PosixLike/BPDG
-+++ b/BaseTools/BinWrappers/PosixLike/BPDG
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/BinWrappers/PosixLike/Ecc
-+++ b/BaseTools/BinWrappers/PosixLike/Ecc
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/BinWrappers/PosixLike/GenDepex
-+++ b/BaseTools/BinWrappers/PosixLike/GenDepex
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/BinWrappers/PosixLike/GenFds
-+++ b/BaseTools/BinWrappers/PosixLike/GenFds
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
-+++ b/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/BinWrappers/PosixLike/PatchPcdValue
-+++ b/BaseTools/BinWrappers/PosixLike/PatchPcdValue
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/BinWrappers/PosixLike/Pkcs7Sign
-+++ b/BaseTools/BinWrappers/PosixLike/Pkcs7Sign
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys
-+++ b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign
-+++ b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/BinWrappers/PosixLike/TargetTool
-+++ b/BaseTools/BinWrappers/PosixLike/TargetTool
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/BinWrappers/PosixLike/Trim
-+++ b/BaseTools/BinWrappers/PosixLike/Trim
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/BinWrappers/PosixLike/UPT
-+++ b/BaseTools/BinWrappers/PosixLike/UPT
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/BinWrappers/PosixLike/build
-+++ b/BaseTools/BinWrappers/PosixLike/build
-@@ -4,6 +4,8 @@
- # If a python2 command is available, use it in preference to python
- if command -v python2 >/dev/null 2>&1; then
-     python_exe=python2
-+elif command -v python3 >/dev/null 2>&1; then
-+    python_exe=python3
- fi
- 
- full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
---- a/BaseTools/Tests/GNUmakefile
-+++ b/BaseTools/Tests/GNUmakefile
-@@ -14,7 +14,7 @@
- all: test
- 
- test:
--	@if command -v python2 >/dev/null 2>&1; then python2 RunTests.py; else python RunTests.py; fi
-+	@if command -v python2 >/dev/null 2>&1; then python2 RunTests.py; elif command -v python3 >/dev/null 2>&1; then python3 RunTests.py; else python RunTests.py; fi
- 
- clean:
- 	find . -name '*.pyc' -exec rm '{}' ';'

ipmctl-static-EDK2.patch.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8572a6c41c857fbc1dba070a0ef4c48c0220adc9f4516d2e5f47fb5a3e743ce9
+size 4664004

ipmctl.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Dec 17 12:45:05 UTC 2021 - rw@suse.com
+
+- Update to version 03.00.00.0407  [jsc#SLE-18904, jsc#SLE-19429]
+  (For detailed changes see 'ChangeLog.xz')
+- Incorporate TianoCore EDK II build requirement as patch.
+  (ipmctl-static-EDK2.patch.xz)
+- Drop obsoleted patch(es).
+  (ipmctl-python3.patch)
+
 -------------------------------------------------------------------
 Tue Feb  9 14:57:36 UTC 2021 - rw@suse.com
 

ipmctl.spec

@@ -16,12 +16,12 @@
 #
 
 
-%define abi     4
+%define abi     5
 #define vgit    .1547861714.b7a59da
 %define vgit    %{nil}
 
 Name:           ipmctl
-Version:        02.00.00.3847
+Version:        03.00.00.0407
 Release:        0
 Summary:        Utility for managing Intel Optane persistent memory modules
 License:        BSD-3-Clause
@@ -34,7 +34,7 @@ Source:         %{name}-%{version}%{vgit}.tar.gz
 %endif
 Source1:        ChangeLog.xz
 Source2:        %{name}-rpmlintrc
-Patch1:         ipmctl-python3.patch
+Patch1:         ipmctl-static-EDK2.patch.xz
 
 Recommends:     logrotate
 %if %{defined pythons}
@@ -114,13 +114,15 @@ diff -u CMakeLists.txt{.00,} || sleep 4
     -DINSTALL_UNITDIR=%{_unitdir} \
     -DRELEASE=ON \
     -DRPM_BUILD=ON
-%make_jobs
+%cmake_build
 
 %install
 %cmake_install
 mkdir -p %{buildroot}%{_sbindir}
 rm -f %{buildroot}%{_datadir}/doc/ipmctl/ipmctl_default.conf
 rm -f %{buildroot}%{_datadir}/doc/ipmctl/LICENSE
+rm -f %{buildroot}%{_datadir}/doc/ipmctl/thirdpartynotice.txt
+rm -f %{buildroot}%{_datadir}/doc/ipmctl/edk2_License.txt
 install -m 444 -p "%{SOURCE1}" .
 
 %post -p /sbin/ldconfig
@@ -131,7 +133,9 @@ install -m 444 -p "%{SOURCE1}" .
 %defattr(-,root,root)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
-%doc README.md CONTRIBUTING.md
+%doc README.md
+%doc opensource
+%doc Documentation/ipmctl/*
 %doc ChangeLog.xz
 %{_bindir}/%{name}
 %{_mandir}/man1/*