aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-03-01 17:06:36 +0000
committerFrancois Pons <fpons@mandriva.com>2001-03-01 17:06:36 +0000
commitf86133e756be5b68e8bea52693cfc6564c305124 (patch)
tree140c47c91aa9a5aed2da79a939ddefdeb4b13df4
parent6977c59931563c95a4ea2eaac80087d28771cdae (diff)
downloadrpmtools-f86133e756be5b68e8bea52693cfc6564c305124.tar
rpmtools-f86133e756be5b68e8bea52693cfc6564c305124.tar.gz
rpmtools-f86133e756be5b68e8bea52693cfc6564c305124.tar.bz2
rpmtools-f86133e756be5b68e8bea52693cfc6564c305124.tar.xz
rpmtools-f86133e756be5b68e8bea52693cfc6564c305124.zip
*** empty log message ***
-rwxr-xr-xgendistrib2
-rw-r--r--rpmtools.pm12
-rw-r--r--rpmtools.spec5
3 files changed, 15 insertions, 4 deletions
diff --git a/gendistrib b/gendistrib
index 7a416df..02b2d72 100755
--- a/gendistrib
+++ b/gendistrib
@@ -72,7 +72,7 @@ unless ($nohdlists) {
-d "$root/$dir" or die "unable to find a valid root directory which contains $dir\n";
print STDERR "building hdlist $hdlist as \"$descr\"\n with rpms directory $root/$dir\n";
- $params->build_hdlist($noclean, ($ENV{TMPDIR} || "/tmp") . "/.build_hdlist", $hdlist, glob("$root/$dir/*.rpm"));
+ $params->build_hdlist($noclean, 9, ($ENV{TMPDIR} || "/tmp") . "/.build_hdlist", $hdlist, glob("$root/$dir/*.rpm"));
}
}
diff --git a/rpmtools.pm b/rpmtools.pm
index 5c31a85..dd33299 100644
--- a/rpmtools.pm
+++ b/rpmtools.pm
@@ -116,7 +116,7 @@ sub read_hdlists {
#- build an hdlist from a list of files.
sub build_hdlist {
- my ($params, $noclean, $dir, $hdlist, @rpms) = @_;
+ my ($params, $noclean, $ratio, $dir, $hdlist, @rpms) = @_;
my %names;
#- build a working directory which will hold rpm headers.
@@ -131,7 +131,15 @@ sub build_hdlist {
push @{$names{$name} ||= []}, $key;
}
- open B, "| packdrake -b9ds '$hdlist' '$dir' 400000";
+ #- compression ratio are not very high, sample for cooker
+ #- gives the following (main only and cache fed up):
+ #- ratio compression_time size
+ #- 9 21.5 sec 8.10Mb -> good for installation CD
+ #- 6 10.7 sec 8.15Mb
+ #- 5 9.5 sec 8.20Mb
+ #- 4 8.6 sec 8.30Mb -> good for urpmi
+ #- 3 7.6 sec 8.60Mb
+ open B, "| packdrake -b${ratio}ds '$hdlist' '$dir' 400000";
foreach (@{$params->{depslist}}) {
if (my $keys = delete $names{$_->{name}}) {
print B "$_\n" foreach @$keys;
diff --git a/rpmtools.spec b/rpmtools.spec
index 2a1ea45..7c46d26 100644
--- a/rpmtools.spec
+++ b/rpmtools.spec
@@ -1,5 +1,5 @@
%define name rpmtools
-%define release 6mdk
+%define release 7mdk
# do not modify here, see Makefile in the CVS
%define version 2.3
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/perl5/man/*/*
%changelog
+* Thu Mar 1 2001 François Pons <fpons@mandrakesoft.com> 2.3-7mdk
+- added compression ratio to build_hdlist.
+
* Tue Feb 27 2001 François Pons <fpons@mandrakesoft.com> 2.3-6mdk
- fixed gendistrib with multi source of same number as
media listed in hdlists file.