From 8bff301767685af3088e9019b71b750e17cac74a60406947c8acab6c74f44597 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Wed, 30 Apr 2014 14:16:25 +0000 Subject: [PATCH] Accepting request 232071 from home:msmeissn:branches:Base:System - consolidate -fips-aesni into -fips again. The problem due to it was split off upstream was solved in the kernel. OBS-URL: https://build.opensuse.org/request/show/232071 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=137 --- dracut.changes | 6 ++++++ dracut.spec | 15 --------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dracut.changes b/dracut.changes index 1f73581..9456de2 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 29 15:43:28 UTC 2014 - meissner@suse.com + +- consolidate -fips-aesni into -fips again. The problem due to it + was split off upstream was solved in the kernel. + ------------------------------------------------------------------- Fri Apr 25 13:48:45 UTC 2014 - meissner@suse.com diff --git a/dracut.spec b/dracut.spec index 4463c69..45154dd 100644 --- a/dracut.spec +++ b/dracut.spec @@ -106,17 +106,6 @@ This package requires everything which is needed to build an initramfs with dracut, which does an integrity check of the kernel and its cryptography during startup. -%package fips-aesni -Summary: dracut modules to build a dracut initramfs with an integrity check with aesni-intel -Group: System/Base -Requires: %{name}-fips = %{version}-%{release} - -%description fips-aesni -This package requires everything which is needed to build an -initramfs with dracut, which does an integrity check on vmlinuz and the crypto system -and also adds the aesni-intel kernel module. - - %prep %setup -q %patch10 -p1 @@ -221,10 +210,6 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra %doc COPYING %config %{_sysconfdir}/dracut.conf.d/40-fips.conf %{dracutlibdir}/modules.d/01fips - -%files fips-aesni -%defattr(-,root,root,0755) -%doc COPYING %{dracutlibdir}/modules.d/02fips-aesni %files