From e4b3441f2933ee97536b8269c62c710d49432cd9 Mon Sep 17 00:00:00 2001
From: CentOS Buildsys <bugs@centos.org>
Date: Mar 12 2014 09:23:40 +0000
Subject: import microcode_ctl-2.1-7.1.el7.src.rpm


---

diff --git a/.microcode_ctl.metadata b/.microcode_ctl.metadata
index 1abbc18..8aea4fd 100644
--- a/.microcode_ctl.metadata
+++ b/.microcode_ctl.metadata
@@ -1 +1 @@
-981d5da6984e978a5a3caba730d32a1fea7a75db SOURCES/microcode_ctl-2.1-2.tar.xz
+b56311920cf3dc91db708bcb584d305c87dc69a9 SOURCES/microcode_ctl-2.1-3.tar.xz
diff --git a/SOURCES/01-microcode.conf b/SOURCES/01-microcode.conf
new file mode 100644
index 0000000..52511c0
--- /dev/null
+++ b/SOURCES/01-microcode.conf
@@ -0,0 +1 @@
+early_microcode="yes"
diff --git a/SOURCES/microcode.service b/SOURCES/microcode.service
new file mode 100644
index 0000000..7dcecf5
--- /dev/null
+++ b/SOURCES/microcode.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Load CPU microcode update
+After=basic.target
+ConditionVirtualization=false
+
+[Service]
+Type=oneshot
+RemainAfterExit=no
+ExecStart=/usr/bin/bash -c "echo 1 > /sys/devices/system/cpu/microcode/reload"
+
+[Install]
+WantedBy=basic.target
diff --git a/SPECS/microcode_ctl.spec b/SPECS/microcode_ctl.spec
index 5207777..06dfd0f 100644
--- a/SPECS/microcode_ctl.spec
+++ b/SPECS/microcode_ctl.spec
@@ -1,16 +1,22 @@
-%define upstream_version 2.1-2
+%define upstream_version 2.1-3
 
 Summary:        Tool to transform and deploy CPU microcode update for x86.
 Name:           microcode_ctl
 Version:        2.1
-Release:        3%{?dist}
+Release:        7.1%{?dist}
 Epoch:          2
 Group:          System Environment/Base
 License:        GPLv2+ and Redistributable, no modification permitted
 URL:            http://fedorahosted.org/microcode_ctl
 Source0:        http://fedorahosted.org/released/microcode_ctl/%{name}-%{upstream_version}.tar.xz
+Source1:        microcode.service
+Source2:        01-microcode.conf
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 ExclusiveArch:  %{ix86} x86_64
+BuildRequires:  systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 
 %description
 The microcode_ctl utility is a companion to the microcode driver written
@@ -30,16 +36,51 @@ make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} INSDIR=/usr/sbin install clean
 
+mkdir -p %{buildroot}/usr/lib/dracut/dracut.conf.d
+mkdir -p %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
+install -m 644 %{SOURCE2} %{buildroot}/usr/lib/dracut/dracut.conf.d
+
+%post
+%systemd_post microcode.service
+# "reload" file is not presented on a certain virtualized hw
+if [ -f /sys/devices/system/cpu/microcode/reload ] ; then
+	echo 1 > /sys/devices/system/cpu/microcode/reload
+fi
+
+%preun
+%systemd_preun microcode.service
+
+%postun
+%systemd_postun microcode.service
+
 %clean
 rm -rf %{buildroot}
 
 %files
 /usr/sbin/intel-microcode2ucode
 /lib/firmware/*
+%config(noreplace) /usr/lib/dracut/dracut.conf.d/01-microcode.conf
+%{_unitdir}/microcode.service
 %doc /usr/share/doc/microcode_ctl/*
 
 
 %changelog
+* Wed Mar 12 2014 Anton Arapov <anton@redhat.com> - 2.1-7.1
+- Fix the microcode's behaviour in virtual environment.
+
+* Fri Feb 28 2014 Anton Arapov <anton@redhat.com> - 2.1-7
+- Fix the microcode's dracut configuration file location. 
+
+* Tue Feb 18 2014 Anton Arapov <anton@redhat.com> - 2.1-6
+- Enable early microcode capabilities. Systemd and Dracut support. (Jeff Bastian)
+
+* Fri Jan 24 2014 Anton Arapov <anton@redhat.com> - 2.1-5
+- Update to upstream 2.1-3. Intel CPU microcode update to 20140122.
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 2:2.1-4
+- Mass rebuild 2013-12-27
+
 * Mon Sep 09 2013 Anton Arapov <anton@redhat.com> 2.1-3
 - Imported to RHEL tree