OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 17-Feb-2004 15:07:26
Branch: HEAD Handle: 2004021714072600
Modified files:
openpkg-re src2make.pl
Log:
switch to new world order
Summary:
Revision Changes Path
1.54 +9 -9 openpkg-re/src2make.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/src2make.pl
============================================================================
$ cvs diff -u -r1.53 -r1.54 src2make.pl
--- openpkg-re/src2make.pl 9 Feb 2004 15:36:50 -0000 1.53
+++ openpkg-re/src2make.pl 17 Feb 2004 14:07:26 -0000 1.54
@@ -151,7 +151,7 @@
if ($group eq '') {
print STDERR "$progname:WARNING: no -g|--group given, so assuming 'cw'\n";
}
-if (not (-x "$prefix/bin/rpm" and -x "$prefix/bin/rpm2cpio")) {
+if (not (-x "$prefix/bin/openpkg" and -x "$prefix/libexec/openpkg/rpm" and -x
"$prefix/libexec/openpkg/rpm2cpio")) {
die "programs 'rpm' and 'rpm2cpio' not found under OpenPKG hierarchy '$prefix'";
}
my $cpio;
@@ -213,7 +213,7 @@
$q .= "S-$t:<%{$t}>\n";
}
$q .= "[M-BuildPreReq:<%{REQUIRENAME} %|REQUIREFLAGS?{%{REQUIREFLAGS:depflags}
%{REQUIREVERSION}}:{}|>\n]";
- my $o = `$prefix/bin/rpm -qp --qf "$q" $srcdir/$srcrpm 2>/dev/null`;
+ my $o = `$prefix/bin/openpkg rpm -qp --qf "$q" $srcdir/$srcrpm 2>/dev/null`;
$o =~ s|M-BuildPreReq:<rpmlib\(.*?\).*?>\n||gs;
my $r = &parseresponse($o);
my $pkg_name = $r->{Name};
@@ -248,13 +248,13 @@
# they act as applied on a binary RPM and return the PreReq)
system("rm -rf $tmpdir/$srcrpm_name >/dev/null 2>&1 || true");
mkdir("$tmpdir/$srcrpm_name", 0700) || die "cannot create temporary directory
'$tmpdir/$srcrpm_name'";
- &runcmd("$prefix/bin/rpm2cpio $srcdir/$srcrpm | (cd $tmpdir/$srcrpm_name &&
$cpio -idvmu $srcrpm_name.spec $srcrpm_name.sh >/dev/null 2>&1)");
+ &runcmd("$prefix/bin/openpkg rpm2cpio $srcdir/$srcrpm | (cd
$tmpdir/$srcrpm_name && $cpio -idvmu $srcrpm_name.spec $srcrpm_name.sh >/dev/null
2>&1)");
if (not -f "$tmpdir/$srcrpm_name/$srcrpm_name.spec") {
die "failed to extract '$srcrpm_name.spec' from '$srcdir/$srcrpm'";
}
$q = "[M-PreReq:<%{REQUIRENAME} %|REQUIREFLAGS?{%{REQUIREFLAGS:depflags}
%{REQUIREVERSION}}:{}|>\n]";
$q .= "[M-Provides:<%{PROVIDENAME} %|PROVIDEFLAGS?{%{PROVIDEFLAGS:depflags}
%{PROVIDEVERSION}}:{}|>\n]";
- $o = `cd $tmpdir/$srcrpm_name && $prefix/bin/rpm -q --qf "$q" --define
'_sourcedir .' --define '_specdir .' --specfile $srcrpm_name.spec 2>/dev/null`;
+ $o = `cd $tmpdir/$srcrpm_name && $prefix/bin/openpkg rpm -q --qf "$q" --define
'_sourcedir .' --define '_specdir .' --specfile $srcrpm_name.spec 2>/dev/null`;
$o =~ s|M-PreReq:<rpmlib\(.*?\).*?>\n||gs;
$r = &parseresponse($o);
my $pkg_ireq = $r->{PreReq};
@@ -768,7 +768,7 @@
"DST = .\n" .
"\n" .
"# configuration: OpenPKG RPM tool\n" .
- "RPM = \$(PREFIX)/bin/rpm\n" .
+ "RPM = \$(PREFIX)/bin/openpkg rpm\n" .
"RPM_FLAGS = \n" .
"\n" .
"# configuration: user/root command execution\n" .
@@ -868,12 +868,12 @@
$MF .= "# bootstrapping OpenPKG\n" .
"bootstrap:\n" .
- "[EMAIL PROTECTED] [ ! -f \$(PREFIX)/bin/rpm ]; then \\\n" .
+ "[EMAIL PROTECTED] [ ! -d \$(PREFIX)/lib/openpkg ]; then \\\n" .
"\t \$(EXEC_ROOT) \$(MAKE) \$(MFLAGS) bootstrap-root \\\n" .
"\t PREFIX=\"\$(PREFIX)\" USER=\"\$(USER)\" GROUP=\"\$(GROUP)\";
\\\n" .
"\tfi\n" .
"bootstrap-root:\n" .
- "[EMAIL PROTECTED] [ ! -f \$(PREFIX)/bin/rpm ]; then \\\n" .
+ "[EMAIL PROTECTED] [ ! -d \$(PREFIX)/lib/openpkg ]; then \\\n" .
"\t echo \"Bootstrapping OpenPKG under \$(PREFIX) [\$(USER):\$(GROUP)]
...\"; \\\n" .
"\t umask 022; \\\n" .
"\t mkdir \$(PREFIX) >/dev/null 2>&1 || true; \\\n" .
@@ -898,8 +898,8 @@
$MF .= "# erase\n" .
"erase:\n" .
- "[EMAIL PROTECTED](EXEC_ROOT) \$(PREFIX)/bin/rpm -e \\\n" .
- "\t `\$(PREFIX)/bin/rpm -qa | sed -e '/^openpkg-[0-9].*/d' -e
'/^gpg-pubkey-.*/d'`\n" .
+ "[EMAIL PROTECTED](EXEC_ROOT) \$(PREFIX)/bin/openpkg rpm -e \\\n" .
+ "\t `\$(PREFIX)/bin/openpkg rpm -qa | sed -e '/^openpkg-[0-9].*/d' -e
'/^gpg-pubkey-.*/d'`\n" .
"\n";
&verbose("writing Makefile");
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
