From d3cd10519a0b1fc85c21d18766eaa97afb7a160d Mon Sep 17 00:00:00 2001 From: Anton Arapov Date: Sep 09 2013 09:36:48 +0000 Subject: Revert "Split-up for Fedora" This reverts commit fd44aeffb21ace3c249a2b71f49d75626fe4f5ec. --- diff --git a/Changelog b/Changelog index ba986ed..a27d2d3 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,9 @@ 2.1-1 14 August 2013, Anton Arapov Intel CPU microcode update. 20130808 +2.1 27 July 2013, Anton Arapov + Remove AMD CPU microcode. Moved to linux-firmware. + 2.0-3 03 April 2013, Anton Arapov Intel CPU microcode update. 20130222 diff --git a/Makefile b/Makefile index e753425..68db587 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,6 @@ PROGRAM = intel-microcode2ucode MICROCODE_INTEL = microcode-20130808.tgz -MICROCODE_AMD = amd-ucode-2012-09-10.tar INS = install CC = gcc @@ -21,7 +20,6 @@ PREFIX = /usr/local INSDIR = $(PREFIX)/sbin DOCDIR = $(PREFIX)/share/doc/microcode_ctl MICDIR = /lib/firmware -MICDIRAMD = $(MICDIR)/amd-ucode MICDIRINTEL = $(MICDIR)/intel-ucode all: microcode_ctl @@ -29,26 +27,19 @@ all: microcode_ctl microcode_ctl: intel-microcode2ucode.c $(CC) $(CFLAGS) -o $(PROGRAM) intel-microcode2ucode.c tar -xOf $(MICROCODE_INTEL) | ./intel-microcode2ucode - >/dev/null - mkdir amd-ucode && tar --strip-components 1 -xf $(MICROCODE_AMD) -C amd-ucode clean: - rm -rf $(PROGRAM) intel-ucode amd-ucode + rm -rf $(PROGRAM) intel-ucode install: $(INS) -d $(DESTDIR)$(INSDIR) $(DESTDIR)$(DOCDIR) \ - $(DESTDIR)$(MICDIRAMD) $(DESTDIR)$(MICDIRINTEL) + $(DESTDIR)$(MICDIRINTEL) $(INS) -m 755 $(PROGRAM) $(DESTDIR)$(INSDIR) $(INS) -m 644 README $(DESTDIR)$(DOCDIR) $(INS) -m 644 intel-ucode/* $(DESTDIR)$(MICDIRINTEL) - $(INS) -m 644 amd-ucode/*.bin $(DESTDIR)$(MICDIRAMD) - $(INS) -m 644 amd-ucode/*.bin.README $(DESTDIR)$(DOCDIR) - $(INS) -m 644 amd-ucode/LICENSE $(DESTDIR)$(DOCDIR)/LICENSE.microcode_amd - $(INS) -m 644 amd-ucode/README $(DESTDIR)$(DOCDIR)/README.microcode_amd - $(INS) -m 644 amd-ucode/INSTALL $(DESTDIR)$(DOCDIR)/INSTALL.microcode_amd uninstall: rm -rf $(DESTDIR)$(INSDIR)/$(PROGRAM) \ $(DESTDIR)$(MICDIRINTEL) \ - $(DESTDIR)$(MICDIRAMD) \ $(DESTDIR)$(DOCDIR) diff --git a/amd-ucode-2012-09-10.tar b/amd-ucode-2012-09-10.tar deleted file mode 100644 index f30f845..0000000 Binary files a/amd-ucode-2012-09-10.tar and /dev/null differ