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: 21-Sep-2006 17:11:11
Branch: HEAD Handle: 2006092116111100
Modified files:
openpkg-tools/cmd bf-mk.pl src2make.pl
Log:
remove Buildfarm dependency to sudo(8), the SetUID wrapper [29743] is
a replacement
Summary:
Revision Changes Path
1.30 +2 -14 openpkg-tools/cmd/bf-mk.pl
1.20 +6 -14 openpkg-tools/cmd/src2make.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/bf-mk.pl
============================================================================
$ cvs diff -u -r1.29 -r1.30 bf-mk.pl
--- openpkg-tools/cmd/bf-mk.pl 20 Sep 2006 14:29:38 -0000 1.29
+++ openpkg-tools/cmd/bf-mk.pl 21 Sep 2006 15:11:11 -0000 1.30
@@ -483,7 +483,6 @@
DST="%{shared.prefix}/dst/$HOST-$ARCH-$OS" \
TMP="%{slaves.ltmp}/$HOST-$ARCH-$OS" \
EXEC_BFDB="%{slaves.bfdb}" \
- EXEC_ROOT="%{driver.sudo}" \
EXEC_HOST="$HOST" \
list \
)
@@ -498,7 +497,7 @@
echo "instance already stripped to baseline, nothing to erase"
else
echo "erasing $surplus"
- %{driver.sudo} %{slaves.rpm} -e $surplus
+ %{slaves.rpm} -e $surplus
surplus=`%{slaves.rpm} -qa | sed -e
's;^openpkg-[^-][^-]*-[^-][^-]*$;;' -e 's;^gpg-pubkey-[^-][^-]*-[^-][^-]*$;;'`
if [ ".$surplus" = . ]; then
echo "instance successfully stripped to baseline"
@@ -566,7 +565,6 @@
DST="/v/openpkg/bf/dst/$HOST-$ARCH-$OS" \
TMP="/ltmp/openpkg-bf/$HOST-$ARCH-$OS" \
EXEC_BFDB="/usr/opkg/bin/ssh [EMAIL PROTECTED]
/v/rel/sw/bin/openpkg bf-db" \
- EXEC_ROOT="/usr/opkg/bin/sudo" \
EXEC_HOST="$HOST" \
$package \
)
@@ -904,8 +902,6 @@
sh "/bin/sh";
ssh "ssh";
shtool "shtool";
- sudo "sudo";
- sudoers "/etc/sudoers";
};
EOT
@@ -1065,13 +1061,6 @@
chgrp worker /bf/master/var/openpkg-tools/bf
chmod 775 /bf/master/var/openpkg-tools/bf
- Setup DRIVER
-
- su - root
- /bf/driver/sbin/visudo
- # User privilege specification
- worker ALL=(ALL) NOPASSWD: ALL
-
let WORKER build SLAVES environment on SHARED directory from MASTER
config
su - worker /bf/master/bin/openpkg bf-mk
@@ -1179,7 +1168,7 @@
--user="${CMD}" --group="${CMD}"
%driver
- # openpkg build -Zu make binutils gcc sudo shtool openssh | sh
build2obmtool.sh
+ # openpkg build -Zu make binutils gcc shtool openssh | sh
build2obmtool.sh
echo "---- boot/build ${NODE} %${CMD} ----"
PREFIX=/bf/${CMD}
@install openpkg-2.2.2-2.2.2 \
@@ -1191,7 +1180,6 @@
@install binutils-2.14-2.2.0
@install gcc-3.4.2-2.2.0
@install fsl-1.5.0-2.2.0
- @install sudo-1.6.8p1-2.2.2
@install perl-5.8.5-2.2.1
@install shtool-2.0.1-2.2.0
@install openssl-0.9.7d-2.2.0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/src2make.pl
============================================================================
$ cvs diff -u -r1.19 -r1.20 src2make.pl
--- openpkg-tools/cmd/src2make.pl 21 Jun 2006 07:48:56 -0000 1.19
+++ openpkg-tools/cmd/src2make.pl 21 Sep 2006 15:11:11 -0000 1.20
@@ -498,8 +498,6 @@
"TMP = *\n" .
"RPM = *\n" .
"RPM_FLAGS = *\n" .
- "EXEC_ROOT = *\n" .
- "EXEC_USER = *\n" .
"EXEC_BFDB = *\n" .
"TERM_B = *\n" .
"TERM_N = *\n" .
@@ -511,12 +509,10 @@
" 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" .
- " EXEC_ROOT=\"\$(EXEC_ROOT)\"
EXEC_USER=\"\$(EXEC_USER)\"\\\n" .
" EXEC_BFDB=\"\$(EXEC_BFDB)\"\n" .
"\n" .
- "# RPM read-only/read-write operations\n" .
- "RPM_RD = MAKEFLAGS=\"\" \$(EXEC_USER) \$(RPM) \$(RPM_FLAGS)\n" .
- "RPM_RW = MAKEFLAGS=\"\" \$(EXEC_ROOT) \$(RPM) \$(RPM_FLAGS)\n" .
+ "# RPM operations\n" .
+ "RPMRUN = MAKEFLAGS=\"\" \$(RPM) \$(RPM_FLAGS)\n" .
"\n" .
"# default target\n" .
"default:\n" .
@@ -728,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\`\"; " .
- "\$(RPM_RD) --rebuild $pkg.src.rpm 2>&1; " .
+ "\$(RPMRUN) --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 \$(RPM_RD) --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 \$(RPMRUN) --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";
@@ -770,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\$(RPM_RD) -q $pkg >/dev/null || \$(RPM_RW) -Uh --oldpackage
\$(DST)/$pkg.\$(PLATFORM).rpm\n";
+ $MF .= "\t\$(RPMRUN) -q $pkg >/dev/null || \$(RPMRUN) -Uh --oldpackage
\$(DST)/$pkg.\$(PLATFORM).rpm\n";
$MF .= "\n";
@@ -782,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\$(RPM_RD) -q $pkg >/dev/null && \$(RPM_RW) -e --noscripts
--allmatches $pkg >/dev/null 2>&1 || true\n";
+ $MF .= "\t\$(RPMRUN) -q $pkg >/dev/null && \$(RPMRUN) -e --noscripts
--allmatches $pkg >/dev/null 2>&1 || true\n";
}
$il = '';
@@ -827,9 +823,6 @@
"\n" .
"# configuration: user/root command execution\n" .
"EXEC_HOST = localhost\n" .
- "#EXEC_ROOT = ssh -t -x -q [EMAIL PROTECTED](EXEC_HOST) cd \$\$PWD
\\&\\&\n" .
- "EXEC_ROOT = sudo\n" .
- "EXEC_USER = \n" .
"EXEC_BFDB = openpkg bf-db\n" .
"\n" .
"# configuration: command execution environment\n" .
@@ -917,7 +910,6 @@
"\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 EXEC_ROOT=\"\$(EXEC_ROOT)\" EXEC_USER=\"\$(EXEC_USER)\"
\\\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
