libvirt: Ship all CPU maps

Reported-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/libvirt b/config/rootfiles/packages/libvirt
index b78b733b8c540b19310e41a98d309526184ac7fc..1c531b82011c1afb0657b1d9cfc5951bbc268d62 100644 (file)
--- a/config/rootfiles/packages/libvirt
+++ b/config/rootfiles/packages/libvirt
@@ -455,20 +455,20 @@ usr/share/libvirt/cpu_map/x86_Broadwell-IBRS.xml
 usr/share/libvirt/cpu_map/x86_Broadwell-noTSX-IBRS.xml
 usr/share/libvirt/cpu_map/x86_Broadwell-noTSX.xml
 usr/share/libvirt/cpu_map/x86_Broadwell.xml
-#usr/share/libvirt/cpu_map/x86_Cascadelake-Server-noTSX.xml
+usr/share/libvirt/cpu_map/x86_Cascadelake-Server-noTSX.xml
 usr/share/libvirt/cpu_map/x86_Cascadelake-Server.xml
 usr/share/libvirt/cpu_map/x86_Conroe.xml
-#usr/share/libvirt/cpu_map/x86_Cooperlake.xml
-#usr/share/libvirt/cpu_map/x86_Dhyana.xml
+usr/share/libvirt/cpu_map/x86_Cooperlake.xml
+usr/share/libvirt/cpu_map/x86_Dhyana.xml
 usr/share/libvirt/cpu_map/x86_EPYC-IBPB.xml
 usr/share/libvirt/cpu_map/x86_EPYC.xml
 usr/share/libvirt/cpu_map/x86_Haswell-IBRS.xml
 usr/share/libvirt/cpu_map/x86_Haswell-noTSX-IBRS.xml
 usr/share/libvirt/cpu_map/x86_Haswell-noTSX.xml
 usr/share/libvirt/cpu_map/x86_Haswell.xml
-#usr/share/libvirt/cpu_map/x86_Icelake-Client-noTSX.xml
+usr/share/libvirt/cpu_map/x86_Icelake-Client-noTSX.xml
 usr/share/libvirt/cpu_map/x86_Icelake-Client.xml
-#usr/share/libvirt/cpu_map/x86_Icelake-Server-noTSX.xml
+usr/share/libvirt/cpu_map/x86_Icelake-Server-noTSX.xml
 usr/share/libvirt/cpu_map/x86_Icelake-Server.xml
 usr/share/libvirt/cpu_map/x86_IvyBridge-IBRS.xml
 usr/share/libvirt/cpu_map/x86_IvyBridge.xml
@@ -483,10 +483,10 @@ usr/share/libvirt/cpu_map/x86_Penryn.xml
 usr/share/libvirt/cpu_map/x86_SandyBridge-IBRS.xml
 usr/share/libvirt/cpu_map/x86_SandyBridge.xml
 usr/share/libvirt/cpu_map/x86_Skylake-Client-IBRS.xml
-#usr/share/libvirt/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+usr/share/libvirt/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
 usr/share/libvirt/cpu_map/x86_Skylake-Client.xml
 usr/share/libvirt/cpu_map/x86_Skylake-Server-IBRS.xml
-#usr/share/libvirt/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+usr/share/libvirt/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
 usr/share/libvirt/cpu_map/x86_Skylake-Server.xml
 usr/share/libvirt/cpu_map/x86_Westmere-IBRS.xml
 usr/share/libvirt/cpu_map/x86_Westmere.xml

diff --git a/lfs/libvirt b/lfs/libvirt
index dde05dac948e72e3721ee7d346a924f06ea64f8f..f41b32e467633e77c90374ceb83da4f023b902f0 100644 (file)
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = libvirt
-PAK_VER    = 21
+PAK_VER    = 22
 
 DEPS       = libpciaccess libyajl ncat qemu