Reverted submodule name back to xen

Makefile

@@ -267,7 +267,7 @@ bin_modules-$(CONFIG_FLASHROM) += flashrom
 bin_modules-$(CONFIG_CRYPTSETUP) += cryptsetup
 bin_modules-$(CONFIG_GPG) += gpg
 bin_modules-$(CONFIG_LVM2) += lvm2
-bin_modules-$(CONFIG_QUBES_VMM_XEN) += qubes-vmm-xen
+bin_modules-$(CONFIG_XEN) += xen
 bin_modules-$(CONFIG_DROPBEAR) += dropbear
 
 $(foreach m, $(bin_modules-y), \
@@ -279,7 +279,7 @@ $(foreach m, $(modules-y), \
 	$(call map,initrd_lib_add,$(call libs,$m)) \
 )
 
-#$(foreach _, $(call outputs,qubes-vmm-xen), $(eval $(call initrd_bin,$_)))
+#$(foreach _, $(call outputs,xen), $(eval $(call initrd_bin,$_)))
 
 # hack to install busybox into the initrd
 initrd.cpio: busybox.intermediate

config/purism13v1-qubes.config

@@ -12,7 +12,7 @@ CONFIG_PCIUTILS=y
 CONFIG_POPT=y
 CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
-CONFIG_QUBES_VMM_XEN=y
+CONFIG_XEN=y
 
 CONFIG_LINUX_USB=y
 #CONFIG_LINUX_E1000E=y

config/qemu-moc.config

@@ -14,7 +14,7 @@ CONFIG_POPT=y
 CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
 CONFIG_DROPBEAR=y
-CONFIG_QUBES_VMM_XEN=y
+CONFIG_XEN=y
 
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000=y

config/x220-qubes.config

@@ -12,7 +12,7 @@ CONFIG_PCIUTILS=y
 CONFIG_POPT=y
 CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
-CONFIG_QUBES_VMM_XEN=y
+CONFIG_XEN=y
 CONFIG_DROPBEAR=y
 
 CONFIG_LINUX_USB=y

config/x230-moc.config

@@ -15,7 +15,7 @@ CONFIG_TPMTOTP=y
 CONFIG_DROPBEAR=y
 
 # xen is not used on the MOC machines
-CONFIG_QUBES_VMM_XEN=n
+CONFIG_XEN=n
 
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y

config/x230-qubes.config

@@ -12,7 +12,7 @@ CONFIG_PCIUTILS=y
 CONFIG_POPT=y
 CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
-CONFIG_QUBES_VMM_XEN=y
+CONFIG_XEN=y
 CONFIG_DROPBEAR=y
 
 CONFIG_LINUX_USB=y

modules/qubes-vmm-xen

@@ -1,21 +0,0 @@
-modules-$(CONFIG_QUBES_VMM_XEN) += qubes-vmm-xen
-
-# We extract the entire Xen tree, but only use the xen/xen hypervisor
-# portion since Qubes provides the rest of it.
-xen_version := 4.6.5
-qubes-vmm-xen_version := $(xen_version)-28
-qubes-vmm-xen_dir := qubes-vmm-xen-$(qubes-vmm-xen_version)/
-qubes-vmm-xen_tar := qubes-vmm-xen-$(qubes-vmm-xen_version).tar.gz
-qubes-vmm-xen_url := https://github.com/QubesOS/qubes-vmm-xen/archive/v$(qubes-vmm-xen_version).tar.gz
-qubes-vmm-xen_hash := 314b01af6726ed7b09dfd72ff8b224636d822d432790765287abeedc81fd86b2
-
-qubes-vmm-xen_depends := musl-cross
-
-qubes-vmm-xen_output := xen-$(xen_version)/xen/xen.gz
-qubes-vmm-xen_configure :=
-
-qubes-vmm-xen_target := \
-	$(MAKE_JOBS) \
-	$(CROSS_TOOLS_NOCC) \
-	CC="$(CROSS)gcc -Wno-builtin-macro-redefined -D__FILE__=\\\"__FILE__\\\"" \
-	xen.gz

modules/xen

@@ -0,0 +1,21 @@
+modules-$(CONFIG_XEN) += xen
+
+# We extract the entire Xen tree, but only use the xen/xen hypervisor
+# portion since Qubes provides the rest of it.
+xen_base_version := 4.6.5
+xen_version := $(xen_base_version)-28
+xen_dir := qubes-vmm-xen-$(xen_version)/
+xen_tar := qubes-vmm-xen-$(xen_version).tar.gz
+xen_url := https://github.com/QubesOS/qubes-vmm-xen/archive/v$(xen_version).tar.gz
+xen_hash := 314b01af6726ed7b09dfd72ff8b224636d822d432790765287abeedc81fd86b2
+
+xen_depends := musl-cross
+
+xen_output := xen-$(xen_base_version)/xen/xen.gz
+xen_configure :=
+
+xen_target := \
+	$(MAKE_JOBS) \
+	$(CROSS_TOOLS_NOCC) \
+	CC="$(CROSS)gcc -Wno-builtin-macro-redefined -D__FILE__=\\\"__FILE__\\\"" \
+	xen.gz