xen: add patch to fix hydra failure

Second time's the charm! We have a transient SIGPIPE error caused by the
Figs makefile. This seems to only be reproducible in some Hydra
machines. This patch can be upstreamed into Xen if it fixes the build
failures.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
This commit is contained in:
Fernando Rodrigues 2024-08-10 19:54:04 +00:00
parent bef98989a2
commit 8a310ff87d
No known key found for this signature in database
GPG Key ID: CC3AE2EA00000000
8 changed files with 80 additions and 4 deletions

View File

@ -0,0 +1,16 @@
Remove a pipe that was causing SIGPIPE
issues on overloaded Hydra machines.
diff --git a/docs/figs/Makefile b/docs/figs/Makefile
index e128a4364f..943f745dda 100644
--- a/docs/figs/Makefile
+++ b/docs/figs/Makefile
@@ -8,7 +8,7 @@ TARGETS= network-bridge.png network-basic.png
all: $(TARGETS)
%.png: %.fig
- $(FIG2DEV) -L png $< >$@.tmp
+ $(FIG2DEV) -L png $< $@.tmp
mv -f $@.tmp $@
clean:

View File

@ -23,7 +23,10 @@ callPackage (import ../generic.nix {
xen = {
rev = "4b33780de790bd438dd7cbb6143b410d94f0f049";
hash = "sha256-2kcmfKwBo3w1U5CSxLSYSteqvzcJaB+cA7keVb3amyA=";
patches = [ ./0000-xen-ipxe-src-4.16.patch ] ++ upstreamPatchList;
patches = [
./0000-xen-ipxe-src-4.16.patch
./0001-xen-fig-geneneration-4.16.patch
] ++ upstreamPatchList;
};
qemu = {
rev = "c02cb236b5e4a76cf74e641cc35a0e3ebd3e52f3";

View File

@ -0,0 +1,16 @@
Remove a pipe that was causing SIGPIPE
issues on overloaded Hydra machines.
diff --git a/docs/figs/Makefile b/docs/figs/Makefile
index e128a4364f..943f745dda 100644
--- a/docs/figs/Makefile
+++ b/docs/figs/Makefile
@@ -8,7 +8,7 @@ TARGETS= network-bridge.png network-basic.png
all: $(TARGETS)
%.png: %.fig
- $(FIG2DEV) -L png $< >$@.tmp
+ $(FIG2DEV) -L png $< $@.tmp
mv -f $@.tmp $@
clean:

View File

@ -26,7 +26,10 @@ callPackage (import ../generic.nix {
xen = {
rev = "d530627aaa9b6e03c7f911434bb342fca3d13300";
hash = "sha256-4ltQUzo4XPzGT/7fGt1hnNMqBQBVF7VP+WXD9ZaJcGo=";
patches = [ ./0000-xen-ipxe-src-4.17.patch ] ++ upstreamPatchList;
patches = [
./0000-xen-ipxe-src-4.17.patch
./0001-xen-fig-geneneration-4.17.patch
] ++ upstreamPatchList;
};
qemu = {
rev = "ffb451126550b22b43b62fb8731a0d78e3376c03";

View File

@ -0,0 +1,16 @@
Remove a pipe that was causing SIGPIPE
issues on overloaded Hydra machines.
diff --git a/docs/figs/Makefile b/docs/figs/Makefile
index e128a4364f..943f745dda 100644
--- a/docs/figs/Makefile
+++ b/docs/figs/Makefile
@@ -8,7 +8,7 @@ TARGETS= network-bridge.png network-basic.png
all: $(TARGETS)
%.png: %.fig
- $(FIG2DEV) -L png $< >$@.tmp
+ $(FIG2DEV) -L png $< $@.tmp
mv -f $@.tmp $@
clean:

View File

@ -26,7 +26,10 @@ callPackage (import ../generic.nix {
xen = {
rev = "d152a0424677d8b78e00ed1270a583c5dafff16f";
hash = "sha256-pHCjj+Bcy4xQfB9xHU9fccFwVdP2DXrUhdszwGvrdmY=";
patches = [ ./0000-xen-ipxe-src-4.18.patch ] ++ upstreamPatchList;
patches = [
./0000-xen-ipxe-src-4.18.patch
./0001-xen-fig-geneneration-4.18.patch
] ++ upstreamPatchList;
};
qemu = {
rev = "0df9387c8983e1b1e72d8c574356f572342c03e6";

View File

@ -0,0 +1,16 @@
Remove a pipe that was causing SIGPIPE
issues on overloaded Hydra machines.
diff --git a/docs/figs/Makefile b/docs/figs/Makefile
index e128a4364f..943f745dda 100644
--- a/docs/figs/Makefile
+++ b/docs/figs/Makefile
@@ -8,7 +8,7 @@ TARGETS= network-bridge.png network-basic.png
all: $(TARGETS)
%.png: %.fig
- $(FIG2DEV) -L png $< >$@.tmp
+ $(FIG2DEV) -L png $< $@.tmp
mv -f $@.tmp $@
clean:

View File

@ -23,7 +23,10 @@ callPackage (import ../generic.nix {
xen = {
rev = "026c9fa29716b0ff0f8b7c687908e71ba29cf239";
hash = "sha256-Q6x+2fZ4ITBz6sKICI0NHGx773Rc919cl+wzI89UY+Q=";
patches = [ ./0000-xen-ipxe-src-4.19.patch ] ++ upstreamPatchList;
patches = [
./0000-xen-ipxe-src-4.19.patch
./0001-xen-fig-geneneration-4.19.patch
] ++ upstreamPatchList;
};
qemu = {
rev = "0df9387c8983e1b1e72d8c574356f572342c03e6";