[PATCH 1/2] libvirt: Ship all CPU maps

[PATCH 1/2] libvirt: Ship all CPU maps

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2913 bytes --]

Reported-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 config/rootfiles/packages/libvirt | 14 +++++++-------
 lfs/libvirt                       |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/rootfiles/packages/libvirt b/config/rootfiles/packages/libvirt
index b78b733b8..1c531b820 100644
--- 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 dde05dac9..f41b32e46 100644
--- 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
 
-- 
2.12.2

[PATCH 2/2] libvirt: Depend on ebtables

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 786 bytes --]

libvirtd requires this to create some custom firewall rules

Reported-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 lfs/libvirt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lfs/libvirt b/lfs/libvirt
index f41b32e46..4d8fe806f 100644
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -33,9 +33,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = libvirt
-PAK_VER    = 22
+PAK_VER    = 23
 
-DEPS       = libpciaccess libyajl ncat qemu
+DEPS       = ebtables libpciaccess libyajl ncat qemu
 
 ###############################################################################
 # Top-level Rules
-- 
2.12.2