Merge branch 'next' into temp-c165-development

diff --git a/config/rootfiles/packages/libvirt b/config/rootfiles/packages/libvirt
index b6f639901bc3d777407c402cc1a925789472b285..e57ead0691cb78488567742ee5cf0b3e0e4c0d2f 100644 (file)
--- a/config/rootfiles/packages/libvirt
+++ b/config/rootfiles/packages/libvirt
@@ -206,16 +206,16 @@ usr/sbin/virtstoraged
 #usr/share/doc/libvirt/examples/xml/test/testvol.xml
 #usr/share/libvirt
 #usr/share/libvirt/cpu_map
-#usr/share/libvirt/cpu_map/arm_FT-2000plus.xml
-#usr/share/libvirt/cpu_map/arm_Falkor.xml
-#usr/share/libvirt/cpu_map/arm_Kunpeng-920.xml
-#usr/share/libvirt/cpu_map/arm_Tengyun-S2500.xml
-#usr/share/libvirt/cpu_map/arm_ThunderX299xx.xml
-#usr/share/libvirt/cpu_map/arm_cortex-a53.xml
-#usr/share/libvirt/cpu_map/arm_cortex-a57.xml
-#usr/share/libvirt/cpu_map/arm_cortex-a72.xml
-#usr/share/libvirt/cpu_map/arm_features.xml
-#usr/share/libvirt/cpu_map/arm_vendors.xml
+usr/share/libvirt/cpu_map/arm_FT-2000plus.xml
+usr/share/libvirt/cpu_map/arm_Falkor.xml
+usr/share/libvirt/cpu_map/arm_Kunpeng-920.xml
+usr/share/libvirt/cpu_map/arm_Tengyun-S2500.xml
+usr/share/libvirt/cpu_map/arm_ThunderX299xx.xml
+usr/share/libvirt/cpu_map/arm_cortex-a53.xml
+usr/share/libvirt/cpu_map/arm_cortex-a57.xml
+usr/share/libvirt/cpu_map/arm_cortex-a72.xml
+usr/share/libvirt/cpu_map/arm_features.xml
+usr/share/libvirt/cpu_map/arm_vendors.xml
 usr/share/libvirt/cpu_map/index.xml
 usr/share/libvirt/cpu_map/ppc64_POWER6.xml
 usr/share/libvirt/cpu_map/ppc64_POWER7.xml

diff --git a/lfs/libvirt b/lfs/libvirt
index ec0154e5bdbbe1684ba19140fbcff80f964a821c..d9df3bdbe7dd3c01c0d916311e34c2db690d2eec 100644 (file)
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -35,7 +35,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64 aarch64
 PROG       = libvirt
-PAK_VER    = 27
+PAK_VER    = 28
 
 DEPS       = ebtables libpciaccess libtirpc libyajl ncat qemu