* Fix some more paths in Xen, and make it use /etc/xen for its

configuration files.

svn path=/nixpkgs/trunk/; revision=23821
This commit is contained in:
Eelco Dolstra 2010-09-16 15:21:28 +00:00
parent fac8ff8d71
commit fd538ef53d

View File

@ -23,7 +23,7 @@ stdenv.mkDerivation {
dev86 iasl pciutils bzip2 xz dev86 iasl pciutils bzip2 xz
]; ];
makeFlags = "PREFIX=$(out)"; makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc";
buildFlags = "xen tools"; buildFlags = "xen tools";
@ -49,12 +49,19 @@ stdenv.mkDerivation {
# print the GCC version number properly. # print the GCC version number properly.
substituteInPlace xen/Makefile \ substituteInPlace xen/Makefile \
--replace '$(CC) $(CFLAGS) -v' '$(CC) -v' --replace '$(CC) $(CFLAGS) -v' '$(CC) -v'
substituteInPlace tools/python/xen/xend/server/BlktapController.py \
--replace /usr/sbin/tapdisk2 $out/sbin/tapdisk2
substituteInPlace tools/python/xen/xend/XendQCoWStorageRepo.py \
--replace /usr/sbin/qcow-create $out/sbin/qcow-create
''; '';
installPhase = installPhase =
'' ''
cp -prvd dist/install/nix/store/* $out cp -prvd dist/install/nix/store/* $out
cp -prvd dist/install/boot $out/boot cp -prvd dist/install/boot $out/boot
cp -prvd dist/install/etc $out/etc
''; # */ ''; # */
postFixup = postFixup =