BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Remove some old KVM versions.

Browse source 
svn path=/nixpkgs/trunk/; revision=16581
This commit is contained in:
Eelco Dolstra 2009-08-04 15:57:12 +00:00
parent 300ee8aea5
commit af3b8475ff
6 changed files with 0 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkgs/os-specific/linux/kvm/57.nix
View file

@ -1,34 +0,0 @@
{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib}:
assert stdenv.isLinux;
stdenv.mkDerivation {
name = "kvm-57";
src = fetchurl {
url = mirror://sourceforge/kvm/kvm-57.tar.gz;
sha256 = "016h5pf59fyz7skzsaprii2mdpxpb8hfnnr1w475qcfyy6ccr9r0";
};
patches = [
# Allow setting the path to Samba through $QEMU_SMBD_COMMAND.
./smbd-path.patch
];
configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}";
# e2fsprogs is needed for libuuid.
buildInputs = [zlib e2fsprogs SDL alsaLib];
preConfigure = ''
for i in configure user/configure; do
substituteInPlace $i --replace /bin/bash $shell
done
substituteInPlace libkvm/Makefile --replace kvm_para.h kvm.h # !!! quick hack
'';
meta = {
homepage = http://kvm.qumranet.com/;
description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";
};
}

38
pkgs/os-specific/linux/kvm/76.nix
View file

@ -1,38 +0,0 @@
{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib, pkgconfig, rsync}:
assert stdenv.isLinux;
stdenv.mkDerivation {
name = "kvm-76";
src = fetchurl {
url = mirror://sourceforge/kvm/kvm-76.tar.gz;
sha256 = "06gf2aic6n0b3fnd9vi0llyydr2w6qnx1k8imm710862xhncpssk";
};
patches = [
# Allow setting the path to Samba through $QEMU_SMBD_COMMAND.
./smbd-path.patch
# The makefile copies stuff from the kernel directory and then
# tries to modify the copy, but it must be made writable first.
./readonly-kernel-r2.patch
];
configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}";
# e2fsprogs is needed for libuuid.
# rsync is a weird dependency used for copying kernel header files.
buildInputs = [zlib e2fsprogs SDL alsaLib pkgconfig rsync];
preConfigure = ''
for i in configure user/configure; do
substituteInPlace $i --replace /bin/bash $shell
done
substituteInPlace libkvm/Makefile --replace kvm_para.h kvm.h # !!! quick hack
'';
meta = {
homepage = http://kvm.qumranet.com/;
description = "A full virtualization solution for Linux on x86 hardware containing virtualization extensions";
};
}

15
pkgs/os-specific/linux/kvm/readonly-kernel-r2.patch
View file

@ -1,15 +0,0 @@
diff -rc kvm-74-orig/kernel/Makefile kvm-74/kernel/Makefile
*** kvm-74-orig/kernel/Makefile 2008-08-27 10:53:37.000000000 +0200
--- kvm-74/kernel/Makefile 2008-08-29 14:12:00.000000000 +0200
***************
*** 59,64 ****
--- 59,65 ----
-rsync -R \
"$(LINUX)"/arch/$(ARCH_DIR)/include/asm/./kvm*.h \
$T/include/asm-$(ARCH_DIR)/
+ chmod -R u+w $T
set -e && for i in $(find $T -name '*.h'); do \
$(call unifdef,$$i); done
Only in kvm-74/kernel: Makefile~
Only in kvm-74/kernel: Makefile.rej

14
pkgs/os-specific/linux/kvm/readonly-kernel-r3.patch
View file

@ -1,14 +0,0 @@
diff -rc kvm-78-orig/kernel/Makefile kvm-78/kernel/Makefile
*** kvm-78-orig/kernel/Makefile 2008-10-30 11:58:12.000000000 +0100
--- kvm-78/kernel/Makefile 2008-11-07 15:59:34.000000000 +0100
***************
*** 66,71 ****
--- 66,72 ----
"$(LINUX)"/./include/linux/kvm*.h \
$(if $(wildcard $(headers-old)), $(headers-old)) \
$T/
+ chmod -R u+w $T
$(if $(wildcard $(headers-new)), \
rsync -R \
$(headers-new) \
Only in kvm-78/kernel: Makefile~

48
pkgs/os-specific/linux/kvm/smbd-path.patch
View file

@ -1,48 +0,0 @@
diff -rc kvm-57-orig/qemu/vl.c kvm-57/qemu/vl.c
*** kvm-57-orig/qemu/vl.c 2007-12-18 16:57:46.000000000 +0100
--- kvm-57/qemu/vl.c 2008-08-26 13:17:57.000000000 +0200
***************
*** 141,147 ****
#ifdef __sun__
#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
#else
! #define SMBD_COMMAND "/usr/sbin/smbd"
#endif
//#define DEBUG_UNUSED_IOPORT
--- 141,147 ----
#ifdef __sun__
#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
#else
! #define SMBD_COMMAND "smbd"
#endif
//#define DEBUG_UNUSED_IOPORT
***************
*** 3828,3838 ****
slirp_init();
}
! /* XXX: better tmp dir construction */
! snprintf(smb_dir, sizeof(smb_dir), "/tmp/qemu-smb.%d", getpid());
! if (mkdir(smb_dir, 0700) < 0) {
! fprintf(stderr, "qemu: could not create samba server dir '%s'\n", smb_dir);
! exit(1);
}
snprintf(smb_conf, sizeof(smb_conf), "%s/%s", smb_dir, "smb.conf");
--- 3828,3840 ----
slirp_init();
}
! while (1) {
! snprintf(smb_dir, sizeof(smb_dir), "/tmp/qemu-smb.%d.%d", getpid(), random());
! if (mkdir(smb_dir, 0700) == 0) break;
! if (errno != EEXIST) {
! fprintf(stderr, "qemu: could not create samba server dir '%s'\n", smb_dir);
! exit(1);
! }
}
snprintf(smb_conf, sizeof(smb_conf), "%s/%s", smb_dir, "smb.conf");
Only in kvm-57/qemu: vl.c~

11
pkgs/top-level/all-packages.nix
View file

@ -5288,17 +5288,6 @@ let
kvm = kvm86;
kvm57 = import ../os-specific/linux/kvm/57.nix {
inherit fetchurl zlib e2fsprogs SDL alsaLib;
stdenv = overrideGCC stdenv gcc34;
kernelHeaders = kernelHeaders_2_6_23;
};
kvm76 = import ../os-specific/linux/kvm/76.nix {
inherit fetchurl stdenv zlib e2fsprogs SDL alsaLib pkgconfig rsync;
inherit (glibc) kernelHeaders;
};
kvm86 = import ../os-specific/linux/kvm/86.nix {
inherit fetchurl stdenv zlib SDL alsaLib pkgconfig pciutils;
inherit (glibc) kernelHeaders;