From 8dfaad7b4a581a206c5ae72277d456e14da995ec Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Sun, 26 Jun 2005 12:30:17 +0000 Subject: new tool (not active yet): pkg_merge. Can be used to merge several packages into a fat package. Uses simple heuristics to find out a `nice' ordering for common files, can handle semi-common prefixes. --- usr.sbin/pkg_add/pkg_merge | 221 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 221 insertions(+) create mode 100644 usr.sbin/pkg_add/pkg_merge (limited to 'usr.sbin/pkg_add') diff --git a/usr.sbin/pkg_add/pkg_merge b/usr.sbin/pkg_add/pkg_merge new file mode 100644 index 00000000000..608803efb6e --- /dev/null +++ b/usr.sbin/pkg_add/pkg_merge @@ -0,0 +1,221 @@ +#! /usr/bin/perl +# Copyright (c) 2005 Marc Espie +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +use strict; +use OpenBSD::PackageLocator; +use OpenBSD::PackageInfo; +use OpenBSD::PackingList; +use OpenBSD::Getopt; +use OpenBSD::Error; +use OpenBSD::Ustar; +use File::Copy; +use File::Path; + +package OpenBSD::PackingElement; +sub copy_over {} + +sub mark_tocopy {} + +package OpenBSD::PackingElement::FileBase; +sub mark_tocopy +{ + my ($self, $list) = @_; + push(@$list, $self); +} + +sub copy_over +{ + my ($self, $wrarc, $prefix, $pkg) = @_; + my $e = $pkg->{pkg}->next(); + if ($e->{name} ne $self->{name}) { + die "Names don't match: ", $e->{name}, " ", $self->{name}; + } + $e->{name} = $prefix."/".$e->{name}; + if (defined $wrarc) { + $e->copy($wrarc); + } +} + +package OpenBSD::PackingElement::SpecialFile; +use File::Copy; + +sub mark_tocopy +{ + my ($self, $list) = @_; + push(@$list, $self); +} +sub copy_over +{ + my ($self, $wrarc, $prefix, $pkg) = @_; + if (defined $wrarc) { + $wrarc->destdir($pkg->{dir}); + my $e = $wrarc->prepare($self->{name}); + $e->{name} = "$prefix/".$e->{name}; + $e->write(); + } +} + + +package main; + +sub find_equal +{ + my $list = shift; + my $name = $list->[0]->{tocopy}->[0]->{name}; + for my $pkg (@$list) { + if ($pkg->{tocopy}->[0]->{name} ne $name) { + return undef; + } + } + return $name; +} + +sub occurs_first_or_not +{ + my ($name, $list) = @_; + for my $pkg (@$list) { + if ($pkg->{tocopy}->[0]->{name} eq $name) { + next; + } + for my $i (@{$pkg->{tocopy}}) { + if ($i->{name} eq $name) { + return 0; + } + } + } + return 1; +} + +sub occurs_first +{ + my $list= shift; + + for my $pkg (@$list) { + my $name = $pkg->{tocopy}->[0]->{name}; + if (occurs_first_or_not($name, $list)) { + return $name; + } + } + return undef; +} + + +set_usage('pkg_merge -o result pkg pkg2 ...'); + +our ($opt_o); + +try { + getopts('o:'); +} catchall { + Usage($_); +}; + +if (!defined $opt_o) { + die "Error: must have a result name"; +} + +if (@ARGV<2) { + die "Error need at least two packages to merge"; +} +my @tomerge; + +my $prefix = 'a'; +my $allprefix = ''; +open( my $outfh, "|gzip -c >$opt_o"); + +my $wrarc = OpenBSD::Ustar->new($outfh, "."); +for my $pkgname (@ARGV) { + my $true_package = OpenBSD::PackageLocator->find($pkgname); + die "No such package $pkgname" unless $true_package; + my $dir = $true_package->info(); + my $plist = OpenBSD::PackingList->fromfile($dir.CONTENTS); + + my $in = { + plist => $plist, + dir => $dir, + prefix => $prefix, + tocopy => [], + pkg => $true_package + }; + my $e = OpenBSD::PackingElement::FCONTENTS->new(CONTENTS); + $e->copy_over($wrarc, $prefix, $true_package); + $plist->visit('mark_tocopy', $in->{tocopy}); + push(@tomerge, $in); + $prefix++; +} + +# For now, we assume packing-lists contain the same items. +while(1) { + # kill empty lists + my @n = (); + for my $pkg (@tomerge) { + if (@{$pkg->{tocopy}} > 0) { + push(@n, $pkg); + } + } + @tomerge = @n; + if (@tomerge == 0) { + last; + } + # determine which item we want to copy (by name) + my $name; + + # easiest case: same name all around. + $name = find_equal(\@tomerge); + + # second case: a name that occurs first in some lists, + # and not in the others + if (!defined $name) { + print "(first)"; + $name = occurs_first(\@tomerge); + } + + # else, try random + if (!defined $name) { + print "(random)"; + $name = $tomerge[0]->{tocopy}->[0]->{name}; + } + + print $name, "\n"; + + my $allprefix=''; + my $ref; + my @mergeable = (); + # select the mergeable items + for my $pkg (@tomerge) { + if ($pkg->{tocopy}->[0]->{name} eq $name) { + push(@mergeable, $pkg); + } + } + + while (@mergeable > 0) { + my $pkg = shift @mergeable; + my $ref = shift @{$pkg->{tocopy}}; + my $currentprefix = $pkg->{prefix}; + my @todo = (); + for my $cmp (@mergeable) { + if (defined $ref->{md5} && $cmp->{tocopy}->[0]->{md5} eq $ref->{md5}) { + my $i = shift @{$cmp->{tocopy}}; + $i->copy_over(undef, undef, $cmp); + $currentprefix .= $cmp->{prefix}; + } else { + push(@todo, $cmp); + } + } + $ref->copy_over($wrarc, $currentprefix, $pkg); + @mergeable = @todo; + } +} +$wrarc->close(); -- cgit v1.2.3