OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 18-Nov-2002 19:14:13
Branch: HEAD Handle: 2002111818141101
Modified files:
openpkg-src/openpkg mkproxyrpm.pl openpkg.spec rpmx.pl
openpkg-web news.txt
Log:
add 'rpm --makeproxy --prefix=<master>' feature
Summary:
Revision Changes Path
1.3 +13 -4 openpkg-src/openpkg/mkproxyrpm.pl
1.108 +2 -2 openpkg-src/openpkg/openpkg.spec
1.11 +5 -1 openpkg-src/openpkg/rpmx.pl
1.2052 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/openpkg/mkproxyrpm.pl
============================================================
$ cvs diff -u -r1.2 -r1.3 mkproxyrpm.pl
--- openpkg-src/openpkg/mkproxyrpm.pl 25 Jun 2002 08:55:54 -0000 1.2
+++ openpkg-src/openpkg/mkproxyrpm.pl 18 Nov 2002 18:14:12 -0000 1.3
@@ -31,7 +31,7 @@
use IO;
my $progname = "mkproxyrpm";
-my $progvers = "0.9.2";
+my $progvers = "0.9.3";
# parameters (defaults)
my $version = 0;
@@ -42,6 +42,7 @@
my $tmpdir = ($ENV{TMPDIR} || $ENV{TEMPDIR} || "/tmp") . "/$progname";
my $output = '.';
my $input = '-';
+my $prefix = '';
# cleanup support
my @cleanup = ();
@@ -130,7 +131,8 @@
'v|verbose' => \$verbose,
'r|rpm=s' => \$rpm,
't|tmpdir=s' => \$tmpdir,
- 'o|output=s' => \$output
+ 'o|output=s' => \$output,
+ 'p|prefix=s' => \$prefix
) || die "option parsing failed";
if ($help) {
print "Usage: $progname [options] [FILE]\n" .
@@ -140,6 +142,7 @@
" -r,--rpm=FILE filesystem path to RPM program\n" .
" -t,--tmpdir=PATH filesystem path to temporary directory\n" .
" -o,--output=FILE filesystem path to output RPM file\n";
+ " -p,--prefix=PATH filesystem path to referenced master hierarchy\n";
exit(0);
}
if ($version) {
@@ -320,7 +323,11 @@
&verbose("-- | VIRT $1 $lprefix$subdir$file");
}
}
-&runcmd("ln -s $rprefix $tmpdir/bld$lprefix/.prefix-".$r->{NAME});
+
+# create master-reference symbolic link
+my $xprefix = $rprefix;
+$xprefix = $prefix if ($prefix ne '');
+&runcmd("ln -s $xprefix $tmpdir/bld$lprefix/.prefix-".$r->{NAME});
# rolling output proxy RPM package
&verbose("++ rolling output proxy RPM package");
@@ -357,6 +364,7 @@
[B<--rpm>=I<FILE>]
[B<--tmpdir>=I<DIR>]
[B<--output>=I<DIR>|I<FILE>|C<->]
+[B<--prefix>=I<RPREFIX>]
[I<FILE>|C<->]
=head1 DESCRIPTION
@@ -401,7 +409,8 @@
one to redirect a whole package to a different B<OpenPKG> instance by
just changing the I<lprefix>C</.prefix->B<foo> symbolic link. The idea
is that later this link even could be automatically controlled by a
-higher-level facility.
+higher-level facility. The I<rprefix> target of the symbolic link can be
+overridden at build-time with the B<--prefix>=I<RPREFIX> option.
=head1 OPTIONS
Index: openpkg-src/openpkg/openpkg.spec
============================================================
$ cvs diff -u -r1.107 -r1.108 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 30 Oct 2002 08:27:18 -0000 1.107
+++ openpkg-src/openpkg/openpkg.spec 18 Nov 2002 18:14:12 -0000 1.108
@@ -39,8 +39,8 @@
# o any cc(1)
# the package version and release
-%define V_openpkg 20021030
-%define R_openpkg 20021030
+%define V_openpkg 20021118
+%define R_openpkg 20021118
# the used software versions
%define V_rpm 4.0.2
Index: openpkg-src/openpkg/rpmx.pl
============================================================
$ cvs diff -u -r1.10 -r1.11 rpmx.pl
--- openpkg-src/openpkg/rpmx.pl 25 Jun 2002 08:55:54 -0000 1.10
+++ openpkg-src/openpkg/rpmx.pl 18 Nov 2002 18:14:12 -0000 1.11
@@ -614,7 +614,11 @@
my $prefix = $CFG->{RC}->{"l_prefix"};
my $rpm = $CFG->{PRG}->{"rpm"};
my $tmpdir = $CFG->{RC}->{"_tmppath"};
- exec $perl, "$prefix/lib/openpkg/mkproxyrpm.pl", "--rpm=$rpm",
"--tmpdir=$tmpdir", @{$CFG->{ARG}};
+ my @args = @{$CFG->{ARG}};
+ if ($CFG->{OPT_ARG}->{"--prefix"} ne '') {
+ unshift(@args, "--prefix=".$CFG->{OPT_ARG}->{"--prefix"});
+ }
+ exec $perl, "$prefix/lib/openpkg/mkproxyrpm.pl", "--rpm=$rpm",
"--tmpdir=$tmpdir", @args;
}
## ______________________________________________________________________
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.2051 -r1.2052 news.txt
--- openpkg-web/news.txt 18 Nov 2002 12:16:34 -0000 1.2051
+++ openpkg-web/news.txt 18 Nov 2002 18:14:11 -0000 1.2052
@@ -1,3 +1,4 @@
+18-Nov-2002: Upgraded package: P<openpkg-20021118-20021118>
18-Nov-2002: Upgraded package: P<perl-xml-20021118-20021118>
18-Nov-2002: Upgraded package: P<gimp-1.2.3-20020308>
18-Nov-2002: Upgraded package: P<c-client-2002rc10-20021118>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
