Blacklisted nx_crypto on PowerPCs

nx_crypto is buggy on POWER8 BE VM cpus.

    NVR: hwdata-0.252-7.7

Resolves: rhbz#1211389

Signed-off-by: Michal Minar <miminar@redhat.com>

diff --git a/Makefile b/Makefile
index 1a833b45c9ae8e6e8608b8a7ceed156b500679f6..0fdf474f0ba0dea795b798d190aedd6ec1707a6d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 NAME=hwdata
 VERSION=$(shell awk '/Version:/ { print $$2 }' hwdata.spec)
-RELEASE=$(shell rpm -q --define 'dist %{nil}' --specfile --qf "%{release}" hwdata.spec)
+RELEASE=$(shell rpm -q --define 'dist %{nil}' --specfile --qf "%{release}\n" hwdata.spec | head -n 1)
 ifeq ($(shell git rev-parse --abbrev-ref HEAD | sed -n 's/^\([^0-9-]\+\).*/\L\1/p'), rhel)
     # add revision to tag name for rhel branches
     TAGNAME := $(NAME)-$(VERSION)-$(RELEASE)

diff --git a/blacklist-nx_crypto.patch b/blacklist-nx_crypto.patch
new file mode 100644 (file)
index 0000000..d1455c4
--- /dev/null
+++ b/blacklist-nx_crypto.patch
@@ -0,0 +1,9 @@
+Index: hwdata/blacklist.conf
+===================================================================
+--- hwdata.orig/blacklist.conf
++++ hwdata/blacklist.conf
+@@ -43,3 +43,4 @@ blacklist chsc_sch
+ 
+ # crypto algorithms
+ blacklist sha1-mb
++blacklist nx_crypto

diff --git a/hwdata.spec b/hwdata.spec
index 8deba1aee0c045c59bd15faec78e398511697ec4..0779e2eeb65895dfdeb3ab5306b05ff551bc7ba0 100644 (file)
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -1,4 +1,4 @@
-%global     uprelease   7.6
+%global     uprelease   7.7
 
 Name: hwdata
 Summary: Hardware identification and configuration data
@@ -8,7 +8,6 @@ License: GPLv2+
 Group: System Environment/Base
 Source0: https://fedorahosted.org/releases/h/w/%{name}/%{name}-%{version}-%{uprelease}.tar.bz2
 URL:    http://git.fedorahosted.org/git/hwdata.git
-BuildArch: noarch
 
 BuildRequires   : perl
 
@@ -22,6 +21,9 @@ such as the pci.ids and usb.ids databases.
 
 %prep
 %setup -q -n %{name}-%{version}-%{uprelease}
+%ifarch ppc ppc64
+patch -b -B nx_crypto -p1 < blacklist-nx_crypto.patch
+%endif
 %configure
 
 %build
@@ -47,6 +49,10 @@ udevadm hwdb --update >/dev/null 2>&1 || :
 %{_datadir}/%{name}/*
 
 %changelog
+* Tue Apr 14 2015 Michal Minar <miminar@redhat.com> 0.252-7.7
+- Blacklisted module nx_crypto on PowerPCs.
+- Resolves: rhbz#1211389
+
 * Fri Apr 10 2015 Michal Minar <miminar@redhat.com> 0.252-7.6
 - Blacklisted experimental module sha1-mb.
 - Resolves: rhbz#1208120