Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/common/i586/intel-microcode b/config/rootfiles/common/i586/intel-microcode
index 3185cd01ab244db7343190814bd98a2a4bd5bf27..ee43ff0154d62dd4dc85b7fa689e946a1a54bc3d 100644 (file)
--- a/config/rootfiles/common/i586/intel-microcode
+++ b/config/rootfiles/common/i586/intel-microcode
@@ -84,7 +84,6 @@ lib/firmware/intel-ucode/06-7a-01
 lib/firmware/intel-ucode/06-7a-08
 lib/firmware/intel-ucode/06-7e-05
 lib/firmware/intel-ucode/06-8a-01
-lib/firmware/intel-ucode/06-8c-01
 lib/firmware/intel-ucode/06-8e-09
 lib/firmware/intel-ucode/06-8e-0a
 lib/firmware/intel-ucode/06-8e-0b

diff --git a/config/rootfiles/common/x86_64/intel-microcode b/config/rootfiles/common/x86_64/intel-microcode
index 3185cd01ab244db7343190814bd98a2a4bd5bf27..ee43ff0154d62dd4dc85b7fa689e946a1a54bc3d 100644 (file)
--- a/config/rootfiles/common/x86_64/intel-microcode
+++ b/config/rootfiles/common/x86_64/intel-microcode
@@ -84,7 +84,6 @@ lib/firmware/intel-ucode/06-7a-01
 lib/firmware/intel-ucode/06-7a-08
 lib/firmware/intel-ucode/06-7e-05
 lib/firmware/intel-ucode/06-8a-01
-lib/firmware/intel-ucode/06-8c-01
 lib/firmware/intel-ucode/06-8e-09
 lib/firmware/intel-ucode/06-8e-0a
 lib/firmware/intel-ucode/06-8e-0b

diff --git a/lfs/intel-microcode b/lfs/intel-microcode
index 78bac95823008a81e47a0565be63e846ee53da66..1aa57cabec856c342d1bb911235d3d136d36189a 100644 (file)
--- a/lfs/intel-microcode
+++ b/lfs/intel-microcode
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 20201112
+VER        = 20201118
 
 THISAPP    = Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d48388782e322c258e17f7d79201a9e0
+$(DL_FILE)_MD5 = 6248f95036923c5982800e3f97e08bb8
 
 install : $(TARGET)
 

diff --git a/lfs/linux b/lfs/linux
index c731a368206979166f265d93359b59949710d015..04205ee57e4742ba2afaf1e10050865bb5149b19 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.209
-ARM_PATCHES = 4.14.209-ipfire0
+VER         = 4.14.210
+ARM_PATCHES = 4.14.210-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -79,7 +79,7 @@ objects =$(DL_FILE) \
 $(DL_FILE)                                     = $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz      = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                                 = 5510838fe3b4feeab06395353435b3d1
+$(DL_FILE)_MD5                                 = 84918d49079e7a75b4c2450fa3b4fcb9
 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 2b0e8e3ebe9827b2bfed7397b043dbc5
 
 install : $(TARGET)