rpm/s390-tools
SHA256
1
0
Fork 0
forked from pool/s390-tools
Code Pull Requests Activity

Accepting request 666551 from home:markkp:branches:Base:System

Browse Source 
- Enable cryptsetup now that version 2 is included in SLES15 SP1.
  (Fate#325684)

OBS-URL: https://build.opensuse.org/request/show/666551
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=69
This commit is contained in:
Mark Post 2019-01-16 21:38:23 +00:00 committed by Git OBS Bridge
parent 3a20173448
commit a3eb83fa88
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
s390-tools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 15 21:37:32 UTC 2019 - mpost@suse.com
- Enable cryptsetup now that version 2 is included in SLES15 SP1.
(Fate#325684)
-------------------------------------------------------------------
Mon Jan 14 17:03:37 UTC 2019 - mpost@suse.com

7
s390-tools.spec
View File

@ -194,6 +194,8 @@ BuildRequires: gcc-c++
BuildRequires: gettext-tools
BuildRequires: glibc-devel-static
BuildRequires: kernel-zfcpdump
BuildRequires: libcryptsetup-devel > 2.0.3
BuildRequires: libjson-c-devel
BuildRequires: libpfm-devel
BuildRequires: ncurses-devel
BuildRequires: net-snmp-devel
@ -380,14 +382,13 @@ export OPT_FLAGS="%{optflags}"
export KERNELIMAGE_MAKEFLAGS="%%{?_smp_mflags}"
make %{?_smp_mflags} \
ZFCPDUMP_DIR=%{_prefix}/lib/s390-tools/zfcpdump \
DISTRELEASE=%{release} \
HAVE_CRYPTSETUP2=0
DISTRELEASE=%{release}
gcc -static -o read_values ${OPT_FLAGS} %{SOURCE86} -lqc
%install
mkdir -p %{buildroot}/boot/zipl
mkdir -p %{buildroot}%{_sysconfdir}//zkey/repository
%make_install HAVE_CRYPTSETUP2=0 \
%make_install \
ZFCPDUMP_DIR=%{_prefix}/lib/s390-tools/zfcpdump \
DISTRELEASE=%{release} \
SYSTEMDSYSTEMUNITDIR=%{_unitdir} \