shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-04 09:18:36 +03:00
Code Releases Activity

NIX: Avoid test-installing lvm2-sysvinit (fails on recent Fedoras).

Browse Source
This commit is contained in:
Petr Rockai 2014-04-07 20:37:30 +02:00
parent 0996b5ccf4
commit 05a421960f
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nix/default.nix
View File

@ -14,6 +14,7 @@ let
src = jobs.tarball; src = jobs.tarball;
diskImage = diskFun { extraPackages = extras; }; diskImage = diskFun { extraPackages = extras; };
memSize = 768; memSize = 768;
# fc16 lcov is broken and el6 has none... be creative # fc16 lcov is broken and el6 has none... be creative
prepareImagePhase = '' prepareImagePhase = ''
rpm -Uv ${pkgs.fetchurl { rpm -Uv ${pkgs.fetchurl {
@ -21,10 +22,12 @@ let
sha256 = "0ycdh5mb7p5ll76mqk0p6gpnjskvxxgh3a3bfr1crh94nvpwhp4z"; }} sha256 = "0ycdh5mb7p5ll76mqk0p6gpnjskvxxgh3a3bfr1crh94nvpwhp4z"; }}
dmesg -n 1 # avoid spilling dmesg into the main log, we capture it in harness dmesg -n 1 # avoid spilling dmesg into the main log, we capture it in harness
''; '';
postBuild = '' postBuild = ''
mkdir -p $out/nix-support
cd `cat /tmp/build-location` cd `cat /tmp/build-location`
mv test/results/list test/results/list-rpm mv test/results/list test/results/list-rpm
rpm -Uvh /tmp/rpmout/RPMS/*/*.rpm # */ ls /tmp/rpmout/RPMS/*/*.rpm | grep -v sysvinit | xargs rpm -Uvh # */
(/usr/lib/systemd/systemd-udevd || /usr/lib/udev/udevd || /sbin/udevd || find / -xdev -name \*udevd) & (/usr/lib/systemd/systemd-udevd || /usr/lib/udev/udevd || /sbin/udevd || find / -xdev -name \*udevd) &
make check_system QUIET=1 T=${T} || touch $out/nix-support/failed make check_system QUIET=1 T=${T} || touch $out/nix-support/failed
mv test/results/list test/results/list-system mv test/results/list test/results/list-system
@ -37,6 +40,16 @@ let
echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products || \ echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products || \
true # not really fatal, although kinda disappointing true # not really fatal, although kinda disappointing
''; '';
postInstall = ''
for i in $out/rpms/*/*.rpm; do
if echo $i | grep -vq "\.src\.rpm$"; then
echo "file rpm $i" >> $out/nix-support/hydra-build-products
else
echo "file srpm $i" >> $out/nix-support/hydra-build-products
fi
done
'';
}; };
rootmods = [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" rootmods = [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix"
@ -137,7 +150,7 @@ let
imgs = pkgs.vmTools.diskImageFuns // imgs = pkgs.vmTools.diskImageFuns //
mapAttrs (n: a: b: pkgs.vmTools.makeImageFromRPMDist (a // b)) extra_distros; mapAttrs (n: a: b: pkgs.vmTools.makeImageFromRPMDist (a // b)) extra_distros;
rpmdistros = pkgs.vmTools.rpmDistros // extra_distros; rpmdistros = pkgs.vmTools.rpmDistros // extra_distros;
rpmbuild = release.rpmBuild; rpmbuild = pkgs.vmTools.buildRPM;
}; };
extra_rpms = rec { extra_rpms = rec {