Accepting request 685359 from hardware:nvdimm
Update to version v01.00.00.3440. - Support more than 16 sockets. [FATE#327556, bsc#1123735] - Fix flashing FW of DCPMM modules. [bsc#1128830] Note: Source12 (safeclib-patches.tar) is intentionally empty, as all modifications "needed" by Intel are on github. This may change again, so the empty tarball is used to preserve the established build-infrastructure (at least for now). OBS-URL: https://build.opensuse.org/request/show/685359 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ipmctl?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
ab802959ed
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -21,5 +21,3 @@
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
## Specific LFS patterns
|
||||
libsafec-patches.tar filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:25967dbca09c632b4c2155cf913204c4d93b8642d3ebda3fe6c1677ddc6feb92
|
||||
size 30552
|
||||
oid sha256:cd07e7d159c5f9a0aa34e3a05331dcbb8eb9effa711126f4de6ccae2a5d7efdb
|
||||
size 3320
|
||||
|
||||
10
_service
10
_service
@ -1,4 +1,14 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://github.com/rurban/safeclib</param>
|
||||
<param name="filename">safeclib</param>
|
||||
<param name="versionprefix">3.3</param>
|
||||
<param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
|
||||
<param name="revision">59eba324c20c07f7ca8190238dd415525f4925dc</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="scm">git</param>
|
||||
<param name="url">https://github.com/intel/ipmctl.git</param>
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/intel/ipmctl.git</param>
|
||||
<param name="changesrevision">b7a59dac174c4e8c5d1d15300b413eba274ea345</param></service></servicedata>
|
||||
<param name="changesrevision">0320099f3792e9ab11ecc531c734d0048989f85b</param></service><service name="tar_scm">
|
||||
<param name="url">https://github.com/rurban/safeclib</param>
|
||||
<param name="changesrevision">59eba324c20c07f7ca8190238dd415525f4925dc</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1c076446c1414d2f2bc80d3ff16abfaed1cd231415408a7af2be5355af1065e0
|
||||
size 10456674
|
||||
3
ipmctl-01.00.00.3440.tar.gz
Normal file
3
ipmctl-01.00.00.3440.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b516488c527f5023b3618356b01eabdd79220ea2d6082fddc551f4b220eef3ad
|
||||
size 10461546
|
||||
@ -19,7 +19,7 @@
|
||||
BaseTools/BinWrappers/PosixLike/UPT | 2 ++
|
||||
BaseTools/BinWrappers/PosixLike/build | 2 ++
|
||||
BaseTools/Tests/GNUmakefile | 2 +-
|
||||
21 files changed, 48 insertions(+), 3 deletions(-)
|
||||
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
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 13 17:14:58 UTC 2019 - rw@suse.com
|
||||
|
||||
- Update to version v01.00.00.3440.
|
||||
- Support more than 16 sockets. [FATE#327556, bsc#1123735]
|
||||
- Fix flashing FW of DCPMM modules. [bsc#1128830]
|
||||
(For detailed changes see 'ChangeLog.xz')
|
||||
- Update SafeC dependency (as used in 3440).
|
||||
- Refresh patch(es)
|
||||
(ipmctl-python3.patch)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 29 14:03:31 UTC 2019 - rw@suse.com
|
||||
|
||||
|
||||
14
ipmctl.spec
14
ipmctl.spec
@ -19,12 +19,11 @@
|
||||
%define abi 3
|
||||
#define vgit .1547861714.b7a59da
|
||||
%define vgit %{nil}
|
||||
%define vSafeC 03032018
|
||||
%define pSafeC rurban/safeclib/releases/download/v%{vSafeC}
|
||||
%define vSafeC 3.3.v03032018+git7.59eba324
|
||||
%bcond_with precompiledSafeC
|
||||
|
||||
Name: ipmctl
|
||||
Version: 01.00.00.3402
|
||||
Version: 01.00.00.3440
|
||||
Release: 0
|
||||
Summary: Utility for managing Intel Optane DC persistent memory modules
|
||||
License: BSD-3-Clause
|
||||
@ -37,9 +36,9 @@ Source: %{name}-%{version}%{vgit}.tar.gz
|
||||
%endif
|
||||
Source1: ChangeLog.xz
|
||||
Source2: %{name}-rpmlintrc
|
||||
Source10: https://github.com/%{pSafeC}/libsafec-%{vSafeC}.0-g570fa5.tar.gz
|
||||
Source10: safeclib-%{vSafeC}.tar.xz
|
||||
Source11: mkSafeC
|
||||
Source12: libsafec-patches.tar
|
||||
Source12: safeclib-patches.tar
|
||||
Patch1: ipmctl-python3.patch
|
||||
|
||||
Recommends: logrotate
|
||||
@ -54,7 +53,7 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: systemd
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: pkgconfig(libndctl) >= 58.2
|
||||
# for libsafec
|
||||
# for SafeC
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: gcc
|
||||
@ -65,6 +64,7 @@ Obsoletes: lib%{name}2
|
||||
# for impctl
|
||||
Obsoletes: ixpdimm-cli < 01.00.00.3000
|
||||
# for (obsoleted) libipmctl2 et.al.
|
||||
Obsoletes: ipmctl-data < %{version}
|
||||
Obsoletes: ixpdimm-data < 01.00.00.3000
|
||||
Obsoletes: ixpdimm_sw < 01.00.00.3000
|
||||
Obsoletes: libixpdimm < 01.00.00.3000
|
||||
@ -112,7 +112,7 @@ API for development of Intel Optane DC persistent memory management utilities.
|
||||
! grep -lri 'INTEL CONFIDENTIAL' || exit 1
|
||||
|
||||
%if %{with precompiledSafeC}
|
||||
tar xfJ ../../SOURCES/libsafec-prebuild.tar.xz || sleep 5
|
||||
tar xfJ ../../SOURCES/safeclib-prebuild.tar.xz || sleep 5
|
||||
%endif
|
||||
|
||||
%build
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3e3af263e2d794c1e24435d89d0ee00640b3f9f5d8d73d0250e97cae273c6637
|
||||
size 906503
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:120d12e728670fc709e2f180f9ff57797f74bd1ad882aef341df9111c3358aeb
|
||||
size 10240
|
||||
53
mkSafeC
53
mkSafeC
@ -1,5 +1,9 @@
|
||||
#!/bin/bash
|
||||
|
||||
#SafeC=libsafec
|
||||
SafeC=safeclib
|
||||
SafeCpatches="$1"; shift
|
||||
|
||||
[ -r CMakeLists.txt ]
|
||||
|
||||
perl -pi.00 -e '
|
||||
@ -16,33 +20,54 @@ perl -pi.00 -e 's{/usr/share/ipmctl}{/etc}' src/os/ini/ini.c
|
||||
|
||||
CONTRIB=$PWD/contrib
|
||||
if [ -d $CONTRIB/include ]; then
|
||||
cd $CONTRIB/src/libsafec*
|
||||
cd $CONTRIB/src/${SafeC}*
|
||||
LSC=${PWD##*/}
|
||||
cp -p COPYING $CONTRIB/COPYING.$LSC
|
||||
sleep 2
|
||||
exit 0
|
||||
fi
|
||||
|
||||
mkdir -p contrib/src/patches/libsafec
|
||||
mkdir -p contrib/{src,patches/${SafeC}}
|
||||
|
||||
mv libsafec* contrib/src
|
||||
[ -z "$1" ] || tar xvfC "$1" contrib/src/patches/libsafec
|
||||
cd contrib/src/libsafec*
|
||||
for p in ../patches/libsafec/*.patch; do
|
||||
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
|
||||
done
|
||||
else
|
||||
echo "$SafeCver" > .tarball-version
|
||||
perl -pi.00 -e '
|
||||
s{\[libsafec\]}{[safec-'"$API"']}
|
||||
' configure.ac
|
||||
diff -u configure.ac{.00,} || sleep 4
|
||||
fi
|
||||
|
||||
autoreconf -Wall --install
|
||||
./configure --disable-shared \
|
||||
autoreconf -Wall --install || exit
|
||||
./configure --disable-shared --disable-doc \
|
||||
--enable-static --enable-strmax=0x8000 \
|
||||
--prefix=$CONTRIB \
|
||||
CFLAGS="$RPM_OPT_FLAGS -fPIC -DHAVE_C99"
|
||||
make $2
|
||||
CFLAGS="$RPM_OPT_FLAGS -DHAVE_C99 -DNO_MSABI_VA_FUNCS -fPIC"
|
||||
make "$@"
|
||||
make install
|
||||
|
||||
LSC=${PWD##*/}
|
||||
cp -p COPYING $CONTRIB/COPYING.$LSC
|
||||
|
||||
[ -d $CONTRIB/include/libsafec ] || exit 1
|
||||
[ -r $CONTRIB/include/*/safe_mem_lib.h ] || exit 1
|
||||
|
||||
cd $CONTRIB/..
|
||||
tar cf /tmp/libsafec-prebuild.tar contrib
|
||||
tar cf /tmp/${SafeC}-prebuild.tar contrib
|
||||
|
||||
3
safeclib-3.3.v03032018+git7.59eba324.tar.xz
Normal file
3
safeclib-3.3.v03032018+git7.59eba324.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:edc4d793d89f1b9a67e0228ab3c810ad1bec099214dc87a20ff84d9dddac41bf
|
||||
size 1833672
|
||||
0
safeclib-patches.tar
Normal file
0
safeclib-patches.tar
Normal file
Loading…
Reference in New Issue
Block a user