OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-tools Date: 22-Sep-2006 13:03:09
Branch: HEAD Handle: 2006092212030900
Modified files:
openpkg-tools/cmd src2make.pl
Log:
pass "openpkg" not "rpm" to leverage --keep-privileges feature
Summary:
Revision Changes Path
1.22 +12 -13 openpkg-tools/cmd/src2make.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/src2make.pl
============================================================================
$ cvs diff -u -r1.21 -r1.22 src2make.pl
--- openpkg-tools/cmd/src2make.pl 21 Sep 2006 15:19:55 -0000 1.21
+++ openpkg-tools/cmd/src2make.pl 22 Sep 2006 11:03:09 -0000 1.22
@@ -496,8 +496,7 @@
"SRC = *\n" .
"DST = *\n" .
"TMP = *\n" .
- "RPM = *\n" .
- "RPM_FLAGS = *\n" .
+ "OPENPKG = *\n" .
"EXEC_BFDB = *\n" .
"TERM_B = *\n" .
"TERM_N = *\n" .
@@ -508,11 +507,12 @@
" SSH_AUTH_SOCK=\"\$\$SSH_AUTH_SOCK\" \\\n" .
" TERM_B=\"\$(TERM_B)\" TERM_N=\"\$(TERM_N)\" \\\n" .
" LOG=\"\$(LOG)\" SRC=\"\$(SRC)\" DST=\"\$(DST)\"
TMP=\"\$(TMP)\"\\\n" .
- " RPM=\"\$(RPM)\" RPM_FLAGS=\"\$(RPM_FLAGS)\" \\\n" .
+ " OPENPKG=\"\$(OPENPKG)\" \\\n" .
" EXEC_BFDB=\"\$(EXEC_BFDB)\"\n" .
"\n" .
- "# RPM operations\n" .
- "RPMRUN = MAKEFLAGS=\"\" \$(RPM) \$(RPM_FLAGS)\n" .
+ "# RPM read-only/read-write operations\n" .
+ "RPM_RD = MAKEFLAGS=\"\" \$(OPENPKG) --keep-privileges rpm\n" .
+ "RPM_RW = MAKEFLAGS=\"\" \$(OPENPKG) rpm\n" .
"\n" .
"# default target\n" .
"default:\n" .
@@ -724,10 +724,10 @@
$MF .= "\t-\$(EXEC_BFDB) -i \$(HOSTNAME)-\$(PLATFORM) -p $pkg begin\n";
$MF .= "\t-rm -rf \$(TMP)/SRC/* \$(TMP)/TMP/* 2>/dev/null\n";
$MF .= "[EMAIL PROTECTED] \$(SRC) && (echo \"Build Start: \`date\`\"; " .
- "\$(RPMRUN) --rebuild $pkg.src.rpm 2>&1; " .
+ "\$(RPM_RD) --rebuild $pkg.src.rpm 2>&1; " .
"echo \"Build End: \`date\`\") | " .
"tee \$(LOG)/$pkg.log.\$(HOSTNAME).\$(PLATFORM)\n";
- $MF .= "\t-color=\"red\"; dst=\$(DST)/$pkg.\$(PLATFORM).rpm; if [ -f
\$\$dst ]; then \$(RPMRUN) --checksig \$\$dst; if [ \$\$? -ne 0 ]; then rm
\$\$dst; else color=\"green\"; fi; fi; " .
+ $MF .= "\t-color=\"red\"; dst=\$(DST)/$pkg.\$(PLATFORM).rpm; if [ -f
\$\$dst ]; then \$(RPM_RD) --checksig \$\$dst; if [ \$\$? -ne 0 ]; then rm
\$\$dst; else color=\"green\"; fi; fi; " .
"\$(EXEC_BFDB) -i \$(HOSTNAME)-\$(PLATFORM) -p $pkg -c \$\$color
end; " .
"[ \$\$color = \"red\" ] && rm $pkg.src.rpm; [ \$\$color =
\"green\" ]\n";
@@ -766,7 +766,7 @@
$MF .= "[EMAIL PROTECTED](MAKE_TRANS)".$il."\n" if ($il ne '');
$MF .= "[EMAIL PROTECTED] \"\$(TERM_B):::: Installing $pkg
::::\$(TERM_N)\"\n";
- $MF .= "\t\$(RPMRUN) -q $pkg >/dev/null || \$(RPMRUN) -Uh --oldpackage
\$(DST)/$pkg.\$(PLATFORM).rpm\n";
+ $MF .= "\t\$(RPM_RD) -q $pkg >/dev/null || \$(RPM_RW) -Uh --oldpackage
\$(DST)/$pkg.\$(PLATFORM).rpm\n";
$MF .= "\n";
@@ -778,7 +778,7 @@
# generate uninstall operation
if (not $nouninstall and not $pkg_name eq 'openpkg') {
$MF .= "[EMAIL PROTECTED] \"\$(TERM_B):::: Uninstalling $pkg
::::\$(TERM_N)\"\n";
- $MF .= "\t\$(RPMRUN) -q $pkg >/dev/null && \$(RPMRUN) -e --noscripts
--allmatches $pkg >/dev/null 2>&1 || true\n";
+ $MF .= "\t\$(RPM_RD) -q $pkg >/dev/null && \$(RPM_RW) -e --noscripts
--allmatches $pkg >/dev/null 2>&1 || true\n";
}
$il = '';
@@ -818,8 +818,7 @@
"DST = .\n" .
"\n" .
"# configuration: OpenPKG RPM tool\n" .
- "RPM = \$(PREFIX)/bin/openpkg rpm\n" .
- "RPM_FLAGS = \n" .
+ "OPENPKG = \$(PREFIX)/bin/openpkg\n" .
"\n" .
"# configuration: user/root command execution\n" .
"EXEC_HOST = localhost\n" .
@@ -839,7 +838,7 @@
"::\n" .
"[EMAIL PROTECTED]"\$(PLATFORM)\"; \\\n" .
"\tif [ \".\$\$PLATFORM\" = .auto ]; then \\\n" .
- "\t PLATFORM=\"\`\$(RPM) --eval '%{l_platform -p}-%{l_tag}'\`\";
\\\n" .
+ "\t PLATFORM=\"\`\$(OPENPKG) rpm --eval '%{l_platform
-p}-%{l_tag}'\`\"; \\\n" .
"\tfi; \\\n" .
"\tHOSTNAME=\"\$(HOSTNAME)\"; \\\n" .
"\tif [ \".\$\$HOSTNAME\" = .auto ]; then \\\n" .
@@ -909,7 +908,7 @@
"\t SSH_AUTH_SOCK=\"\$\$SSH_AUTH_SOCK\" \\\n" .
"\t TERM_B=\"\$\$TERM_B\" TERM_N=\"\$\$TERM_N\" \\\n" .
"\t LOG=\"\$\$LOG\" SRC=\"\$\$SRC\" DST=\"\$\$DST\"
TMP=\"\$\$TMP\" \\\n" .
- "\t RPM=\"\$(RPM)\" RPM_FLAGS=\"\$(RPM_FLAGS)\" \\\n" .
+ "\t OPENPKG=\"\$(OPENPKG)\" \\\n" .
"\t EXEC_BFDB=\"\$(EXEC_BFDB)\" \\\n" .
"\t \$\@ 2>&1 | tee Makefile.log.\$\$PLATFORM\n" .
"\n";
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
