Update qubes xen version for QSB 36

For Qubes 3.2: version 4.6.6-35
For Qubes 4.0: version 4.8.2-11
This commit is contained in:
Francis Lam 2017-12-02 14:47:52 -05:00
parent 8d34bcc6bc
commit 491fe083fa
No known key found for this signature in database
GPG Key ID: 0A59C698920806EB
3 changed files with 16 additions and 16 deletions

View File

@ -2,12 +2,12 @@ modules-$(CONFIG_XEN) += xen
ifeq "$(CONFIG_XEN_VERSION)" "4.8"
xen_base_version := 4.8.2
xen_version := $(xen_base_version)-9
xen_hash := c8d2e7d155fd35a40f8da9aab646a18b073488b6dd92b3097d70e541d4f4741e
xen_version := $(xen_base_version)-11
xen_hash := 417bd9585cf8c460812475023bdb80ee964a51205783922b673bed3226d6b91d
else
xen_base_version := 4.6.6
xen_version := $(xen_base_version)-34
xen_hash := b5cc725fc12e0885b5fb4e9f0af6516a3f3025cbe9b49ecdfa71c1c13c4ac55e
xen_version := $(xen_base_version)-35
xen_hash := af1089c84c277d1d88d25b62184fa21518828e034b08dbb4b039a6c1f6676e55
endif
# We extract the entire Xen tree, but only use the xen/xen hypervisor

View File

@ -54,6 +54,16 @@ index b1c8468..74a4c20 100755
+do
+ patch -s -F0 -E -p1 --no-backup-if-mismatch -i $PATCH_DIR/$i
+done
diff --git ./series.conf ./series.conf
index 80972b7..1466c44 100644
--- ./series.conf
+++ ./series.conf
@@ -115,3 +115,5 @@ patches.qubes/libxl-disable-forced-vkb-for-HVM.patch
patches.qubes/xenconsoled-enable-logging.patch
patches.qubes/vm-0001-hotplug-do-not-attempt-to-remove-containing-xenstore.patch
patches.qubes/xen-hotplug-qubesdb-update.patch
+
+patches.heads/heads.patch
diff --git ./patches.heads/heads.patch ./patches.heads/heads.patch
new file mode 100644
index 0000000..bb17c3d
@ -128,13 +138,3 @@ index 0000000..bb17c3d
+ echo " Xen $(XEN_FULLVERSION)" | figlet -f tools/xen.flf > $@.tmp; \
+ else \
+ echo " Xen $(XEN_FULLVERSION)" > $@.tmp; \
diff --git ./series.conf ./series.conf
index 49dc710..164a4dd 100644
--- ./series.conf
+++ ./series.conf
@@ -112,3 +112,5 @@ patches.qubes/libxl-disable-forced-vkb-for-HVM.patch
patches.qubes/xenconsoled-enable-logging.patch
patches.qubes/vm-0001-hotplug-do-not-attempt-to-remove-containing-xenstore.patch
patches.qubes/xen-hotplug-qubesdb-update.patch
+
+patches.heads/heads.patch

View File

@ -115,10 +115,10 @@ index 0000000..d956f8a
+ else \
+ echo " Xen $(XEN_FULLVERSION)" > $@.tmp; \
diff --git ./series.conf ./series.conf
index 98eab7a..f72e088 100644
index 750ec6c..0706300 100644
--- ./series.conf
+++ ./series.conf
@@ -93,6 +93,9 @@ patches.qubes/xenconsoled-enable-logging.patch
@@ -97,6 +97,9 @@ patches.qubes/xenconsoled-enable-logging.patch
patches.qubes/vm-0001-hotplug-do-not-attempt-to-remove-containing-xenstore.patch
patches.qubes/xen-hotplug-qubesdb-update.patch