Unverified Commit 42afc9de authored by Emily's avatar Emily Committed by GitHub
Browse files

Merge pull request #333948 from SigmaSquadron/xen-drop-figs 

xen: code quality updates and generic patch deduplication
parents c79da508 70ff32c4

pkgs/applications/virtualization/xen/4.16/0001-xen-fig-geneneration-4.16.patch

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
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:

pkgs/applications/virtualization/xen/4.16/default.nix

+12 −11
Original line number Diff line number Diff line
@@ -7,19 +7,23 @@ 
}@genericDefinition:



let

  upstreamPatches = import ../patches.nix {

  upstreamPatches = import ../generic/patches.nix {

    inherit lib;

    inherit fetchpatch;

  };



  upstreamPatchList = lib.lists.flatten [

    upstreamPatches.XSA_458

    upstreamPatches.XSA_460

    upstreamPatches.XSA_461

  ];

  upstreamPatchList = lib.lists.flatten (

    with upstreamPatches;

    [

      XSA_458

      XSA_460

      XSA_461

    ]

  );

in



callPackage (import ../generic.nix {

callPackage (import ../generic/default.nix {

  pname = "xen";

  branch = "4.16";

  version = "4.16.6";

  latest = false;
@@ -27,10 +31,7 @@ callPackage (import ../generic.nix { 
    xen = {

      rev = "4b33780de790bd438dd7cbb6143b410d94f0f049";

      hash = "sha256-2kcmfKwBo3w1U5CSxLSYSteqvzcJaB+cA7keVb3amyA=";

      patches = [

        ./0000-xen-ipxe-src-4.16.patch

        ./0001-xen-fig-geneneration-4.16.patch

      ] ++ upstreamPatchList;

      patches = [ ] ++ upstreamPatchList;

    };

    qemu = {

      rev = "c02cb236b5e4a76cf74e641cc35a0e3ebd3e52f3";

pkgs/applications/virtualization/xen/4.17/0000-xen-ipxe-src-4.17.patch

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
Hack to make etherboot use pre-fetched iPXE.



diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile

index ed9e11305f..979a3acea8 100644

--- a/tools/firmware/etherboot/Makefile

+++ b/tools/firmware/etherboot/Makefile

@@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz



 D=ipxe

 T=ipxe.tar.gz

+G=ipxe.git



 ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS)))

 ROM = $D/src/bin/ipxe.bin

@@ -41,9 +42,9 @@ $T:

 	fi

 	mv _$T $T



-$D/src/arch/i386/Makefile: $T Config

-	rm -rf $D

-	gzip -dc $T | tar xf -

+$D/src/arch/i386/Makefile: $G Config

+	mkdir $D

+	cp -a $G/* $D

 	for i in $$(cat patches/series) ; do                 \

 	    patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \

 	done

pkgs/applications/virtualization/xen/4.17/0001-xen-fig-geneneration-4.17.patch

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
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:

pkgs/applications/virtualization/xen/4.17/default.nix

+13 −12
Original line number Diff line number Diff line
@@ -7,20 +7,24 @@ 
}@genericDefinition:



let

  upstreamPatches = import ../patches.nix {

  upstreamPatches = import ../generic/patches.nix {

    inherit lib;

    inherit fetchpatch;

  };



  upstreamPatchList = lib.lists.flatten [

    upstreamPatches.QUBES_REPRODUCIBLE_BUILDS

    upstreamPatches.XSA_458

    upstreamPatches.XSA_460

    upstreamPatches.XSA_461

  ];

  upstreamPatchList = lib.lists.flatten (

    with upstreamPatches;

    [

      QUBES_REPRODUCIBLE_BUILDS

      XSA_458

      XSA_460

      XSA_461

    ]

  );

in



callPackage (import ../generic.nix {

callPackage (import ../generic/default.nix {

  pname = "xen";

  branch = "4.17";

  version = "4.17.4";

  latest = false;
@@ -28,10 +32,7 @@ callPackage (import ../generic.nix { 
    xen = {

      rev = "d530627aaa9b6e03c7f911434bb342fca3d13300";

      hash = "sha256-4ltQUzo4XPzGT/7fGt1hnNMqBQBVF7VP+WXD9ZaJcGo=";

      patches = [

        ./0000-xen-ipxe-src-4.17.patch

        ./0001-xen-fig-geneneration-4.17.patch

      ] ++ upstreamPatchList;

      patches = [ ] ++ upstreamPatchList;

    };

    qemu = {

      rev = "ffb451126550b22b43b62fb8731a0d78e3376c03";