jaiden/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Make unpacking of patch sequences much faster by not doing redundant

Browse source 
unpacking and repacking of intermediate paths.
This commit is contained in:
Eelco Dolstra 2005-05-10 14:22:36 +00:00
parent 456f3251d2
commit cbc8d083ac
2 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
NEWS
View file

@ -1,3 +1,9 @@
Version 0.9
* Unpacking of patch sequences is much faster now by not doing
redundant unpacking and repacking of intermediate paths.
Version 0.8 (April 11, 2005) Version 0.8 (April 11, 2005)
NOTE: the hashing scheme in Nix 0.8 changed (as detailed below). As a NOTE: the hashing scheme in Nix 0.8 changed (as detailed below). As a

48
scripts/download-using-manifests.pl.in
View file

@ -207,11 +207,19 @@ while (scalar @path > 0) {
my $v = $edge->{end}; my $v = $edge->{end};
print "\n*** Step $curStep/$maxStep: "; print "\n*** Step $curStep/$maxStep: ";
$curStep++;
if ($edge->{type} eq "present") { if ($edge->{type} eq "present") {
print "using already present path `$v'\n"; print "using already present path `$v'\n";
print LOGFILE "$$ present $v\n"; print LOGFILE "$$ present $v\n";
if ($curStep < $maxStep) {
# Since this is not the last step, the path will be used
# as a base to one or more patches. So turn the base path
# into a NAR archive, to which we can apply the patch.
print " packing base path...\n";
system "@bindir@/nix-store --dump $v > /tmp/nar";
die "cannot dump `$v'" if ($? != 0);
}
} }
elsif ($edge->{type} eq "patch") { elsif ($edge->{type} eq "patch") {
@ -224,21 +232,22 @@ while (scalar @path > 0) {
print " downloading patch...\n"; print " downloading patch...\n";
my $patchPath = downloadFile "$patch->{url}", "$patch->{hash}"; my $patchPath = downloadFile "$patch->{url}", "$patch->{hash}";
# Turn the base path into a NAR archive, to which we can # Apply the patch to the NAR archive produced in step 1 (for
# actually apply the patch. # the already present path) or a later step (for patch sequences).
print " packing base path...\n";
system "@bindir@/nix-store --dump $patch->{basePath} > /tmp/nar";
die "cannot dump `$patch->{basePath}'" if ($? != 0);
# Apply the patch.
print " applying patch...\n"; print " applying patch...\n";
system "@libexecdir@/bspatch /tmp/nar /tmp/nar2 $patchPath"; system "@libexecdir@/bspatch /tmp/nar /tmp/nar2 $patchPath";
die "cannot apply patch `$patchPath' to /tmp/nar" if ($? != 0); die "cannot apply patch `$patchPath' to /tmp/nar" if ($? != 0);
# Unpack the resulting NAR archive into the target path. if ($curStep < $maxStep) {
print " unpacking patched archive...\n"; # The archive will be used as the base of the next patch.
system "@bindir@/nix-store --restore $v < /tmp/nar2"; rename "/tmp/nar2", "/tmp/nar" or die "cannot rename NAR archive: $!";
die "cannot unpack /tmp/nar2 into `$v'" if ($? != 0); } else {
# This was the last patch. Unpack the final NAR archive
# into the target path.
print " unpacking patched archive...\n";
system "@bindir@/nix-store --restore $v < /tmp/nar2";
die "cannot unpack /tmp/nar2 into `$v'" if ($? != 0);
}
} }
elsif ($edge->{type} eq "narfile") { elsif ($edge->{type} eq "narfile") {
@ -251,11 +260,18 @@ while (scalar @path > 0) {
print " downloading archive...\n"; print " downloading archive...\n";
my $narFilePath = downloadFile "$narFile->{url}", "$narFile->{hash}"; my $narFilePath = downloadFile "$narFile->{url}", "$narFile->{hash}";
# Unpack the archive into the target path. if ($curStep < $maxStep) {
print " unpacking archive...\n"; # The archive will be used a base to a patch.
system "@bunzip2@ < '$narFilePath' | @bindir@/nix-store --restore '$v'"; system "@bunzip2@ < '$narFilePath' > /tmp/nar";
die "cannot unpack `$narFilePath' into `$v'" if ($? != 0); } else {
# Unpack the archive into the target path.
print " unpacking archive...\n";
system "@bunzip2@ < '$narFilePath' | @bindir@/nix-store --restore '$v'";
die "cannot unpack `$narFilePath' into `$v'" if ($? != 0);
}
} }
$curStep++;
} }