azure: stop carrying qemu-220 patch

This commit is contained in:
Cole Mickens 2018-06-12 02:03:23 -07:00
parent b224bc1d2b
commit a44a9fdad6
4 changed files with 2 additions and 26 deletions

View File

@ -2,13 +2,13 @@
with lib;
let
diskSize = 30720;
diskSize = 2048;
in
{
system.build.azureImage = import ../../lib/make-disk-image.nix {
name = "azure-image";
postVM = ''
${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd
${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/disk.vhd
'';
configFile = ./azure-config-user.nix;
format = "raw";

View File

@ -1,14 +0,0 @@
diff --git a/Makefile b/Makefile
index d6b9dc1..ce7c493 100644
--- a/Makefile
+++ b/Makefile
@@ -384,8 +384,7 @@ install-confdir:
install-sysconfig: install-datadir install-confdir
$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"
-install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \
-install-datadir install-localstatedir
+install: all $(if $(BUILD_DOCS),install-doc) install-datadir
ifneq ($(TOOLS),)
$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))
endif

View File

@ -14,16 +14,6 @@ rec {
qemu = pkgs.qemu_kvm;
qemu-220 = lib.overrideDerivation pkgs.qemu_kvm (attrs: rec {
version = "2.2.0";
src = fetchurl {
url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n";
};
patches = [ ../../../nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch ];
});
modulesClosure = makeModulesClosure {
inherit kernel rootModules;
firmware = kernel;

View File