[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 19-Mar-2004 12:43:21
Branch: HEAD Handle: 2004031911432100
Modified files:
openpkg-re openpkg-dev
Log:
awk -v requires /usr/xpg4/bin/awk on Solaris; find abs path to egrep
and awk to avoid shell function overloading
Summary:
RevisionChanges Path
1.164 +13 -8 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.163 -r1.164 openpkg-dev
--- openpkg-re/openpkg-dev15 Mar 2004 22:50:13 - 1.163
+++ openpkg-re/openpkg-dev19 Mar 2004 11:43:21 - 1.164
@@ -54,11 +54,16 @@
OPENPKG_EXEC=${OPENPKG_EXEC}; E=${E} # E (exec, instance)
export OPENPKG_SPEC P OPENPKG_CTAG B OPENPKG_EXEC E
-# use an appropriate egrep
-if [ -x /usr/xpg4/bin/${EGREP} ]; then
+# use appropriate tools
+if [ -x /usr/xpg4/bin/egrep ]; then
EGREP=/usr/xpg4/bin/egrep
else
-EGREP=egrep
+EGREP=uwhich egrep
+fi
+if [ -x /usr/xpg4/bin/awk ]; then
+AWK=/usr/xpg4/bin/awk
+else
+AWK=uwhich awk
fi
# a note about CVS HEAD
@@ -119,12 +124,12 @@
if [ .$1 = .-i ]; then
shift
type $1 \
-| awk -v cmd=$1 'BEGIN { f=0 }
+| ${AWK} -v cmd=$1 'BEGIN { f=0 }
/^ / { if (f==1) { print $0 } }
/^[a-zA-Z0-9]+ is a function/ { f=1 }'
else
type $1 \
-| awk -v cmd=$1 'BEGIN { f=0 }
+| ${AWK} -v cmd=$1 'BEGIN { f=0 }
// { if (f==1) { print $0 } }
/^[a-zA-Z0-9]+ is a function/ { print unalias cmd /dev/null
21; f=1 }'
fi
@@ -1113,7 +1118,7 @@
echo ++ determine old version (if any)
tmpfile=${OPENPKG_TEMP}/${name}${GUID}
cvs_stat=`builtin cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} stat
src/${name}/${name}.spec 2/dev/null | grep 'Repository revision:'`
-cvs_rev=`echo ${cvs_stat} | awk '/Repository revision:/ { print $3;
}'`
+cvs_rev=`echo ${cvs_stat} | ${AWK} '/Repository revision:/ { print
$3; }'`
cvs_dead=`echo ${cvs_stat} | grep '/Attic/'`
if [ .${cvs_dead} != . ]; then
cvs_rev=No
@@ -1316,7 +1321,7 @@
username=`${OPENPKG_EXEC}/lib/openpkg/shtool echo -e '%u'`
hostname=`${OPENPKG_EXEC}/lib/openpkg/shtool echo -e '%h%d'`
realname=`(getent passwd; cat /etc/passwd; ypcat passwd; nidump passwd
.) 2/dev/null |\
- grep ^${username}: | awk -F: '{ print $5; }'`
+ grep ^${username}: | ${AWK} -F: '{ print $5; }'`
if [ .$realname = . ]; then
realname=NN
fi
@@ -1836,7 +1841,7 @@
for file in $files; do
echo ++ Running command for package specification: $file
tmpfile=${OPENPKG_TEMP}/${GUID}
-awk -vexecute=$execute -vfile=$file ${file} ${tmpfile} '
+${AWK} -vexecute=$execute -vfile=$file ${file} ${tmpfile} '
BEGIN { flag=0 }
/^%prep$/ { flag=1 }
/^$/ { if (flag == 1) print execute #file; flag=0 }
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 19-Mar-2004 12:56:08
Branch: HEAD Handle: 2004031911560700
Modified files:
openpkg-re openpkg-dev
Log:
fix openkg-dev install -f option not knowing which rpm to call
Summary:
RevisionChanges Path
1.165 +1 -0 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.164 -r1.165 openpkg-dev
--- openpkg-re/openpkg-dev19 Mar 2004 11:43:21 - 1.164
+++ openpkg-re/openpkg-dev19 Mar 2004 11:56:07 - 1.165
@@ -1559,6 +1559,7 @@
if [ .$HOSTNAME = . ]; then
HOSTNAME=`hostname`
fi
+getrpmcmd $E
if [ $force -ne 0 ]; then
echo ++ installing $package ($rpmfile) forced
ssh -t -x [EMAIL PROTECTED] ${RPMCMD} -Uvh $rpmdir/$rpmfile --force
--nodeps
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-re Date: 19-Mar-2004 15:06:51 Branch: HEAD Handle: 2004031914065100 Modified files: openpkg-re openpkg-dev Log: type to replace uwhich bashification Summary: RevisionChanges Path 1.167 +2 -2 openpkg-re/openpkg-dev patch -p0 '@@ .' Index: openpkg-re/openpkg-dev $ cvs diff -u -r1.166 -r1.167 openpkg-dev --- openpkg-re/openpkg-dev19 Mar 2004 12:14:17 - 1.166 +++ openpkg-re/openpkg-dev19 Mar 2004 14:06:51 - 1.167 @@ -58,12 +58,12 @@ if [ -x /usr/xpg4/bin/egrep ]; then EGREP=/usr/xpg4/bin/egrep else -EGREP=egrep +EGREP=`type -f -p egrep` fi if [ -x /usr/xpg4/bin/awk ]; then AWK=/usr/xpg4/bin/awk else -AWK=awk +AWK=`type -f -p awk` fi # a note about CVS HEAD @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 15-Mar-2004 23:50:14
Branch: HEAD Handle: 2004031522501300
Modified files:
openpkg-re openpkg-dev
Log:
properly handle situation where workdir does not exists (i.e.
nonexisting package was given)
Summary:
RevisionChanges Path
1.163 +5 -3 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.162 -r1.163 openpkg-dev
--- openpkg-re/openpkg-dev15 Mar 2004 21:36:08 - 1.162
+++ openpkg-re/openpkg-dev15 Mar 2004 22:50:13 - 1.163
@@ -710,9 +710,11 @@
else
workdir=$1
fi
-pushd ${workdir} /dev/null
-if [ ${#DIRSTACK[*]} -ge 2 -a ${DIRSTACK[0]} = ${DIRSTACK[1]} ]; then
-popd /dev/null
+if [ -d ${workdir} ]; then
+pushd ${workdir} /dev/null
+if [ ${#DIRSTACK[*]} -ge 2 -a ${DIRSTACK[0]} = ${DIRSTACK[1]} ];
then
+popd /dev/null
+fi
fi
DIRSTACKREV=()
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 05-Mar-2004 18:54:27 Branch: HEAD Handle: 2004030517542600 Modified files: openpkg-re openpkg-dev Log: search also for OpenPKG 2.0 in 'search' command Summary: RevisionChanges Path 1.161 +3 -0 openpkg-re/openpkg-dev patch -p0 '@@ .' Index: openpkg-re/openpkg-dev $ cvs diff -u -r1.160 -r1.161 openpkg-dev --- openpkg-re/openpkg-dev24 Feb 2004 19:16:56 - 1.160 +++ openpkg-re/openpkg-dev5 Mar 2004 17:54:26 - 1.161 @@ -1662,6 +1662,9 @@ for i in $all; do search_for $i ftp://ftp.openpkg.org/current/SRC/ search_for $i ftp://ftp.openpkg.org/stable/SRC/ +search_for $i ftp://ftp.openpkg.org/release/2.0/UPD/ +search_for $i ftp://ftp.openpkg.org/release/2.0/SRC/ +search_for $i ftp://ftp.openpkg.org/release/2.0/SRC/PLUS/ search_for $i ftp://ftp.openpkg.org/release/1.3/UPD/ search_for $i ftp://ftp.openpkg.org/release/1.3/SRC/ search_for $i ftp://ftp.openpkg.org/release/1.3/SRC/PLUS/ @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 24-Feb-2004 20:16:56
Branch: HEAD Handle: 2004022419165600
Modified files:
openpkg-re openpkg-dev
Log:
remove hard-coded thl references
Summary:
RevisionChanges Path
1.160 +2 -2 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.159 -r1.160 openpkg-dev
--- openpkg-re/openpkg-dev21 Feb 2004 08:35:17 - 1.159
+++ openpkg-re/openpkg-dev24 Feb 2004 19:16:56 - 1.160
@@ -383,7 +383,7 @@
# - patch the RSE patch to disable the upward search - bad for existing
binaries
# - use -f option to ignore .cvsrc - requires this script to provide the
options directly
# - temporary solution is to just print a warning
-cvs --version | grep RSE /dev/null if [ -f /u/thl/.cvsrc ]; then
+cvs --version | grep RSE /dev/null if [ -f $HOME/.cvsrc ]; then
warn you use cvs with RSE patches, your ~/.cvsrc may collide with
${OPENPKG_WORK}/.cvsrc
fi
}
@@ -841,7 +841,7 @@
if [ .${TERM} = .xterm ]; then
PS1=[EMAIL PROTECTED]:${PWD}${CD_FUNC_IX}\nopenpkg-dev$
-echo -n ]0;openpkg-dev [EMAIL PROTECTED]:${PWD}${CD_FUNC_ID}
+echo -n ]0;openpkg-dev [EMAIL PROTECTED]:${PWD}${CD_FUNC_ID}
else
PS1=[EMAIL PROTECTED]:${PWD}${CD_FUNC_ID}\nopenpkg-dev$
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 21-Feb-2004 09:35:18
Branch: HEAD Handle: 2004022108351700
Modified files:
openpkg-re openpkg-dev
Log:
fix 'opd peek' and TMPDIR handling
Summary:
RevisionChanges Path
1.159 +2 -2 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.158 -r1.159 openpkg-dev
--- openpkg-re/openpkg-dev18 Feb 2004 11:25:49 - 1.158
+++ openpkg-re/openpkg-dev21 Feb 2004 08:35:17 - 1.159
@@ -222,7 +222,7 @@
rpm () {
getrpmcmd $E
if [ .${RPMCMD} != . ]; then
-HOME=${OPENPKG_WORK} command ${RPMCMD} $@
+eval HOME=\${OPENPKG_WORK} command ${RPMCMD} \[EMAIL PROTECTED]
else
echo $0:ERROR: no openpkg rpm found in instance \${E}\
return 1
@@ -880,7 +880,7 @@
fi
# pass-through environment
-export TMPDIR=/tmp
+export TMPDIR=${TMPDIR-/tmp}
# self destruction
rm ${OPENPKG_WORK}/.bashrc
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 18-Feb-2004 12:25:50
Branch: HEAD Handle: 2004021811254900
Modified files:
openpkg-re openpkg-dev
Log:
repair forced install (root subshell has no rpm function)
Summary:
RevisionChanges Path
1.158 +1 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.157 -r1.158 openpkg-dev
--- openpkg-re/openpkg-dev17 Feb 2004 21:43:13 - 1.157
+++ openpkg-re/openpkg-dev18 Feb 2004 11:25:49 - 1.158
@@ -1552,7 +1552,7 @@
fi
if [ $force -ne 0 ]; then
echo ++ installing $package ($rpmfile) forced
-ssh -t -x [EMAIL PROTECTED] rpm -Uvh $rpmdir/$rpmfile --force
--nodeps
+ssh -t -x [EMAIL PROTECTED] ${RPMCMD} -Uvh $rpmdir/$rpmfile --force
--nodeps
else
rpm -q $package /dev/null 21 continue
echo ++ installing $package ($rpmfile)
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 17-Feb-2004 22:43:14
Branch: HEAD Handle: 2004021721431300
Modified files:
openpkg-re openpkg-dev
Log:
adapt openpkg-dev to new filesystem layout world order
bashification: implement dumpfunc() to get rid of inline document scripting
move some functionality into working environment exporting functions but calling
scripts
overload typical commands/tools (i.e. cd|rpm) with functions in both work env and
inside script
speed up processing by using builtins were appropriate
typical pmod job testing tr|vi|lint|bu|list|pe|in|diff|cl|re passed
Summary:
RevisionChanges Path
1.157 +289 -275 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.156 -r1.157 openpkg-dev
--- openpkg-re/openpkg-dev10 Feb 2004 15:10:44 - 1.156
+++ openpkg-re/openpkg-dev17 Feb 2004 21:43:13 - 1.157
@@ -53,7 +53,7 @@
OPENPKG_CTAG=${OPENPKG_CTAG}; B=${B} # B (cvs tag, branch)
OPENPKG_EXEC=${OPENPKG_EXEC}; E=${E} # E (exec, instance)
export OPENPKG_SPEC P OPENPKG_CTAG B OPENPKG_EXEC E
-
+
# use an appropriate egrep
if [ -x /usr/xpg4/bin/${EGREP} ]; then
EGREP=/usr/xpg4/bin/egrep
@@ -114,13 +114,35 @@
#
+# dump a function (optionally only the inner code part)
+dumpfunc () {
+if [ .$1 = .-i ]; then
+shift
+type $1 \
+| awk -v cmd=$1 'BEGIN { f=0 }
+ /^ / { if (f==1) { print $0 } }
+ /^[a-zA-Z0-9]+ is a function/ { f=1 }'
+else
+type $1 \
+| awk -v cmd=$1 'BEGIN { f=0 }
+ // { if (f==1) { print $0 } }
+ /^[a-zA-Z0-9]+ is a function/ { print unalias cmd /dev/null
21; f=1 }'
+fi
+}
+
+# print a warning
warn () {
-echo ${prog_name}:WARNING: $1 12
+echo ${prog_name:-$0}:WARNING: $@ 12
+}
+
+# print an error
+error () {
+echo ${prog_name:-$0}:ERROR: $@ 12
}
+# print an error and die
die () {
-# exit gracefully
-echo ${prog_name}:ERROR: $1 12
+error $@
exit 1
}
@@ -159,6 +181,54 @@
unset _rv
}
+# get RPMCMD to the correct rpm cmd for a given instance, see
http://cvs.openpkg.org/chngview?cn=14911
+getrpmcmd () {
+if [ -x $1/bin/openpkg -a -x $1/libexec/openpkg ]; then #OpenPKG v2.x
+RPMCMD=$1/bin/openpkg rpm
+elif [ -x $1/bin/rpm -a ! -x $1/libexec/openpkg ]; then #OpenPKG v1.x
+RPMCMD=$1/bin/rpm
+else#OpenPKG N/A
+RPMCMD=
+fi
+}
+
+# smart dealing with temporary root privileges
+root () {
+if [ $# -eq 0 ]; then
+ssh -t -x [EMAIL PROTECTED] builtin cd ${PWD} \\ ${SHELL}
+elif [ .$1 = .rpm ]; then
+shift
+getrpmcmd $E
+if [ .${RPMCMD} != . ]; then
+ssh -t -x [EMAIL PROTECTED] builtin cd ${PWD} \\ HOME=${OPENPKG_WORK}
command ${RPMCMD} $@
+else
+echo $0:ERROR: no openpkg rpm found in instance \${E}\
+return 1
+fi
+else
+ssh -x [EMAIL PROTECTED] builtin cd ${PWD} \\ $@
+fi
+}
+
+cvs () {
+cvs_colorize=cat
+case $1 in
+di|dif|diff ) [ .`uwhich cvs-diff-colorize` != . ]
cvs_colorize=cvs-diff-colorize ;;
+up|upd|update ) [ .`uwhich cvs-update-colorize` != . ]
cvs_colorize=cvs-update-colorize ;;
+esac
+HOME=${OPENPKG_WORK} command cvs ${1+$@} | $cvs_colorize
+}
+
+rpm () {
+getrpmcmd $E
+if [ .${RPMCMD} != . ]; then
+HOME=${OPENPKG_WORK} command ${RPMCMD} $@
+else
+echo $0:ERROR: no openpkg rpm found in instance \${E}\
+return 1
+fi
+}
+
setup () {
# honor optional parameters [[[spec]ctag]exec]; use to specify a empty
parameter and use it's default
[ .$1 != . ] OPENPKG_SPEC=$1
@@ -277,7 +347,7 @@
# checkout the CVS module(s)
if [ .${P} = . ]; then
echo ++ checking out source areas (${OPENPKG_REPO}/{adm,doc,re,src,web})
-( cd ${OPENPKG_WORK}
+( builtin cd ${OPENPKG_WORK}
HOME=${OPENPKG_WORK}
export HOME
cvs -q -d ${OPENPKG_REPO} checkout openpkg-dev-adm openpkg-dev-doc
openpkg-dev-re
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 08-Feb-2004 20:45:42
Branch: HEAD Handle: 2004020819454200
Modified files:
openpkg-re openpkg-dev
Log:
news.txt is now auto-generated on the website, so no need to edit it
manually any longer
Summary:
RevisionChanges Path
1.154 +0 -27 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.153 -r1.154 openpkg-dev
--- openpkg-re/openpkg-dev6 Feb 2004 07:21:23 - 1.153
+++ openpkg-re/openpkg-dev8 Feb 2004 19:45:42 - 1.154
@@ -1223,28 +1223,6 @@
fi
fi
-if [ ${dry} -eq 0 ]; then
-(cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} up web/news.txt)
/dev/null 21
-else
-(cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} -n up web/news.txt)
/dev/null 21
-fi
-if [ .${rpm_version_old} = . -a .${rpm_version_new} != . ]; then
-package_type=New
-else
-package_type=Upgraded
-fi
-entry=`date +%d-%b-%Y`: ${package_type} package: P${rpmfile}
-grep ${entry} ${OPENPKG_WORK}/web/news.txt /dev/null
-if [ $? -ne 0 ]; then
-echo ++ updating news.txt
-if [ ${dry} -eq 0 ]; then
-(echo ${entry}; cat ${OPENPKG_WORK}/web/news.txt)
${OPENPKG_WORK}/web/news.txt${GUID}
-mv ${OPENPKG_WORK}/web/news.txt${GUID}
${OPENPKG_WORK}/web/news.txt
-else
-(echo ${entry})
-fi
-fi
-
echo ++ determining commit message
if [ .$msg = . ]; then
if [ .${rpm_version_old} = . \
@@ -1274,11 +1252,6 @@
echo ++ determining commit file list
files=src/${name}
-for file in web/news.txt; do
-if [ -f ${OPENPKG_WORK}/$file ]; then
-files=$files $file
-fi
-done
echo ++ comitting changes to CVS repository
cd ${OPENPKG_WORK} || die cannot cd to ${OPENPKG_WORK}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 06-Feb-2004 08:21:24
Branch: HEAD Handle: 2004020607212300
Modified files:
openpkg-re openpkg-dev
Log:
fix tracking (temporary files could bot be created)
Summary:
RevisionChanges Path
1.153 +1 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.152 -r1.153 openpkg-dev
--- openpkg-re/openpkg-dev3 Feb 2004 19:59:12 - 1.152
+++ openpkg-re/openpkg-dev6 Feb 2004 07:21:23 - 1.153
@@ -1785,7 +1785,7 @@
all=${packages}
fi
for name in $all; do
-$E/bin/rpm --track ${name}.spec --nodeps
+HOME=${OPENPKG_WORK} $E/bin/rpm --track ${name}.spec
done
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 03-Feb-2004 17:24:04
Branch: HEAD Handle: 2004020316240400
Modified files:
openpkg-re openpkg-dev
Log:
migrage vcheck to track (untested) omitting vc.* files; reserve room
for test command
Summary:
RevisionChanges Path
1.151 +24 -51 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.150 -r1.151 openpkg-dev
--- openpkg-re/openpkg-dev20 Jan 2004 12:56:01 - 1.150
+++ openpkg-re/openpkg-dev3 Feb 2004 16:24:04 - 1.151
@@ -1274,7 +1274,7 @@
echo ++ determining commit file list
files=src/${name}
-for file in re/vcheck/vc.${name} web/news.txt; do
+for file in web/news.txt; do
if [ -f ${OPENPKG_WORK}/$file ]; then
files=$files $file
fi
@@ -1474,6 +1474,13 @@
echo %description
echo ${name} is the most badly packaged program in the OpenPKG
world.
echo
+ echo %track
+ echo prog ${name} = {
+ echo version = 7.42
+ echo url = ftp://ftp.${name}.org/pub/${name}/;
+ echo regex = ${name}-(__VER__)\.tar\.gz
+ echo }
+ echo
echo %prep
echo %setup -q
echo
@@ -1509,28 +1516,6 @@
echo cd ${OPENPKG_WORK}/src/${name} cvs -d ${OPENPKG_REPO} add
${name}.spec
fi
fi
-
-echo ++ creating openpkg-re/vcheck/vc.${name} skeleton
-if [ ${dry} -eq 0 ]; then
-( echo config = {
- echo }
- echo
- echo prog ${name} = {
- echo version = 7.42
- echo url = ftp://ftp.${name}.org/pub/${name}/;
- echo regex = ${name}-(__VER__)\.tar\.gz
- echo }
- echo
-) ${OPENPKG_WORK}/re/vcheck/vc.${name}
-if [ .${OPENPKG_MODE} = .developer ]; then
-( cd ${OPENPKG_WORK}/re/vcheck cvs -d ${OPENPKG_REPO} add
vc.${name} )
-fi
-else
-echo creating ${OPENPKG_WORK}/re/vcheck/vc.${name}
-if [ .${OPENPKG_MODE} = .developer ]; then
-echo cd ${OPENPKG_WORK}/re/vcheck cvs -d ${OPENPKG_REPO} add
vc.${name}
-fi
-fi
done
}
@@ -1778,25 +1763,19 @@
done
}
-vcheck () {
-edit=0
-check=0
-packages=
-while [ .$1 != . ]; do
-case .$1 in
-.-e ) edit=1 ;;
-.-c ) check=1 ;;
- * ) packages=${packages} $1
-esac
-shift
-done
+testit () {
+# FIXME consider test() [shell function] vs. test(1) [builtin] vs. rpm
[non-OpenPKG] --test
+$E/bin/rpm --help | grep -- --test /dev/null echo $E/bin/rpm does not
support --test # FIXME s/echo/die/
+die testit not yet implemented. Developer: consider testit vs. test(1)
+}
-# if neither edit nor check specified, do both
-if [ ${edit} -eq 0 -a ${check} -eq 0 ]; then
-edit=1
-check=1
-fi
+vcheck () {
+# compatiblity FIXME
+die vcheck is deprecated. Use track.
+}
+track () {
+$E/bin/rpm --help | grep -- --track /dev/null || die $E/bin/rpm does not
support --track
if [ .${packages} = . ]; then
if [ .$P = . ]; then
die package cannot be identified. Neither parameter given nor \$P set.
@@ -1806,16 +1785,7 @@
all=${packages}
fi
for name in $all; do
-if [ ! -f ${OPENPKG_WORK}/re/vcheck/vc.${name} ]; then
-die version checking specification for package ${name} not found
-fi
-if [ ${edit} -ne 0 ]; then
-command ${EDITOR-vim} ${OPENPKG_WORK}/re/vcheck/vc.${name}
-fi
-if [ ${check} -ne 0 ]; then
-( cd ${OPENPKG_WORK}/re/vcheck make run PKG=${name} ) 2/dev/null
|| true
-( cd ${OPENPKG_WORK}/re/vcheck make clean PKG=${name} ) 2/dev/null
|| true
-fi
+$E/bin/rpm --track ${name}.spec --nodeps
done
}
@@ -2039,8 +2009,9 @@
\$ openpkg-dev run # [[spec]...]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 03-Feb-2004 20:59:12
Branch: HEAD Handle: 2004020319591200
Modified files:
openpkg-re openpkg-dev
Log:
use correct indentation and fix escapes
Summary:
RevisionChanges Path
1.152 +3 -3 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.151 -r1.152 openpkg-dev
--- openpkg-re/openpkg-dev3 Feb 2004 16:24:04 - 1.151
+++ openpkg-re/openpkg-dev3 Feb 2004 19:59:12 - 1.152
@@ -1476,9 +1476,9 @@
echo
echo %track
echo prog ${name} = {
- echo version = 7.42
- echo url = ftp://ftp.${name}.org/pub/${name}/;
- echo regex = ${name}-(__VER__)\.tar\.gz
+ echo version = 7.42
+ echo url = ftp://ftp.${name}.org/pub/${name}/;
+ echo regex = ${name}-(__VER__)\\.tar\\.gz
echo }
echo
echo %prep
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 20-Jan-2004 13:56:01
Branch: HEAD Handle: 2004012012560100
Modified files:
openpkg-re openpkg-dev
Log:
use an appropriate egrep
Summary:
RevisionChanges Path
1.150 +35 -28 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.149 -r1.150 openpkg-dev
--- openpkg-re/openpkg-dev16 Jan 2004 13:20:56 - 1.149
+++ openpkg-re/openpkg-dev20 Jan 2004 12:56:01 - 1.150
@@ -53,7 +53,14 @@
OPENPKG_CTAG=${OPENPKG_CTAG}; B=${B} # B (cvs tag, branch)
OPENPKG_EXEC=${OPENPKG_EXEC}; E=${E} # E (exec, instance)
export OPENPKG_SPEC P OPENPKG_CTAG B OPENPKG_EXEC E
-#
+
+# use an appropriate egrep
+if [ -x /usr/xpg4/bin/${EGREP} ]; then
+EGREP=/usr/xpg4/bin/egrep
+else
+EGREP=egrep
+fi
+
# a note about CVS HEAD
# CVS calls the latest version of a file head. It also supports two
# hardcoded pseudotags, BASE and HEAD. It is a strange and often
@@ -438,7 +445,7 @@
command=
mode=clear
else
-echo $1 | egrep ^/ /dev/null 21
+echo $1 | ${EGREP} ^/ /dev/null 21
if [ $? -eq 0 ]; then
# leading slash enters setup mode
execute=${1}
@@ -499,8 +506,8 @@
[ .${RV} = . ] return
# check for HEAD (branch) aka CURRENT (name)
-echo CURRENT | egrep ^${RV} /dev/null 21 RV=HEAD
-echo HEAD| egrep ^${RV} /dev/null 21 RV=HEAD
+echo CURRENT | ${EGREP} ^${RV} /dev/null 21 RV=HEAD
+echo HEAD| ${EGREP} ^${RV} /dev/null 21 RV=HEAD
if [ .${RV} != .HEAD ]; then
@@ -532,7 +539,7 @@
INSTANCE=$1
if [ .$mode = .exact ]; then
-echo ${INSTANCE} | egrep ^/ /dev/null #PATH
+echo ${INSTANCE} | ${EGREP} ^/ /dev/null #PATH
if [ $? -eq 0 -a -x ${INSTANCE}/bin/rpm ]; then
RV=${INSTANCE}
unset INSTANCE
@@ -546,18 +553,18 @@
INSTANCE=`echo $1 | sed -e 's;^OPENPKG_;;' -e 's;_STABLE$;;' -e 's;_SOLID$;;'
-e 's;^HEAD$;;' -e 's;_;.;g'`
RE=
-echo ${INSTANCE} | egrep -i ^head$/dev/null
RE=^[0-9]{8}$ #HEAD (any)
-echo ${INSTANCE} | egrep ^[0-9]{8}$ /dev/null
RE=^${INSTANCE}$ #HEAD
-echo ${INSTANCE} | egrep ^[0-9]{1,7}$ /dev/null
RE=^${INSTANCE}\. #STABLE
-echo ${INSTANCE} | egrep ^[0-9]+\.[0-9]{8}$ /dev/null
RE=^${INSTANCE}$ #SNAPSHOT
-echo ${INSTANCE} | egrep ^[0-9]+\.[0-9]{1,7}$ /dev/null
RE=^${INSTANCE} #SOLID (any UPD)
-echo ${INSTANCE} | egrep ^[0-9]+\.[0-9]{1,7}\.[0-9]+$ /dev/null
RE=^${INSTANCE}$ #SOLID
+echo ${INSTANCE} | ${EGREP} -i ^head$/dev/null
RE=^[0-9]{8}$ #HEAD (any)
+echo ${INSTANCE} | ${EGREP} ^[0-9]{8}$ /dev/null
RE=^${INSTANCE}$ #HEAD
+echo ${INSTANCE} | ${EGREP} ^[0-9]{1,7}$ /dev/null
RE=^${INSTANCE}\. #STABLE
+echo ${INSTANCE} | ${EGREP} ^[0-9]+\.[0-9]{8}$ /dev/null
RE=^${INSTANCE}$ #SNAPSHOT
+echo ${INSTANCE} | ${EGREP} ^[0-9]+\.[0-9]{1,7}$ /dev/null
RE=^${INSTANCE} #SOLID (any UPD)
+echo ${INSTANCE} | ${EGREP} ^[0-9]+\.[0-9]{1,7}\.[0-9]+$ /dev/null
RE=^${INSTANCE}$ #SOLID
RE=`echo ${RE} | sed -e 's;\.;\\.;g'`
for INSTANCE in ${OPENPKG_INST}; do
if [ -x ${INSTANCE}/bin/rpm ]; then
VERSION=`${INSTANCE}/bin/rpm -q --qf %{VERSION} openpkg`
-echo ${VERSION} | egrep $RE /dev/null
+echo ${VERSION} | ${EGREP} $RE /dev/null
if [ $? -eq 0 ]; then
RV=${INSTANCE}
unset INSTANCE
@@ -924,8 +931,8 @@
locationid=`HOME=${OPENPKG_WORK} $E/bin/rpm --eval %{_rpmfilename} | sed -e
's;^.*}-;;' -e 's;\.rpm$;;'`
for name in $all; do
name=`echo $name | sed -e 's;\.src\.rpm$;;' -e 's;\.nosrc\.rpm$;;'` #
convenience
-ls -l ${OPENPKG_WORK}/pkg/src/$name* | egrep
/$name[^-]*-[^-]+-[^-]+\.(no)?src.rpm$
-ls -l ${OPENPKG_WORK}/pkg/bin/$name* | egrep
/$name[^-]*-[^-]+-[^-]+\.[^-]+-[^-]+-${locationid}.rpm$
+ls -l ${OPENPKG_WORK}/pkg/src/$name* | ${EGREP}
/$name[^-]*-[^-]+-[^-]+\.(no)?src.rpm$
+ls -l ${OPENPKG_WORK}/pkg/bin/$name* | ${EGREP}
/$name[^-]*-[^-]+-[^-]+\.[^-]+-[^-]+-${locationid}.rpm$
[CVS] OpenPKG: openpkg-re/ openpkg-dev todo.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 16-Jan-2004 14:20:57
Branch: HEAD Handle: 2004011613205600
Modified files:
openpkg-re openpkg-dev todo.txt
Log:
add support for /openpkg, remove branch to foldername guessing magic,
allow list of instances in OPENPKG_INST
Summary:
RevisionChanges Path
1.149 +77 -86 openpkg-re/openpkg-dev
1.155 +0 -1 openpkg-re/todo.txt
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.148 -r1.149 openpkg-dev
--- openpkg-re/openpkg-dev8 Jan 2004 12:54:12 - 1.148
+++ openpkg-re/openpkg-dev16 Jan 2004 13:20:56 - 1.149
@@ -37,8 +37,7 @@
prog_date=14-Jul-2003
# default configuration
-OPENPKG_INST=/cw
-OPENPKG_WILD=*
+OPENPKG_INST=/openpkg-dev /openpkg-20 /openpkg-13 /cw13 /cw12 /cw11 /cw10
OPENPKG_WORK=${HOME}/work/openpkg
OPENPKG_TEMP=/tmp/${LOGNAME}/openpkg
OPENPKG_MODE=contributor# contributor
@@ -47,7 +46,7 @@
#OPENPKG_MODE=developer # developer
[EMAIL PROTECTED]:/e/openpkg/cvs# developer
#OPENPKG_DIST=master.openpkg.org:/e/openpkg/ftp/# developer
-export OPENPKG_INST OPENPKG_WILD OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE
OPENPKG_REPO OPENPKG_DIST
+export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO OPENPKG_DIST
# enforced and user controlled (through package/branch/execute) variables
OPENPKG_SPEC=${OPENPKG_SPEC}; P=${P} # P (package, spec file without .spec
suffix)
@@ -92,7 +91,6 @@
-h|--help) help=1 ;;
-V|--version ) version=1 ;;
--inst=* ) OPENPKG_INST=${arg} ;;
---wild=* ) OPENPKG_WILD=${arg} ;;
--work=* ) OPENPKG_WORK=${arg} ;;
--temp=* ) OPENPKG_TEMP=${arg} ;;
--mode=* ) OPENPKG_MODE=${arg} ;;
@@ -527,78 +525,57 @@
# $1 = requested branch
# $2 = optional mode one of exact, best, any; if omitted, defaults to any
#exact = find executable rpm exactly matching branch
-#best = see exact with fallback SOLID-STABLE-HEAD (no fallback if HEAD
itself was requested)
-#any = see best with fallback to any other out-of-branch rpm (no
fallback if HEAD itself was requested)
+#any = take first executable rpm
matchinstance () {
mode=${2:-any}
-[ .$mode != .exact -a .$mode != .best -a .$mode != .any ] die
matchinstance() assertion
+[ .$mode != .exact -a .$mode != .any ] die matchinstance() assertion
-INSTANCE=`echo $1 | sed -e 's;^OPENPKG_;;' -e 's;_STABLE$;;' -e 's;SOLID$;;'
-e 's;^HEAD$;;' -e 's;_;;g'`
-OPMAJORV=`echo ${INSTANCE} | cut -c 1`
-OPMINORV=`echo ${INSTANCE} | cut -c 2`
-
-# find all available instances with executable rpm
-AVAILINS=
-for INSTANCE in `echo ${OPENPKG_INST}${OPENPKG_WILD}`; do
-[ -x ${INSTANCE}/bin/rpm ] AVAILINS=${AVAILINS} ${INSTANCE}
-done
-AVAILINS=`echo ${AVAILINS} | tr ' ' '\n' | sort`
-
-INSTANCE=
-if [ .$1 = .HEAD ]; then # HEAD (explicitly requested)
-if [ .$mode = .exact ]; then
-ADD=`echo ${AVAILINS} | egrep^${OPENPKG_INST}$`
-AVAILINS=`echo ${AVAILINS} | egrep -v ^${OPENPKG_INST}$`
-INSTANCE=${INSTANCE} ${ADD}
-RV=`echo ${INSTANCE} | tr ' ' '\n' | head -n 1`
-unset ADD AVAILINS OPMINORV OPMAJORV INSTANCE
+INSTANCE=$1
+if [ .$mode = .exact ]; then
+echo ${INSTANCE} | egrep ^/ /dev/null #PATH
+if [ $? -eq 0 -a -x ${INSTANCE}/bin/rpm ]; then
+RV=${INSTANCE}
+unset INSTANCE
return
else
-RV=`echo ${AVAILINS} | tr ' ' '\n' | head -n 1`
-unset ADD AVAILINS OPMINORV OPMAJORV INSTANCE
+RV=
+unset INSTANCE
return
fi
fi
-if [ .${OPMINORV} != . ]; then # SOLID (explicitly requested)
-ADD=`echo ${AVAILINS} | egrep
^${OPENPKG_INST}${OPMAJORV}${OPMINORV}$`
-AVAILINS=`echo ${AVAILINS} | egrep -v
^${OPENPKG_INST}${OPMAJORV}${OPMINORV}$`
-INSTANCE=${INSTANCE} ${ADD}
-if [ .$mode = .exact ]; then
-RV=`echo ${INSTANCE} | tr ' ' '\n' | head -n 1`
-unset ADD AVAILINS OPMINORV
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 08-Jan-2004 13:54:12
Branch: HEAD Handle: 2004010812541200
Modified files:
openpkg-re openpkg-dev
Log:
tag %doc files as such, too
Summary:
RevisionChanges Path
1.148 +4 -0 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.147 -r1.148 openpkg-dev
--- openpkg-re/openpkg-dev4 Dec 2003 13:29:18 - 1.147
+++ openpkg-re/openpkg-dev8 Jan 2004 12:54:12 - 1.148
@@ -983,6 +983,10 @@
IFS=$OIFS
filter=$filter -e \s;^ (.* ${configfile})\$;C1;\
done
+for docfile in `HOME=${OPENPKG_WORK} $E/bin/rpm -qpld $rpmdir/$rpmfile`; do
+IFS=$OIFS
+filter=$filter -e \s;^ (.* ${docfile})\$;D1;\
+done
IFS=$OIFS
HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm -qplv $rpmdir/$rpmfile | eval
$filter
done
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 30-Oct-2003 12:34:26 Branch: HEAD Handle: 2003103011342600 Modified files: openpkg-re openpkg-dev Log: remember wish Summary: RevisionChanges Path 1.145 +1 -0 openpkg-re/openpkg-dev patch -p0 '@@ .' Index: openpkg-re/openpkg-dev $ cvs diff -u -r1.144 -r1.145 openpkg-dev --- openpkg-re/openpkg-dev10 Oct 2003 18:07:44 - 1.144 +++ openpkg-re/openpkg-dev30 Oct 2003 11:34:26 - 1.145 @@ -29,6 +29,7 @@ # - copy proprietary packages to private area based on license description - private/ -bs --norestriction # - should we eval the environment and, if yes, at which time - MANPATH, INFOPATH # - environment/script interaction may need performance improvements +# - cs wish: make xterm title fiddling optional or at least restore after leaving openpkg-dev # program version prog_name=openpkg-dev @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 10-Oct-2003 20:07:44
Branch: HEAD Handle: 2003101019074400
Modified files:
openpkg-re openpkg-dev
Log:
Ok, finally commit my cd - and cd + patches. This allows you to go
back arbitrary directory steps (not just a single one as the usual cd
- does) and even allows you to undo the going back with cd + in case
you went back too much. This is a very convinient functionality
if you have to switch forth and back between directories.
Summary:
RevisionChanges Path
1.144 +38 -7 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.143 -r1.144 openpkg-dev
--- openpkg-re/openpkg-dev2 Oct 2003 14:41:00 - 1.143
+++ openpkg-re/openpkg-dev10 Oct 2003 18:07:44 - 1.144
@@ -672,17 +672,48 @@
}
# prompt to indicate openpkg-dev bash environment
+declare -a DIRSTACKREV=()
cd () {
-if [ .\$1 = . ]; then
-if [ .\${OPENPKG_SPEC} = . ]; then
-workdir=\${OPENPKG_WORK}
+if [ .\$1 = .- ]; then
+# go to previous working directory on forward directory stack
+# and move this directory onto the reverse directory stack
+if [ \${#DIRSTACK[*]} -gt 1 ]; then
+workdir=\${DIRSTACK[0]}
+DIRSTACKREV[\${#DIRSTACKREV[*]}]=\${workdir}
+popd /dev/null
+else
+echo cd: no more previous working directories on forward directory
stack 12
+return 1
+fi
+elif [ .\$1 = .+ ]; then
+# go to previous working directory on reverse directory stack
+# and move this directory onto the forward directory stack
+if [ \${#DIRSTACKREV[*]} -gt 0 ]; then
+local i=\$((\${#DIRSTACKREV[*]} - 1))
+eval pushd \${DIRSTACKREV[\$i]} /dev/null
+unset DIRSTACKREV[\$i]
else
-workdir=\`command \${OPENPKG_WORK}/re/openpkg-dev package -query
workdir \${OPENPKG_SPEC}\`
+echo cd: no more previous working directories on reverse directory
stack 12
+return 1
fi
else
-workdir=\$1
+# go to next working directory
+# and move this directory onto the forward directory stack
+if [ .\$1 = . ]; then
+if [ .\${OPENPKG_SPEC} = . ]; then
+workdir=\${OPENPKG_WORK}
+else
+workdir=\`command \${OPENPKG_WORK}/re/openpkg-dev package
-query workdir \${OPENPKG_SPEC}\`
+fi
+else
+workdir=\$1
+fi
+pushd \${workdir} /dev/null
+if [ \${#DIRSTACK[*]} -ge 2 -a \${DIRSTACK[0]} = \${DIRSTACK[1]} ]; then
+popd /dev/null
+fi
+DIRSTACKREV=()
fi
-builtin cd \${workdir}
P=\`command \${OPENPKG_WORK}/re/openpkg-dev package\`
# P holds detection
@@ -779,7 +810,7 @@
fi
fi
# E has ultimate content
-
+
CD_FUNC_IX=
if [ .\$CD_FUNC_PX != . ]; then
CD_FUNC_IX=\${CD_FUNC_IX}\${CD_FUNC_IX:+ }\${CD_FUNC_PX}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 02-Oct-2003 10:20:24
Branch: HEAD Handle: 2003100209202400
Modified files:
openpkg-re openpkg-dev
Log:
correctly understand re-established packages
Summary:
RevisionChanges Path
1.141 +6 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.140 -r1.141 openpkg-dev
--- openpkg-re/openpkg-dev9 Sep 2003 07:04:35 - 1.140
+++ openpkg-re/openpkg-dev2 Oct 2003 08:20:24 - 1.141
@@ -1056,7 +1056,12 @@
echo ++ determine old version (if any)
tmpfile=${OPENPKG_TEMP}/${name}${GUID}
-cvs_rev=`cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} stat
src/${name}/${name}.spec 2/dev/null | awk '/Repository revision:/ { print $3; }'`
+cvs_stat=`cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} stat
src/${name}/${name}.spec 2/dev/null | grep 'Repository revision:'`
+cvs_rev=`echo ${cvs_stat} | awk '/Repository revision:/ { print $3;
}'`
+cvs_dead=`echo ${cvs_stat} | grep '/Attic/'`
+if [ .${cvs_dead} != . ]; then
+cvs_rev=No
+fi
if [ .${cvs_rev} != .No ]; then
cvs -d ${OPENPKG_REPO} co -p -r${cvs_rev}
openpkg-src/${name}/${name}.spec ${tmpfile} 2/dev/null
rpm_version_old=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf
%{VERSION} --specfile ${tmpfile} 2/dev/null`
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 02-Oct-2003 16:40:40
Branch: HEAD Handle: 2003100215404000
Modified files:
openpkg-re openpkg-dev
Log:
allow setting of TMPDIR without destruction inside openpkg-dev shell
Summary:
RevisionChanges Path
1.142 +3 -0 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.141 -r1.142 openpkg-dev
--- openpkg-re/openpkg-dev2 Oct 2003 08:20:24 - 1.141
+++ openpkg-re/openpkg-dev2 Oct 2003 14:40:40 - 1.142
@@ -864,6 +864,9 @@
fi
cd .
+# pass-through environment
+export TMPDIR=${TMPDIR}
+
# self destruction
rm \${OPENPKG_WORK}/.bashrc
EOF
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 02-Oct-2003 16:41:00
Branch: HEAD Handle: 200310021541
Modified files:
openpkg-re openpkg-dev
Log:
be smart of TMPDIR is not set
Summary:
RevisionChanges Path
1.143 +1 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.142 -r1.143 openpkg-dev
--- openpkg-re/openpkg-dev2 Oct 2003 14:40:40 - 1.142
+++ openpkg-re/openpkg-dev2 Oct 2003 14:41:00 - 1.143
@@ -865,7 +865,7 @@
cd .
# pass-through environment
-export TMPDIR=${TMPDIR}
+export TMPDIR=${TMPDIR-/tmp}
# self destruction
rm \${OPENPKG_WORK}/.bashrc
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-re/ openpkg-dev
On Tue, Sep 09, 2003, Ralf S. Engelschall wrote:
On Tue, Sep 09, 2003, Thomas Lotterer wrote:
[...]
too much prosa here
[...]
-makedir ${workdir}
+mkdir ${workdir}
[...]
Can you be more specific? makedir is a function defined in openpkg-dev
to provide the mkdir -p functionality. If you replace it a plain
mkdir this is lost. Perhaps it is not needed in this context, but
throughout openpkg-dev we always use makedir... just wondering...
I have to investigate, makedir simply did nothing (tried twice).
https://rt.openpkg.org/Ticket/Display.html?id=251
--
[EMAIL PROTECTED]
Development Team, Operations Northern Europe, Cable Wireless
__
The OpenPKG Projectwww.openpkg.org
Developer Communication List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-re/ openpkg-dev
On Tue, Sep 09, 2003, Thomas Lotterer wrote:
[...]
too much prosa here
[...]
-makedir ${workdir}
+mkdir ${workdir}
[...]
Can you be more specific? makedir is a function defined in openpkg-dev
to provide the mkdir -p functionality. If you replace it a plain
mkdir this is lost. Perhaps it is not needed in this context, but
throughout openpkg-dev we always use makedir... just wondering...
Ralf S. Engelschall
[EMAIL PROTECTED]
www.engelschall.com
__
The OpenPKG Projectwww.openpkg.org
Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 15-Aug-2003 21:01:03
Branch: HEAD Handle: 2003081520010200
Modified files:
openpkg-re openpkg-dev
Log:
remove the unpacked sources on release and install
Summary:
RevisionChanges Path
1.139 +5 -0 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.138 -r1.139 openpkg-dev
--- openpkg-re/openpkg-dev5 Aug 2003 07:53:33 - 1.138
+++ openpkg-re/openpkg-dev15 Aug 2003 19:01:02 - 1.139
@@ -1032,6 +1032,9 @@
template=`HOME=${OPENPKG_WORK} $E/bin/rpm --eval '%{_rpmfilename}' | sed -e
's;\..*$;;'`
rpmfile=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf ${template} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
+echo ++ cleaning up sources
+HOME=${OPENPKG_WORK} $E/bin/rpm --clean --nodeps
${OPENPKG_WORK}/src/${name}/${name}.spec /dev/null 21 || true
+
# developer section
if [ .${OPENPKG_MODE} = .developer ]; then
@@ -1545,6 +1548,8 @@
if [ $? -ne 0 ]; then
warn failed to install $package
fi
+echo ++ cleaning up sources
+HOME=${OPENPKG_WORK} $E/bin/rpm --clean --nodeps
${OPENPKG_WORK}/src/${name}/${name}.spec /dev/null 21 || true
done
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 05-Aug-2003 09:53:34
Branch: HEAD Handle: 2003080508533300
Modified files:
openpkg-re openpkg-dev
Log:
suck in openpkg env only, because openpkg_rc_all=no is usually in
effect
Summary:
RevisionChanges Path
1.138 +2 -2 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.137 -r1.138 openpkg-dev
--- openpkg-re/openpkg-dev5 Aug 2003 07:50:21 - 1.137
+++ openpkg-re/openpkg-dev5 Aug 2003 07:53:33 - 1.138
@@ -463,7 +463,7 @@
if [ .${mode} = .execute ]; then
( HOME=${OPENPKG_WORK}
export HOME
- #FIXME eval `${E}/etc/rc --eval all env`
+ #FIXME eval `${E}/etc/rc --eval openpkg env`
echo ${command}
${command}
)
@@ -637,7 +637,7 @@
export CVS_RSH
# import OpenPKG environment
-eval \`\${OPENPKG_INST}/etc/rc --eval all env\`
+eval \`\${OPENPKG_INST}/etc/rc --eval openpkg env\`
# provide a unified which(1) command, because vendor implementations differ
in error results.
uwhich () {
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 05-Aug-2003 09:50:21
Branch: HEAD Handle: 2003080508502100
Modified files:
openpkg-re openpkg-dev
Log:
make sure speclint uses the right RPM
Summary:
RevisionChanges Path
1.137 +3 -3 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.136 -r1.137 openpkg-dev
--- openpkg-re/openpkg-dev30 Jul 2003 12:30:11 - 1.136
+++ openpkg-re/openpkg-dev5 Aug 2003 07:50:21 - 1.137
@@ -1123,7 +1123,7 @@
if [ .${BRANCH} = .HEAD ]; then
echo ++ linting ${name}.spec (package specification)
-HOME=${OPENPKG_WORK} perl ${OPENPKG_WORK}/re/speclint.pl
${OPENPKG_WORK}/src/${name}/${name}.spec
+HOME=${OPENPKG_WORK} perl ${OPENPKG_WORK}/re/speclint.pl
--rpm=${OPENPKG_INST}/bin/rpm ${OPENPKG_WORK}/src/${name}/${name}.spec
if [ $? -gt 0 ]; then
die unacceptable specification:
${OPENPKG_WORK}/src/${name}/${name}.spec
fi
@@ -1693,7 +1693,7 @@
name=`echo ${name} | sed -e 's;\.spec$;;'`
echo ++ linting $file (package specification)
-HOME=${OPENPKG_WORK} perl ${OPENPKG_WORK}/re/speclint.pl $file
+HOME=${OPENPKG_WORK} perl ${OPENPKG_WORK}/re/speclint.pl
--rpm=${OPENPKG_INST}/bin/rpm $file
if [ $? -gt 0 -a $force -ne 1 ]; then
die unacceptable specification
fi
@@ -1952,7 +1952,7 @@
for file in $files; do
TERM=${TERM}-color command vim ${file}
if [ .${OPENPKG_MODE} = .developer -a .${B} = .HEAD -o $force -ne 0
]; then
-HOME=${OPENPKG_WORK} perl ${OPENPKG_WORK}/re/speclint.pl ${file}
+HOME=${OPENPKG_WORK} perl ${OPENPKG_WORK}/re/speclint.pl
--rpm=${OPENPKG_INST}/bin/rpm ${file}
if [ $? -gt 0 ]; then
die unacceptable specification: ${file}
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-re Date: 29-Jul-2003 17:35:15 Branch: HEAD Handle: 2003072916351400 Modified files: openpkg-re openpkg-dev Log: extend search to OpenPKG v1.3 Summary: RevisionChanges Path 1.135 +3 -0 openpkg-re/openpkg-dev patch -p0 '@@ .' Index: openpkg-re/openpkg-dev $ cvs diff -u -r1.134 -r1.135 openpkg-dev --- openpkg-re/openpkg-dev28 Jul 2003 06:17:40 - 1.134 +++ openpkg-re/openpkg-dev29 Jul 2003 15:35:14 - 1.135 @@ -1631,6 +1631,9 @@ for i in $all; do search_for $i ftp://ftp.openpkg.org/current/SRC/ search_for $i ftp://ftp.openpkg.org/stable/SRC/ +search_for $i ftp://ftp.openpkg.org/release/1.3/UPD/ +search_for $i ftp://ftp.openpkg.org/release/1.3/SRC/ +search_for $i ftp://ftp.openpkg.org/release/1.3/SRC/PLUS/ search_for $i ftp://ftp.openpkg.org/release/1.2/UPD/ search_for $i ftp://ftp.openpkg.org/release/1.2/SRC/ search_for $i ftp://ftp.openpkg.org/release/1.2/SRC/PLUS/ @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-re Date: 28-Jul-2003 08:17:41 Branch: HEAD Handle: 2003072807174000 Modified files: openpkg-re openpkg-dev Log: we currently use no subdir Summary: RevisionChanges Path 1.134 +1 -0 openpkg-re/openpkg-dev patch -p0 '@@ .' Index: openpkg-re/openpkg-dev $ cvs diff -u -r1.133 -r1.134 openpkg-dev --- openpkg-re/openpkg-dev25 Jul 2003 09:12:33 - 1.133 +++ openpkg-re/openpkg-dev28 Jul 2003 06:17:40 - 1.134 @@ -1630,6 +1630,7 @@ fi for i in $all; do search_for $i ftp://ftp.openpkg.org/current/SRC/ +search_for $i ftp://ftp.openpkg.org/stable/SRC/ search_for $i ftp://ftp.openpkg.org/release/1.2/UPD/ search_for $i ftp://ftp.openpkg.org/release/1.2/SRC/ search_for $i ftp://ftp.openpkg.org/release/1.2/SRC/PLUS/ @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 25-Jul-2003 11:12:34
Branch: HEAD Handle: 2003072510123300
Modified files:
openpkg-re openpkg-dev
Log:
we currently use no subdir
Summary:
RevisionChanges Path
1.133 +2 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.132 -r1.133 openpkg-dev
--- openpkg-re/openpkg-dev24 Jul 2003 09:29:47 - 1.132
+++ openpkg-re/openpkg-dev25 Jul 2003 09:12:33 - 1.133
@@ -1088,7 +1088,8 @@
fi
if [ .${BRANCH} = .STABLE ]; then
rpm_release_req=${OPMAJORV}.`date '+%Y%m%d'`
-upload=stable/${OPMAJORV}/SRC/
+#upload=stable/${OPMAJORV}/SRC/
+upload=stable/SRC/
fi
if [ .${BRANCH} = .SOLID ]; then
update=`echo ${rpm_release_old} | sed -e 's;^.*\.;;'`
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 24-Jul-2003 11:29:48
Branch: HEAD Handle: 2003072410294700
Modified files:
openpkg-re openpkg-dev
Log:
fix URL for contributor uploading
Summary:
RevisionChanges Path
1.132 +1 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.131 -r1.132 openpkg-dev
--- openpkg-re/openpkg-dev22 Jul 2003 19:22:02 - 1.131
+++ openpkg-re/openpkg-dev24 Jul 2003 09:29:47 - 1.132
@@ -42,7 +42,7 @@
OPENPKG_TEMP=/tmp/${LOGNAME}/openpkg
OPENPKG_MODE=contributor# contributor
OPENPKG_REPO=:pserver:[EMAIL PROTECTED]:/e/openpkg/cvs # contributor
-OPENPKG_DIST=ftp://ftp.openpkg.org/contrib/00UPLOAD/# contributor
+OPENPKG_DIST=ftp://ftp.openpkg.org/contrib/00UPLOAD # contributor
#OPENPKG_MODE=developer # developer
[EMAIL PROTECTED]:/e/openpkg/cvs# developer
#OPENPKG_DIST=master.openpkg.org:/e/openpkg/ftp/# developer
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 22-Jul-2003 10:14:54
Branch: HEAD Handle: 2003072209145400
Modified files:
openpkg-re openpkg-dev
Log:
reenable chmod/scp for mass committing
Summary:
RevisionChanges Path
1.127 +2 -2 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.126 -r1.127 openpkg-dev
--- openpkg-re/openpkg-dev17 Jul 2003 21:39:37 - 1.126
+++ openpkg-re/openpkg-dev22 Jul 2003 08:14:54 - 1.127
@@ -1308,8 +1308,8 @@
echo cvs -d ${OPENPKG_REPO} commit ${bundle_msg} ${bundle_files}
cvs -d ${OPENPKG_REPO} diff ${bundle_files} | ${cvs_diff_colorize}
else
-echo chmod 664 ${bundle_srpms}
-echo scp -o Compression no -o Cipher blowfish ${bundle_srpms}
${OPENPKG_DIST}/${upload}
+chmod 664 ${bundle_srpms}
+scp -o Compression no -o Cipher blowfish ${bundle_srpms}
${OPENPKG_DIST}/${upload}
eval cvs -d ${OPENPKG_REPO} commit ${bundle_msg} ${bundle_files}
fi
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 22-Jul-2003 10:25:35
Branch: HEAD Handle: 2003072209253400
Modified files:
openpkg-re openpkg-dev
Log:
fix and unify test for dry run
Summary:
RevisionChanges Path
1.128 +7 -7 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.127 -r1.128 openpkg-dev
--- openpkg-re/openpkg-dev22 Jul 2003 08:14:54 - 1.127
+++ openpkg-re/openpkg-dev22 Jul 2003 08:25:34 - 1.128
@@ -1157,8 +1157,8 @@
chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
scp -o Compression no -o Cipher blowfish
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}
else
-chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
-scp -o Compression no -o Cipher blowfish
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}
+echo chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
+echo scp -o Compression no -o Cipher blowfish
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}
fi
if [ .${name} = .openpkg ]; then
@@ -1303,14 +1303,14 @@
# lazy execution of bundled CVS commit
if [ ${bundle} -eq 1 ]; then
cd ${OPENPKG_WORK} || die cannot cd to ${OPENPKG_WORK}
-if [ ${dry} -eq 1 ]; then
-echo scp -o Compression no -o Cipher blowfish ${bundle_srpms}
${OPENPKG_DIST}/${upload}
-echo cvs -d ${OPENPKG_REPO} commit ${bundle_msg} ${bundle_files}
-cvs -d ${OPENPKG_REPO} diff ${bundle_files} | ${cvs_diff_colorize}
-else
+if [ ${dry} -eq 0 ]; then
chmod 664 ${bundle_srpms}
scp -o Compression no -o Cipher blowfish ${bundle_srpms}
${OPENPKG_DIST}/${upload}
eval cvs -d ${OPENPKG_REPO} commit ${bundle_msg} ${bundle_files}
+else
+echo scp -o Compression no -o Cipher blowfish ${bundle_srpms}
${OPENPKG_DIST}/${upload}
+echo cvs -d ${OPENPKG_REPO} commit ${bundle_msg} ${bundle_files}
+cvs -d ${OPENPKG_REPO} diff ${bundle_files} | ${cvs_diff_colorize}
fi
fi
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 22-Jul-2003 21:17:16
Branch: HEAD Handle: 2003072220171600
Modified files:
openpkg-re openpkg-dev
Log:
workaround for platforms where grep does not support -q(uiet) option
Summary:
RevisionChanges Path
1.130 +2 -2 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.129 -r1.130 openpkg-dev
--- openpkg-re/openpkg-dev22 Jul 2003 14:46:59 - 1.129
+++ openpkg-re/openpkg-dev22 Jul 2003 19:17:16 - 1.130
@@ -307,7 +307,7 @@
# - patch the RSE patch to disable the upward search - bad for existing
binaries
# - use -f option to ignore .cvsrc - requires this script to provide the
options directly
# - temporary solution is to just print a warning
-cvs --version | grep -q RSE if [ -f /u/thl/.cvsrc ]; then
+cvs --version | grep RSE /dev/null if [ -f /u/thl/.cvsrc ]; then
warn you use cvs with RSE patches, your ~/.cvsrc may collide with
${OPENPKG_WORK}/.cvsrc
fi
}
@@ -510,7 +510,7 @@
BRANDR=`echo ${RV} | sed -e
's;^\([1-9][0-9]*\(_\{0,1\}[0-9]*\)\)\(.*\)$;\3;' -e 's;^_*;;'`
# select direction, check optional direction
-echo ${BRANBP} | grep -q '_'
+echo ${BRANBP} | grep '_' /dev/null
if [ $? = 0 ]; then
RV=OPENPKG_${BRANBP}_SOLID
else
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 17-Jul-2003 20:56:58
Branch: HEAD Handle: 2003071719565700
Modified files:
openpkg-re openpkg-dev
Log:
Disable use of -p option for scp because in case the user does not have
permisson to change things (mtime, mod etc.) on the remote side the cvs
server starts to print warnings on stderr. These warnings are not pulled
off the communication channel (don't ask me who should do it) and the
upload freezes. Sorry, no more background information, yet.
Summary:
RevisionChanges Path
1.125 +6 -6 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.124 -r1.125 openpkg-dev
--- openpkg-re/openpkg-dev14 Jul 2003 12:46:29 - 1.124
+++ openpkg-re/openpkg-dev17 Jul 2003 18:56:57 - 1.125
@@ -1155,10 +1155,10 @@
bundle_srpms=${bundle_srpms}
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
elif [ ${dry} -eq 0 ]; then
chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
-scp -o Compression no -o Cipher blowfish -p
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}
+scp -o Compression no -o Cipher blowfish
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}
else
echo chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
-echo scp -o Compression no -o Cipher blowfish -p
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}
+echo scp -o Compression no -o Cipher blowfish
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}
fi
if [ .${name} = .openpkg ]; then
@@ -1169,7 +1169,7 @@
scp -o Compression no -o Cipher blowfish
${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh ${OPENPKG_DIST}/${upload}
else
echo chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
-echo scp -o Compression no -o Cipher blowfish -p
${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh ${OPENPKG_DIST}/${upload}
+echo scp -o Compression no -o Cipher blowfish
${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh ${OPENPKG_DIST}/${upload}
fi
else
die required file ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
missing
@@ -1304,12 +1304,12 @@
if [ ${bundle} -eq 1 ]; then
cd ${OPENPKG_WORK} || die cannot cd to ${OPENPKG_WORK}
if [ ${dry} -eq 1 ]; then
-echo scp -o Compression no -o Cipher blowfish -p ${bundle_srpms}
${OPENPKG_DIST}/${upload}
+echo scp -o Compression no -o Cipher blowfish ${bundle_srpms}
${OPENPKG_DIST}/${upload}
echo cvs -d ${OPENPKG_REPO} commit ${bundle_msg} ${bundle_files}
cvs -d ${OPENPKG_REPO} diff ${bundle_files} | ${cvs_diff_colorize}
else
-chmod 664 ${bundle_srpms}
-scp -o Compression no -o Cipher blowfish -p ${bundle_srpms}
${OPENPKG_DIST}/${upload}
+echo chmod 664 ${bundle_srpms}
+echo scp -o Compression no -o Cipher blowfish ${bundle_srpms}
${OPENPKG_DIST}/${upload}
eval cvs -d ${OPENPKG_REPO} commit ${bundle_msg} ${bundle_files}
fi
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 09-Jul-2003 16:28:21
Branch: HEAD Handle: 2003070915282100
Modified files:
openpkg-re openpkg-dev
Log:
if we say 'force', we really mean force, baby
Summary:
RevisionChanges Path
1.123 +1 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.122 -r1.123 openpkg-dev
--- openpkg-re/openpkg-dev8 Jul 2003 19:39:33 - 1.122
+++ openpkg-re/openpkg-dev9 Jul 2003 14:28:21 - 1.123
@@ -1528,7 +1528,7 @@
fi
if [ $force -ne 0 ]; then
echo ++ installing $package ($rpmfile) forced
-ssh -t -x [EMAIL PROTECTED] HOME=${OPENPKG_WORK} $E/bin/rpm -Uvh
$rpmdir/$rpmfile --force
+ssh -t -x [EMAIL PROTECTED] HOME=${OPENPKG_WORK} $E/bin/rpm -Uvh
$rpmdir/$rpmfile --force --nodeps
else
HOME=${OPENPKG_WORK} $E/bin/rpm -q $package /dev/null 21 continue
echo ++ installing $package ($rpmfile)
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 08-Jul-2003 14:57:42
Branch: HEAD Handle: 2003070813574200
Modified files:
openpkg-re openpkg-dev
Log:
integrate rclint and fsllint
Summary:
RevisionChanges Path
1.118 +37 -2 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.117 -r1.118 openpkg-dev
--- openpkg-re/openpkg-dev8 Jul 2003 09:35:48 - 1.117
+++ openpkg-re/openpkg-dev8 Jul 2003 12:57:42 - 1.118
@@ -1120,6 +1120,20 @@
if [ $? -gt 0 ]; then
die unacceptable specification:
${OPENPKG_WORK}/src/${name}/${name}.spec
fi
+if [ -f rc.${name} ]; then
+echo ++ linting rc.${name} for HEAD branch
+perl ${OPENPKG_WORK}/re/rclint.pl
${OPENPKG_WORK}/src/${name}/rc.${name}
+if [ $? -gt 0 ]; then
+die unacceptable run commands:
${OPENPKG_WORK}/src/${name}/rc.${name}
+fi
+fi
+if [ -f fsl.${name} ]; then
+echo ++ linting fsl.${name} for HEAD branch
+perl ${OPENPKG_WORK}/re/fsllint.pl
${OPENPKG_WORK}/src/${name}/fsl.${name}
+if [ $? -gt 0 ]; then
+die unacceptable fsl configuration:
${OPENPKG_WORK}/src/${name}/fsl.${name}
+fi
+fi
fi
if [ .${BRANCH} = .HEAD -a .$extra = .1 ]; then
@@ -1663,17 +1677,38 @@
files=$name
fi
for file in $files; do
-echo ++ Linting package specification: $file
+name=`echo ${file} | sed -e 's;^.*/;;'`
+path=`echo ${file} | sed -e s;/$name\$;;`
+name=`echo ${name} | sed -e 's;\.spec$;;'`
+
+echo ++ linting package specification: $file
perl ${OPENPKG_WORK}/re/speclint.pl $file
if [ $? -gt 0 -a $force -ne 1 ]; then
die unacceptable specification
fi
+
+if [ -f ${path}/rc.${name} ]; then
+echo ++ linting run commands ${path}/rc.${name} for HEAD branch
+perl ${OPENPKG_WORK}/re/rclint.pl ${path}/rc.${name}
+if [ $? -gt 0 -a $force -ne 1 ]; then
+die unacceptable run commands: ${path}/rc.${name}
+fi
+fi
+
+if [ -f ${path}/fsl.${name} ]; then
+echo ++ linting fsl configuration ${path}/fsl.${name} for HEAD
branch
+perl ${OPENPKG_WORK}/re/fsllint.pl ${path}/fsl.${name}
+if [ $? -gt 0 -a $force -ne 1 ]; then
+die unacceptable fsl configuration: ${path}/fsl.${name}
+fi
+fi
+
if [ .$extra = .1 ]; then
bin_template=`HOME=${OPENPKG_WORK} $E/bin/rpm --eval
'%{_rpmfilename}'`
bin_rpmfile=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf
${bin_template} --specfile $file`
bin_rpmdir=`HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm --eval
'%{_rpmdir}'`
if [ -f $bin_rpmdir/$bin_rpmfile ]; then
-echo ++ Linting binary package: ${bin_rpmdir}/${bin_rpmfile}
+echo ++ linting binary package: ${bin_rpmdir}/${bin_rpmfile}
perl ${OPENPKG_WORK}/re/rpmlint.pl --check=layout,attrib
$bin_rpmdir/$bin_rpmfile
if [ $? -gt 0 -a $force -ne 1 ]; then
die unacceptable specification: $bin_rpmdir/$bin_rpmfile
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 08-Jul-2003 15:32:37
Branch: HEAD Handle: 2003070814323700
Modified files:
openpkg-re openpkg-dev
Log:
speed up the uploading a little bit
Summary:
RevisionChanges Path
1.119 +6 -6 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.118 -r1.119 openpkg-dev
--- openpkg-re/openpkg-dev8 Jul 2003 12:57:42 - 1.118
+++ openpkg-re/openpkg-dev8 Jul 2003 13:32:37 - 1.119
@@ -1155,10 +1155,10 @@
bundle_srpms=${bundle_srpms}
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
elif [ ${dry} -eq 0 ]; then
chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
-scp -p ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
${OPENPKG_DIST}/${upload}
+scp -o Compression no -o Cipher blowfish -p
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}
else
echo chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
-echo scp -p ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
${OPENPKG_DIST}/${upload}
+echo scp -o Compression no -o Cipher blowfish -p
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}
fi
if [ .${name} = .openpkg ]; then
@@ -1166,10 +1166,10 @@
echo ++ releasing ${rpmfile}.src.sh to OpenPKG distribution
area ${upload}
if [ ${dry} -eq 0 ]; then
chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
-scp ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
${OPENPKG_DIST}/${upload}
+scp -o Compression no -o Cipher blowfish
${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh ${OPENPKG_DIST}/${upload}
else
echo chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
-echo scp -p ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
${OPENPKG_DIST}/${upload}
+echo scp -o Compression no -o Cipher blowfish -p
${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh ${OPENPKG_DIST}/${upload}
fi
else
die required file ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
missing
@@ -1304,12 +1304,12 @@
if [ ${bundle} -eq 1 ]; then
cd ${OPENPKG_WORK} || die cannot cd to ${OPENPKG_WORK}
if [ ${dry} -eq 1 ]; then
-echo scp -p ${bundle_srpms} ${OPENPKG_DIST}/${upload}
+echo scp -o Compression no -o Cipher blowfish -p ${bundle_srpms}
${OPENPKG_DIST}/${upload}
echo cvs -d ${OPENPKG_REPO} commit ${bundle_msg} ${bundle_files}
cvs -d ${OPENPKG_REPO} diff ${bundle_files} | ${cvs_diff_colorize}
else
chmod 664 ${bundle_srpms}
-scp -p ${bundle_srpms} ${OPENPKG_DIST}/${upload}
+scp -o Compression no -o Cipher blowfish -p ${bundle_srpms}
${OPENPKG_DIST}/${upload}
eval cvs -d ${OPENPKG_REPO} commit ${bundle_msg} ${bundle_files}
fi
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 08-Jul-2003 16:16:50
Branch: HEAD Handle: 2003070815165000
Modified files:
openpkg-re openpkg-dev
Log:
print same message under release and lint commands
Summary:
RevisionChanges Path
1.120 +8 -8 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.119 -r1.120 openpkg-dev
--- openpkg-re/openpkg-dev8 Jul 2003 13:32:37 - 1.119
+++ openpkg-re/openpkg-dev8 Jul 2003 14:16:50 - 1.120
@@ -1115,20 +1115,20 @@
fi
if [ .${BRANCH} = .HEAD ]; then
-echo ++ linting ${name}.spec for HEAD branch
+echo ++ linting ${name}.spec (package specification)
perl ${OPENPKG_WORK}/re/speclint.pl
${OPENPKG_WORK}/src/${name}/${name}.spec
if [ $? -gt 0 ]; then
die unacceptable specification:
${OPENPKG_WORK}/src/${name}/${name}.spec
fi
if [ -f rc.${name} ]; then
-echo ++ linting rc.${name} for HEAD branch
+echo ++ linting rc.${name} (run-command script)
perl ${OPENPKG_WORK}/re/rclint.pl
${OPENPKG_WORK}/src/${name}/rc.${name}
if [ $? -gt 0 ]; then
die unacceptable run commands:
${OPENPKG_WORK}/src/${name}/rc.${name}
fi
fi
if [ -f fsl.${name} ]; then
-echo ++ linting fsl.${name} for HEAD branch
+echo ++ linting fsl.${name} (OSSP fsl configuration)
perl ${OPENPKG_WORK}/re/fsllint.pl
${OPENPKG_WORK}/src/${name}/fsl.${name}
if [ $? -gt 0 ]; then
die unacceptable fsl configuration:
${OPENPKG_WORK}/src/${name}/fsl.${name}
@@ -1142,7 +1142,7 @@
--specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
bin_rpmdir=`HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm --eval
'%{_rpmdir}'`
if [ -f $bin_rpmdir/$bin_rpmfile ]; then
-echo ++ linting ${bin_rpmfile} for HEAD branch
+echo ++ linting ${bin_rpmfile} (binary package)
perl ${OPENPKG_WORK}/re/rpmlint.pl --check=layout,attrib
$bin_rpmdir/$bin_rpmfile
if [ $? -gt 0 ]; then
die unacceptable specification: $bin_rpmdir/$bin_rpmfile
@@ -1681,14 +1681,14 @@
path=`echo ${file} | sed -e s;/$name\$;;`
name=`echo ${name} | sed -e 's;\.spec$;;'`
-echo ++ linting package specification: $file
+echo ++ linting $file (package specification)
perl ${OPENPKG_WORK}/re/speclint.pl $file
if [ $? -gt 0 -a $force -ne 1 ]; then
die unacceptable specification
fi
if [ -f ${path}/rc.${name} ]; then
-echo ++ linting run commands ${path}/rc.${name} for HEAD branch
+echo ++ linting ${path}/rc.${name} (run-command script)
perl ${OPENPKG_WORK}/re/rclint.pl ${path}/rc.${name}
if [ $? -gt 0 -a $force -ne 1 ]; then
die unacceptable run commands: ${path}/rc.${name}
@@ -1696,7 +1696,7 @@
fi
if [ -f ${path}/fsl.${name} ]; then
-echo ++ linting fsl configuration ${path}/fsl.${name} for HEAD
branch
+echo ++ linting ${path}/fsl.${name} (OSSP fsl configuration)
perl ${OPENPKG_WORK}/re/fsllint.pl ${path}/fsl.${name}
if [ $? -gt 0 -a $force -ne 1 ]; then
die unacceptable fsl configuration: ${path}/fsl.${name}
@@ -1708,7 +1708,7 @@
bin_rpmfile=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf
${bin_template} --specfile $file`
bin_rpmdir=`HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm --eval
'%{_rpmdir}'`
if [ -f $bin_rpmdir/$bin_rpmfile ]; then
-echo ++ linting binary package: ${bin_rpmdir}/${bin_rpmfile}
+echo ++ linting ${bin_rpmdir}/${bin_rpmfile} (binary package)
perl ${OPENPKG_WORK}/re/rpmlint.pl --check=layout,attrib
$bin_rpmdir/$bin_rpmfile
if [ $?
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 08-Jul-2003 17:17:58 Branch: HEAD Handle: 2003070816175800 Modified files: openpkg-re openpkg-dev Log: provide the convenience alias 'opd' Summary: RevisionChanges Path 1.121 +1 -0 openpkg-re/openpkg-dev patch -p0 '@@ .' Index: openpkg-re/openpkg-dev $ cvs diff -u -r1.120 -r1.121 openpkg-dev --- openpkg-re/openpkg-dev8 Jul 2003 14:16:50 - 1.120 +++ openpkg-re/openpkg-dev8 Jul 2003 15:17:58 - 1.121 @@ -826,6 +826,7 @@ execute | e* ) cd . ;; esac } +alias opd=openpkg-dev # override cvs and rpm commands to use local config files unalias cvs /dev/null 21 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 08-Jul-2003 21:39:34
Branch: HEAD Handle: 2003070820393300
Modified files:
openpkg-re openpkg-dev
Log:
adjust copyright part
Summary:
RevisionChanges Path
1.122 +2 -3 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.121 -r1.122 openpkg-dev
--- openpkg-re/openpkg-dev8 Jul 2003 15:17:58 - 1.121
+++ openpkg-re/openpkg-dev8 Jul 2003 19:39:33 - 1.122
@@ -1,10 +1,9 @@
#!/bin/sh
##
## openpkg-dev -- experimental implementation of forthcoming 'openpkg dev'
-##
-## Copyright (c) 2000-2003 Cable Wireless Deutschland GmbH
## Copyright (c) 2000-2003 The OpenPKG Project http://www.openpkg.org/
## Copyright (c) 2000-2003 Ralf S. Engelschall [EMAIL PROTECTED]
+## Copyright (c) 2000-2003 Cable Wireless http://www.cw.com/
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -1379,9 +1378,9 @@
if [ ${dry} -eq 0 ]; then
( echo ##
echo ## ${name}.spec -- OpenPKG RPM Specification
- echo ## Copyright (c) 2000-${year} Cable Wireless Deutschland
GmbH
echo ## Copyright (c) 2000-${year} The OpenPKG Project
http://www.openpkg.org/
echo ## Copyright (c) 2000-${year} Ralf S. Engelschall [EMAIL
PROTECTED]
+ echo ## Copyright (c) 2000-${year} Cable Wireless
http://www.cw.com/
echo ##
echo ## Permission to use, copy, modify, and distribute this
software for
echo ## any purpose with or without fee is hereby granted, provided
that
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 07-Jul-2003 15:57:50
Branch: HEAD Handle: 2003070714575000
Modified files:
openpkg-re openpkg-dev
Log:
add support for 'real' mass-comitting ;-)
Summary:
RevisionChanges Path
1.116 +36 -4 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.115 -r1.116 openpkg-dev
--- openpkg-re/openpkg-dev4 Jul 2003 18:14:58 - 1.115
+++ openpkg-re/openpkg-dev7 Jul 2003 13:57:50 - 1.116
@@ -996,6 +996,21 @@
die $E/bin/rpm not executable. \$E might not be set properly.
fi
+# determine whether CVS commit messages can be bundled
+bundle=0
+if [ .${msg} != . ]; then
+bundle=1
+bundle_files=
+bundle_msg=
+if [ -f ${msg} ]; then
+bundle_msg=-F \${msg}\
+elif [ .${msg} = .- ]; then
+bundle_msg=
+else
+bundle_msg=-m \$msg\
+fi
+fi
+
for name in $all; do
name=`echo $name | sed -e 's;\.src\.rpm$;;' -e 's;\.nosrc\.rpm$;;'` #
convenience
name=`echo ${name} | sed -e 's;-[^-][^-]*-[^-][^-]*$;;'`#
convenience
@@ -1185,7 +1200,7 @@
msg=modifying package: ${rpm_name}-${rpm_version_new}
${rpm_release_old} again
fi
if [ .${msg} = . ]; then
-die unable to determine type of source changes. Please
specifiy commit message
+die unable to determine type of source changes. Please specify
commit message
fi
fi
@@ -1200,21 +1215,27 @@
echo ++ comitting changes to CVS repository
cd ${OPENPKG_WORK} || die cannot cd to ${OPENPKG_WORK}
if [ .${msg} != . -a -f ${msg} ]; then
-if [ ${dry} -eq 0 ]; then
+if [ ${bundle} -eq 1 ]; then
+bundle_files=${bundle_files} ${files}
+elif [ ${dry} -eq 0 ]; then
cvs -d ${OPENPKG_REPO} commit -F ${msg} $files
else
echo cvs commit -F ${msg} $files
cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
fi
elif [ .${msg} = .- ]; then
-if [ ${dry} -eq 0 ]; then
+if [ ${bundle} -eq 1 ]; then
+bundle_files=${bundle_files} ${files}
+elif [ ${dry} -eq 0 ]; then
cvs -d ${OPENPKG_REPO} commit $files
else
echo cvs commit $files
cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
fi
else
-if [ ${dry} -eq 0 ]; then
+if [ ${bundle} -eq 1 ]; then
+bundle_files=${bundle_files} ${files}
+elif [ ${dry} -eq 0 ]; then
cvs -d ${OPENPKG_REPO} commit -m ${msg} $files
else
echo cvs commit -m ${msg} $files
@@ -1257,6 +1278,17 @@
fi
fi
done
+
+# lazy execution of bundled CVS commit
+if [ ${bundle} -eq 1 ]; then
+cd ${OPENPKG_WORK} || die cannot cd to ${OPENPKG_WORK}
+if [ ${dry} -eq 1 ]; then
+echo cvs -d ${OPENPKG_REPO} commit ${bundle_msg} ${bundle_files}
+cvs -d ${OPENPKG_REPO} diff ${bundle_files} | ${cvs_diff_colorize}
+else
+eval cvs -d ${OPENPKG_REPO} commit ${bundle_msg} ${bundle_files}
+fi
+fi
}
kill () {
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 17-Jun-2003 18:07:03
Branch: HEAD Handle: 2003061717070200
Modified files:
openpkg-re openpkg-dev
Log:
using subshell helps on solaris
Summary:
RevisionChanges Path
1.113 +1 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.112 -r1.113 openpkg-dev
--- openpkg-re/openpkg-dev2 Jun 2003 13:46:38 - 1.112
+++ openpkg-re/openpkg-dev17 Jun 2003 16:07:02 - 1.113
@@ -344,7 +344,7 @@
# execute query, if any
if [ .${query} != . ]; then
-eval ${query}
+( eval ${query} )
return
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 02-Jun-2003 15:46:39
Branch: HEAD Handle: 2003060214463800
Modified files:
openpkg-re openpkg-dev
Log:
replace 'egrep -q' with shell redirection because it doesn't exists on
all platforms (e.g. Solaris)
Summary:
RevisionChanges Path
1.112 +15 -15 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.111 -r1.112 openpkg-dev
--- openpkg-re/openpkg-dev14 May 2003 18:57:21 - 1.111
+++ openpkg-re/openpkg-dev2 Jun 2003 13:46:38 - 1.112
@@ -440,7 +440,7 @@
command=
mode=clear
else
-echo $1 | egrep -q ^/
+echo $1 | egrep ^/ /dev/null 21
if [ $? -eq 0 ]; then
# leading slash enters setup mode
execute=${1}
@@ -501,8 +501,8 @@
[ .${RV} = . ] return
# check for HEAD (branch) aka CURRENT (name)
-echo CURRENT | egrep -q ^${RV} RV=HEAD
-echo HEAD| egrep -q ^${RV} RV=HEAD
+echo CURRENT | egrep ^${RV} /dev/null 21 RV=HEAD
+echo HEAD| egrep ^${RV} /dev/null 21 RV=HEAD
if [ .${RV} != .HEAD ]; then
@@ -1008,7 +1008,7 @@
if [ .${OPENPKG_MODE} = .developer ]; then
# compatiblity FIXME
-echo ${OPENPKG_DIST} | egrep -q /current/SRC/?$
+echo ${OPENPKG_DIST} | egrep /current/SRC/?$ /dev/null 21
if [ $? -eq 0 ]; then
warn deprecated suffix /current/src in
OPENPKG_DIST=${OPENPKG_DIST}.
warn This might come from your ~/.openpkg-dev.rc file. Please fix.
@@ -1478,10 +1478,10 @@
case .$1 in
.-D ) shift
opt=$1
- pkg=; echo ${opt} | egrep -q '::' pkg=`echo ${opt} | sed
-e 's;::.*$;;'`
+ pkg=; echo ${opt} | egrep '::' /dev/null 21 pkg=`echo
${opt} | sed -e 's;::.*$;;'`
opt=`echo ${opt} | sed -e 's;^.*::;;'`
- echo ${opt} | egrep -q '^with_' || opt=with_${opt}
- echo ${opt} | egrep -q '=' || opt=${opt}=yes
+ echo ${opt} | egrep '^with_' /dev/null 21 ||
opt=with_${opt}
+ echo ${opt} | egrep '=' /dev/null 21 || opt=${opt}=yes
if [ .${pkg} = . ]; then
defall=${defall} ${opt}
else
@@ -1587,9 +1587,9 @@
all=${packages}
fi
for name in $all; do
-echo $name | egrep -q ^[./]+
+echo $name | egrep ^[./]+ /dev/null 21
if [ $? -ne 0 ]; then
-echo $name | egrep -q /
+echo $name | egrep / /dev/null 21
if [ $? -eq 0 ]; then
name=${OPENPKG_WORK}/src/$name
else
@@ -1685,9 +1685,9 @@
fi
for name in $all; do
-echo $name | egrep -q ^[./]+
+echo $name | egrep ^[./]+ /dev/null 21
if [ $? -ne 0 ]; then
-echo $name | egrep -q /
+echo $name | egrep / /dev/null 21
if [ $? -eq 0 ]; then
name=${OPENPKG_WORK}/src/$name
else
@@ -1752,9 +1752,9 @@
fi
for name in $all; do
-echo $name | egrep -q ^[./]+
+echo $name | egrep ^[./]+ /dev/null 21
if [ $? -ne 0 ]; then
-echo $name | egrep -q /
+echo $name | egrep / /dev/null 21
if [ $? -eq 0 ]; then
name=${OPENPKG_WORK}/src/$name
else
@@ -1816,9 +1816,9 @@
fi
for name in $all; do
-echo $name | egrep -q ^[./]+
+echo $name | egrep ^[./]+ /dev/null 21
if [ $? -ne 0 ]; then
-echo $name | egrep -q /
+echo $name | egrep / /dev/null 21
if [ $? -eq 0 ]; then
name=${OPENPKG_WORK}/src/$name
else
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 05-Apr-2003 20:34:29
Branch: HEAD Handle: 2003040519342800
Modified files:
openpkg-re openpkg-dev
Log:
although I'm not 100% sure, try to fix the lint command for
'openpkg-dev lint foo' where foo is a directory under src/
Summary:
RevisionChanges Path
1.89+1 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.88 -r1.89 openpkg-dev
--- openpkg-re/openpkg-dev2 Apr 2003 15:00:05 - 1.88
+++ openpkg-re/openpkg-dev5 Apr 2003 18:34:28 - 1.89
@@ -1430,7 +1430,7 @@
name=${OPENPKG_WORK}/src/$name
else
name=`echo $name | sed -e 's;\.spec$;;'` # convenience
-name=${OPENPKG_WORK}/src/$name/$name
+name=${OPENPKG_WORK}/src/$name/$name.spec
fi
fi
if [ -d $name ]; then
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 05-Apr-2003 21:14:47 Branch: HEAD Handle: 2003040520144600 Modified files: openpkg-re openpkg-dev Log: do sorted lint processing, please Summary: RevisionChanges Path 1.90+1 -1 openpkg-re/openpkg-dev patch -p0 '@@ .' Index: openpkg-re/openpkg-dev $ cvs diff -u -r1.89 -r1.90 openpkg-dev --- openpkg-re/openpkg-dev5 Apr 2003 18:34:28 - 1.89 +++ openpkg-re/openpkg-dev5 Apr 2003 19:14:46 - 1.90 @@ -1434,7 +1434,7 @@ fi fi if [ -d $name ]; then -files=`find $name -type f -name '*.spec' -print` +files=`find $name -type f -name '*.spec' -print | sort` else files=$name fi @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 02-Apr-2003 10:37:46
Branch: HEAD Handle: 2003040209374500
Modified files:
openpkg-re openpkg-dev
Log:
update 00README and move maintenance from setup() into help()
fix possible problem in release() where $package was not preinitialized
three second penalty and hint to fix it when using obsolete $OPENPKG_DIST
new() now supports multiple packages and dry run
install() and search() now follow PBE logic
lint() supports PBE logic and also accepts files and directories
Summary:
RevisionChanges Path
1.85+215 -139 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.84 -r1.85 openpkg-dev
--- openpkg-re/openpkg-dev2 Apr 2003 07:56:33 - 1.84
+++ openpkg-re/openpkg-dev2 Apr 2003 08:37:45 - 1.85
@@ -276,26 +276,7 @@
fi
echo ++ creating README file (${OPENPKG_REPO}/00README)
-sed -e 's;^ *;;' EOF ${OPENPKG_WORK}/00README
-OpenPKG Development Area [created by openpkg-dev]
-
-\$ openpkg-dev bash .. enter development environment
-\$ openpkg-dev branch switch to a different branch
-\$ openpkg-dev diff .. dry run release
-\$ openpkg-dev execute ... execute command on instance closest to branch
-\$ openpkg-dev help .. display this command summary
-\$ openpkg-dev install ... install a package
-\$ openpkg-dev kill .. kill the environment
-\$ openpkg-dev lint .. lint package specification
-\$ openpkg-dev list .. list source and binary packages
-\$ openpkg-dev new ... create new packag from scratch
-\$ openpkg-dev package ... switch to a different package
-\$ openpkg-dev peek .. peek at file list of binary package
-\$ openpkg-dev release ... release package changes to master server
-\$ openpkg-dev search search a package on master server
-\$ openpkg-dev setup . already been done ;)
-\$ openpkg-dev update update development environment from master server
-EOF
+help
}
update () {
@@ -922,6 +903,7 @@
# honor optional parameters [-dry] [-m message]
dry=0
msg=
+packages=
while [ .$1 != . ]; do
case .$1 in
.-dry ) dry=1 ;;
@@ -972,7 +954,9 @@
# compatiblity FIXME
echo ${OPENPKG_DIST} | egrep -q /current/SRC/?$
if [ $? -eq 0 ]; then
-warn deprecated suffix /current/src in OPENPKG_DIST=${OPENPKG_DIST}.
Please fix.
+warn deprecated suffix /current/src in OPENPKG_DIST=${OPENPKG_DIST}.
+warn This might come from your ~/.openpkg-dev.rc file. Please fix.
+warn Three second penalty :-)
sleep 3
OPENPKG_DIST=`echo ${OPENPKG_DIST} | sed -e 's;/$;;' -e
's;/current/src$;;'`
fi
@@ -1209,139 +1193,183 @@
}
new () {
-name=$1
-shift
-if [ -d ${OPENPKG_WORK}/src/${name} ]; then
-die directory ${OPENPKG_WORK}/src/${name} already exists -- remove first
-fi
-
-echo ++ creating openpkg-src/${name}/ CVS area
-makedir 755 ${OPENPKG_WORK}/src/${name} || die cannot create
${OPENPKG_WORK}/src/${name}
-( cd ${OPENPKG_WORK}/src cvs -d ${OPENPKG_REPO} add ${name} )
-
-echo ++ creating openpkg-src/${name}/${name}.spec skeleton
-year=`date '+%Y'`
-( echo ##
- echo ## ${name}.spec -- OpenPKG RPM Specification
- echo ## Copyright (c) 2000-${year} Cable Wireless Deutschland GmbH
- echo ## Copyright (c) 2000-${year} The OpenPKG Project
http://www.openpkg.org/
- echo ## Copyright (c) 2000-${year} Ralf S. Engelschall [EMAIL PROTECTED]
- echo ##
- echo ## Permission to use, copy, modify, and distribute this software for
- echo ## any purpose with or without fee is hereby granted, provided that
- echo ## the above copyright notice and this permission notice appear in all
- echo ## copies.
- echo ##
- echo ## THIS SOFTWARE IS PROVIDED \`\`AS IS'' AND ANY EXPRESSED OR IMPLIED
- echo ## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF
- echo ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED.
- echo ## IN NO EVENT SHALL THE AUTHORS AND
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 02-Apr-2003 10:40:02
Branch: HEAD Handle: 2003040209400100
Modified files:
openpkg-re openpkg-dev
Log:
change indentation ONLY
Summary:
RevisionChanges Path
1.86+211 -211 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.85 -r1.86 openpkg-dev
--- openpkg-re/openpkg-dev2 Apr 2003 08:37:45 - 1.85
+++ openpkg-re/openpkg-dev2 Apr 2003 08:40:01 - 1.86
@@ -949,235 +949,235 @@
fi
template=`HOME=${OPENPKG_WORK} $E/bin/rpm --eval '%{_rpmfilename}' | sed -e
's;\..*$;;'`
rpmfile=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf ${template} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
-if [ .${OPENPKG_MODE} = .developer ]; then
+if [ .${OPENPKG_MODE} = .developer ]; then
-# compatiblity FIXME
-echo ${OPENPKG_DIST} | egrep -q /current/SRC/?$
-if [ $? -eq 0 ]; then
-warn deprecated suffix /current/src in OPENPKG_DIST=${OPENPKG_DIST}.
-warn This might come from your ~/.openpkg-dev.rc file. Please fix.
-warn Three second penalty :-)
-sleep 3
-OPENPKG_DIST=`echo ${OPENPKG_DIST} | sed -e 's;/$;;' -e
's;/current/src$;;'`
-fi
-
-echo ++ determine [no]src extension
-ext=
-[ -f ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.rpm ]ext=src.rpm
-[ -f ${OPENPKG_WORK}/pkg/src/${rpmfile}.nosrc.rpm ] ext=nosrc.rpm
-[ .$ext = . ] die ${OPENPKG_WORK}/pkg/src/${rpmfile}.[no]src.rpm not
found
-
-echo ++ determine old version (if any)
-tmpfile=${OPENPKG_TEMP}/${name}${GUID}
-cvs_rev=`cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} stat
src/${name}/${name}.spec 2/dev/null | awk '/Repository revision:/ { print $3; }'`
-if [ .${cvs_rev} != .No ]; then
-cvs -d ${OPENPKG_REPO} co -p -r${cvs_rev}
openpkg-src/${name}/${name}.spec ${tmpfile} 2/dev/null
-rpm_version_old=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf %{VERSION}
--specfile ${tmpfile} 2/dev/null`
-rpm_release_old=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf %{RELEASE}
--specfile ${tmpfile} 2/dev/null`
-rm -f ${tmpfile}
-[ .${rpm_version_old} = . ] die cannot determine old version
number
-[ .${rpm_release_old} = . ] die cannot determine old release
number
-fi
-
-echo ++ determine new version
-rpm_version_new=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf %{VERSION}
--specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
-rpm_release_new=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf %{RELEASE}
--specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
-rpm_name=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf %{NAME} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
-rpm_summary=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf %{SUMMARY}
--specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
-[ .${rpm_version_new} = . ] die cannot determine new version number
-[ .${rpm_release_new} = . ] die cannot determine new release number
-
-echo ++ determine branch and related release number and upload suffix
-if [ .$B = .HEAD ]; then
-BRANCH=HEAD
-else
-BRANCH=`echo $B | sed -e 's;^OPENPKG_;;' -e 's;_STABLE$;;' -e
's;SOLID$;;' -e 's;^HEAD$;;' -e 's;_;;g'`
-OPMAJORV=`echo ${BRANCH} | cut -c 1`
-OPMINORV=`echo ${BRANCH} | cut -c 2`
-if [ .${OPMINORV} != . ]; then
-BRANCH=SOLID
-elif [ .${OPMAJORV} != . ]; then
-BRANCH=STABLE
-else
-BRANCH=
-fi
-fi
-rpm_release_req=
-upload=
-if [ .${BRANCH} = .HEAD ]; then
-rpm_release_req=`date '+%Y%m%d'`
-upload=current/SRC/
-fi
-if [ .${BRANCH} = .STABLE ]; then
-rpm_release_req=${OPMAJORV}.`date '+%Y%m%d'`
-upload=stable/${OPMAJORV}/SRC/
-fi
-if [ .${BRANCH} = .SOLID ]; then
-update=`echo ${rpm_release_old} | sed -e 's;^.*\.;;'`
-if [ .${update} = . ]; then
-update=0
-else
-update=`expr ${update} + 1`
-fi
-
[CVS] OpenPKG: openpkg-re/ openpkg-dev release.txt openpkg-re/release/...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 02-Apr-2003 12:04:33
Branch: HEAD Handle: 2003040211043201
Modified files:
openpkg-re openpkg-dev release.txt
openpkg-re/release shtool
Log:
correct spelling of privileges
Summary:
RevisionChanges Path
1.87+1 -1 openpkg-re/openpkg-dev
1.25+1 -1 openpkg-re/release.txt
1.2 +2 -2 openpkg-re/release/shtool
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.86 -r1.87 openpkg-dev
--- openpkg-re/openpkg-dev2 Apr 2003 08:40:01 - 1.86
+++ openpkg-re/openpkg-dev2 Apr 2003 10:04:32 - 1.87
@@ -598,7 +598,7 @@
# import OpenPKG environment
eval \`\${OPENPKG_INST}/etc/rc --eval all env\`
-# smart dealing with temporary root priviledges
+# smart dealing with temporary root privileges
root () {
if [ \$# -eq 0 ]; then
ssh -t -x [EMAIL PROTECTED] cd \${PWD} \\ \${SHELL}
@@ .
patch -p0 '@@ .'
Index: openpkg-re/release.txt
$ cvs diff -u -r1.24 -r1.25 release.txt
--- openpkg-re/release.txt11 Jan 2003 11:05:54 - 1.24
+++ openpkg-re/release.txt2 Apr 2003 10:04:32 - 1.25
@@ -7,7 +7,7 @@
Development Team dvX.dev.de.cw.net machines and access to the OpenPKG
master server master.openpkg.org (aka en4.engelschall.com).
- # switch to home directory of a non-priviledged user
+ # switch to home directory of a non-privileged user
$ cd $HOME
# prepare working area
@@ .
patch -p0 '@@ .'
Index: openpkg-re/release/shtool
$ cvs diff -u -r1.1 -r1.2 shtool
--- openpkg-re/release/shtool 8 Aug 2002 15:14:04 - 1.1
+++ openpkg-re/release/shtool 2 Apr 2003 10:04:33 - 1.2
@@ -2157,14 +2157,14 @@
echo chown -R $opt_u $tmpdir/$tarname /dev/null 21 21
fi
chown -R $opt_u $tmpdir/$tarname /dev/null 21 ||\
-echo $msgprefix:Warning: cannot set user name \`$opt_u' (would require
root priviledges)
+echo $msgprefix:Warning: cannot set user name \`$opt_u' (would require
root privileges)
fi
if [ .$opt_g != . ]; then
if [ .$opt_t = .yes ]; then
echo chgrp -R $opt_g $tmpdir/$tarname /dev/null 21 21
fi
chgrp -R $opt_g $tmpdir/$tarname /dev/null 21 ||\
-echo $msgprefix:Warning: cannot set group name \`$opt_g' (would
require root priviledges)
+echo $msgprefix:Warning: cannot set group name \`$opt_g' (would
require root privileges)
fi
if [ .$opt_t = .yes ]; then
echo (cd $tmpdir $prg_find $tarname -type f -depth -print | sort |
xargs $prg_tar cf -) | cat $compress $tmpfile.out 12
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 02-Apr-2003 17:00:10
Branch: HEAD Handle: 2003040216000500
Modified files:
openpkg-re openpkg-dev
Log:
fix fix for OPENPKG_DIST path
Summary:
RevisionChanges Path
1.88+1 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.87 -r1.88 openpkg-dev
--- openpkg-re/openpkg-dev2 Apr 2003 10:04:32 - 1.87
+++ openpkg-re/openpkg-dev2 Apr 2003 15:00:05 - 1.88
@@ -958,7 +958,7 @@
warn This might come from your ~/.openpkg-dev.rc file. Please fix.
warn Three second penalty :-)
sleep 3
-OPENPKG_DIST=`echo ${OPENPKG_DIST} | sed -e 's;/$;;' -e
's;/current/src$;;'`
+OPENPKG_DIST=`echo ${OPENPKG_DIST} | sed -e 's;/$;;' -e
's;/current/SRC$;;'`
fi
echo ++ determine [no]src extension
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 01-Apr-2003 17:34:29
Branch: HEAD Handle: 2003040116342900
Modified files:
openpkg-re openpkg-dev
Log:
be less demanding when selecting a reasonable bash
Summary:
RevisionChanges Path
1.83+7 -4 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.82 -r1.83 openpkg-dev
--- openpkg-re/openpkg-dev1 Apr 2003 15:16:23 - 1.82
+++ openpkg-re/openpkg-dev1 Apr 2003 15:34:29 - 1.83
@@ -833,10 +833,13 @@
fi
# find reasonable Bash
-if [ -f ${OPENPKG_INST}/bin/bash ]; then
-bash=${OPENPKG_INST}/bin/bash
-elif [ -f ${OPENPKG_INST}/lib/openpkg/bash ]; then
-bash=${OPENPKG_INST}/lib/openpkg/bash
+matchinstance any
+if [ -f ${RV}/bin/bash ]; then
+bash=${RV}/bin/bash
+elif [ -f ${RV}/lib/openpkg/bash ]; then
+bash=${RV}/lib/openpkg/bash
+elif [ -f `which bash` ]; then
+bash=`which bash`
else
die no \bash\ found in OpenPKG instance
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Peter Smej
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 02-Apr-2003 09:56:34
Branch: HEAD Handle: 2003040208563300
Modified files:
openpkg-re openpkg-dev
Log:
directory is upper case
Summary:
RevisionChanges Path
1.84+1 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.83 -r1.84 openpkg-dev
--- openpkg-re/openpkg-dev1 Apr 2003 15:34:29 - 1.83
+++ openpkg-re/openpkg-dev2 Apr 2003 07:56:33 - 1.84
@@ -970,7 +970,7 @@
if [ .${OPENPKG_MODE} = .developer ]; then
# compatiblity FIXME
-echo ${OPENPKG_DIST} | egrep -q /current/src/?$
+echo ${OPENPKG_DIST} | egrep -q /current/SRC/?$
if [ $? -eq 0 ]; then
warn deprecated suffix /current/src in OPENPKG_DIST=${OPENPKG_DIST}.
Please fix.
sleep 3
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 31-Mar-2003 20:33:45
Branch: HEAD Handle: 2003033119334500
Modified files:
openpkg-re openpkg-dev
Log:
explain and consequently use HEAD handling; sort options and correct
abbreviations
Summary:
RevisionChanges Path
1.78+30 -14 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.77 -r1.78 openpkg-dev
--- openpkg-re/openpkg-dev31 Mar 2003 07:25:11 - 1.77
+++ openpkg-re/openpkg-dev31 Mar 2003 18:33:45 - 1.78
@@ -60,6 +60,20 @@
OPENPKG_CTAG=${OPENPKG_CTAG}; B=${B} # B (cvs tag, branch)
OPENPKG_EXEC=${OPENPKG_EXEC}; E=${E} # E (exec, instance)
export OPENPKG_SPEC P OPENPKG_CTAG B OPENPKG_EXEC E
+#
+# a note about CVS HEAD
+# CVS calls the latest version of a file head. It also supports two
+# hardcoded pseudotags, BASE and HEAD. It is a strange and often
+# unexpected behaviour that checking out the HEAD tag is a sticky
+# operation and not identical to checking out the head and clear
+# stickyness which requires no -r option to cvs checkout or option
+# -A to cvs up. In contrast to this original behaviour this program
+# uses HEAD for input, internal processing and output whenever the
+# user really means clear stickyness. The cd shell script might
+# experience the unlikely event that a directory or file was really
+# updated to the HEAD tag. Only in this event the tag is being
+# output as HEAD_STICKY which means that this becomes a third
+# hardcoded pseudotag.
# override configuration from ${HOME}/.openpkg-dev.rc
progname=`basename $0`
@@ -320,7 +334,9 @@
if [ .${CVSTAGFILES} = . ]; then
B=
else
-B=`cat ${CVSTAGFILES} | sed -e 's;//$;//THEAD;' -n -e 's;^.*//T;;p' |
sort | uniq | tr '\n' ':' | sed -e 's;:$;;'`
+B=`cat ${CVSTAGFILES} \
+| sed -e 's;//THEAD$;//THEAD_STICKY;' -e 's;//$;//THEAD;' -n -e
's;^.*//T;;p' \
+| sort | uniq | tr '\n' ':' | sed -e 's;:$;;'`
fi
unset CVSTAGFILES
echo ${B}
@@ -349,7 +365,7 @@
echo ++ updating to branch ${branch}
( HOME=${OPENPKG_WORK}
export HOME
- if [ .${branch} = .HEAD ]; then
+ if [ .${branch} = .HEAD ]; then
cvs update -A
else
cvs update -r ${branch}
@@ -672,13 +688,13 @@
openpkg-dev () {
case \$1 in
-package | p* ) OPENPKG_SPEC=\`command \${OPENPKG_WORK}/re/openpkg-dev
package -query package \$2\`; cd . ;;
+package | pa* ) OPENPKG_SPEC=\`command \${OPENPKG_WORK}/re/openpkg-dev
package -query package \$2\`; cd . ;;
branch | br* ) OPENPKG_CTAG=\`command \${OPENPKG_WORK}/re/openpkg-dev
branch -query branch \$2\`; cd . ;;
execute | e* ) OPENPKG_EXEC=\`command \${OPENPKG_WORK}/re/openpkg-dev
execute -query execute \$2\`; cd . ;;
esac
command \${OPENPKG_WORK}/re/openpkg-dev \${1+\$@}
case \$1 in
-package | p* ) if [ .\$2 = . ]; then cd .; else cd
\${OPENPKG_WORK}/src/\${P}; fi ;;
+package | pa* ) if [ .\$2 = . ]; then cd .; else cd
\${OPENPKG_WORK}/src/\${P}; fi ;;
branch | br* ) cd . ;;
execute | e* ) cd . ;;
esac
@@ -1203,22 +1219,22 @@
# handle command
case ${cmd} in
-setup | set*) cmd=setup ;;
bash| ba* ) cmd=bash;;
-update | u* ) cmd=update ;;
-package | pa* ) cmd=package ;;
branch | br* ) cmd=branch ;;
+diff| d* ) cmd=diff;;
execute | e* ) cmd=execute ;;
+help| h* ) cmd=help;;
+install | i* ) cmd=install ;;
+kill| k* ) cmd=kill;;
+lint| lin*) cmd=lint;;
list| lis*) cmd=list;;
-peek| pe* ) cmd=peek;;
-search | sea*) cmd=search ;;
new | n* ) cmd=new ;;
-diff| d* ) cmd=diff;;
-lint| lin*) cmd=lint;;
+package | pa* ) cmd=package ;;
+peek| pe* ) cmd=peek;;
release | r* ) cmd=release ;;
-install | i* ) cmd=install ;;
-kill| k* ) cmd=kill;;
-help| h* ) cmd=help;;
+search | sea*) cmd=search ;;
+setup | set*) cmd=setup ;;
+update | u* ) cmd=update ;;
*) die unknown
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 31-Mar-2003 20:39:38
Branch: HEAD Handle: 2003033119393800
Modified files:
openpkg-re openpkg-dev
Log:
modify logic to set P,B,E to detection when it conflicts with
enforcment - the latter can then be used to reject a command on
mismatch
Summary:
RevisionChanges Path
1.79+3 -6 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.78 -r1.79 openpkg-dev
--- openpkg-re/openpkg-dev31 Mar 2003 18:33:45 - 1.78
+++ openpkg-re/openpkg-dev31 Mar 2003 18:39:38 - 1.79
@@ -575,10 +575,9 @@
CD_FUNC_PX=[1mP=\${P}[m
CD_FUNC_PD=P=\${P}.
else
-# forced; detected and mismatch; print forced black ! detected
normal (aka forced exclamation mark detected)
+# forced; detected and mismatch; keep detected; print forced
black ! detected normal (aka forced exclamation mark detected)
CD_FUNC_PX=[1mP=\${OPENPKG_SPEC}[m![31m\${P}[m
CD_FUNC_PD=P=\${OPENPKG_SPEC}.\${P}!
-P=\${OPENPKG_SPEC}
fi
fi
fi
@@ -607,10 +606,9 @@
CD_FUNC_BX=[1mB=\${B}[m
CD_FUNC_BD=B=\${B}.
else
-# forced; detected and mismatch; print forced black ! detected
normal (aka forced exclamation mark detected)
+# forced; detected and mismatch; keep detected; print forced
black ! detected normal (aka forced exclamation mark detected)
CD_FUNC_BX=[1mB=\${OPENPKG_CTAG}[m![31m\${B}[m
CD_FUNC_BD=B=\${OPENPKG_CTAG}.\${B}!
-B=\${OPENPKG_CTAG}
fi
fi
fi
@@ -639,10 +637,9 @@
CD_FUNC_EX=[1mE=\${E}[m
CD_FUNC_ED=E=\${E}.
else
-# forced; detected and mismatch; print forced black ! detected
normal (aka forced exclamation mark detected)
+# forced; detected and mismatch; keep detected; print forced
black ! detected normal (aka forced exclamation mark detected)
CD_FUNC_EX=[1mE=\${OPENPKG_EXEC}[m![31m\${E}[m
CD_FUNC_ED=E=\${OPENPKG_EXEC}.\${E}!
-E=\${OPENPKG_EXEC}
fi
fi
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 31-Mar-2003 23:20:19
Branch: HEAD Handle: 2003033122201800
Modified files:
openpkg-re openpkg-dev
Log:
implement PBE logic into setup() and dependencies
Summary:
RevisionChanges Path
1.80+106 -80openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.79 -r1.80 openpkg-dev
--- openpkg-re/openpkg-dev31 Mar 2003 18:39:38 - 1.79
+++ openpkg-re/openpkg-dev31 Mar 2003 21:20:18 - 1.80
@@ -141,25 +141,40 @@
}
setup () {
+# honor optional parameters [[[spec]ctag]exec]
+[ .$1 != . ] OPENPKG_SPEC=$1;
+[ .$2 != . ] OPENPKG_CTAG=$2;
+[ .$3 != . ] OPENPKG_EXEC=$3;
+
+# OPENPKG_SPEC in setup() is only a flag to indicate minimal checkout
+
+# canonify OPENPKG_CTAG
+canonifybranch ${OPENPKG_CTAG}
+OPENPKG_CTAG=${RV}
+
+# canonify OPENPKG_EXEC
+canonifybranch ${OPENPKG_EXEC:-$OPENPKG_CTAG}
+branch2instance ${RV}
+OPENPKG_EXEC=${RV}
+
+# set P,B,E without having cd() already in place
+P=${OPENPKG_SPEC}
+B=${OPENPKG_CTAG}
+E=${OPENPKG_EXEC}
+
# sanity check
-case ${OPENPKG_WORK} in
+case ${OPENPKG_WORK} in
/?* ) ;;
* ) die working area ${OPENPKG_WORK} seems to be strange ;;
esac
-if [ -d ${OPENPKG_WORK} ]; then
+if [ -d ${OPENPKG_WORK} ]; then
die working area ${OPENPKG_WORK} already exists
fi
-# make sure a OpenPKG instance can be found
-if [ ! -f ${OPENPKG_INST}/bin/rpm ]; then
-echo openpkg-dev:ERROR: no working OpenPKG instance found under
${OPENPKG_INST} 12
-exit 1
-fi
-
# create a working area
echo ++ creating working area ${OPENPKG_WORK}
-if [ ! -d ${OPENPKG_WORK} ]; then
-makedir 755 ${OPENPKG_WORK} || die failed to create ${OPENPKG_WORK}
directory
+if [ ! -d ${OPENPKG_WORK} ]; then
+makedir 755 ${OPENPKG_WORK} || die failed to create ${OPENPKG_WORK}
directory
fi
# sane environment
@@ -167,7 +182,7 @@
# create a .cvsrc
echo ++ creating CVS configuration (${OPENPKG_WORK}/.cvsrc)
-sed -e 's;^ *;;' EOF ${OPENPKG_WORK}/.cvsrc
+sed -e 's;^ *;;' EOF ${OPENPKG_WORK}/.cvsrc
cvs -z4
checkout -P
update -P -d
@@ -176,7 +191,7 @@
EOF
echo ++ creating CVS file ignore list (${OPENPKG_WORK}/.cvsignore)
-sed -e 's;^ *;;' EOF ${OPENPKG_WORK}/.cvsignore
+sed -e 's;^ *;;' EOF ${OPENPKG_WORK}/.cvsignore
.[a-za-Z0-9]*
00README
dst
@@ -185,14 +200,10 @@
# create a .rpmmacros, save existing, overwrite only if different
echo ++ creating RPM configuration (${OPENPKG_WORK}/.rpmmacros)
-sed -e 's;^ *;;' EOF ${OPENPKG_WORK}/.rpmmacros
+sed -e 's;^ *;;' EOF ${OPENPKG_WORK}/.rpmmacros
# source areas
%_sourcedir%(echo \${OPENPKG_WORK})/dst/%{name}
%_specdir %(echo \${OPENPKG_WORK})/src/%{name}
-
-# source areas (special setup; enable on demand)
-#%_sourcedir%(echo \${OPENPKG_WORK})/dst/%{name}
-#%_specdir %(echo \${OPENPKG_WORK})/%(pwd | sed -e
's;^.*/\\(src-[^/][^/]*\).*\$;=\\1;' -e 's;^[^=].*\$;src;' -e 's;^=;;')/%{name}
# temporary areas
%_builddir %(echo \${OPENPKG_TEMP})
@@ -202,17 +213,8 @@
%_rpmdir %(echo \${OPENPKG_WORK})/pkg/bin
%_srcrpmdir%(echo \${OPENPKG_WORK})/pkg/src
EOF
-echo ++ creating directory structure (${OPENPKG_REPO}/{dst,pkg})
-if [ ! -d ${OPENPKG_WORK}/dst ]; then
-makedir 755 ${OPENPKG_WORK}/dst || die failed to create
${OPENPKG_WORK}/dst directory
-fi
-if [ ! -d ${OPENPKG_WORK}/pkg/src ]; then
-makedir 755 ${OPENPKG_WORK}/pkg/src || die failed to create
${OPENPKG_WORK}/pkg/src directory
-fi
-if [ ! -d ${OPENPKG_WORK}/pkg/bin ]; then
-makedir 755 ${OPENPKG_WORK}/pkg/bin || die failed to create
${OPENPKG_WORK}/pkg/bin directory
-fi
+echo ++ creating directory structure (${OPENPKG_REPO}/{dst,pkg})
# special overridden setup for dev.de.cw.net domain
case `hostname` in
*.dev.de.cw.net )
@@ -227,51 +229,73 @@
echo %_rpmdir
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 31-Mar-2003 09:25:11
Branch: HEAD Handle: 2003033108251100
Modified files:
openpkg-re openpkg-dev
Log:
correct comments
Summary:
RevisionChanges Path
1.77+2 -2 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.76 -r1.77 openpkg-dev
--- openpkg-re/openpkg-dev29 Mar 2003 11:13:45 - 1.76
+++ openpkg-re/openpkg-dev31 Mar 2003 07:25:11 - 1.77
@@ -61,7 +61,7 @@
OPENPKG_EXEC=${OPENPKG_EXEC}; E=${E} # E (exec, instance)
export OPENPKG_SPEC P OPENPKG_CTAG B OPENPKG_EXEC E
-# override configuration from ${HOME}/.openpkg-dev*.rc
+# override configuration from ${HOME}/.openpkg-dev.rc
progname=`basename $0`
if [ -f ${HOME}/.$progname.rc ]; then
. ${HOME}/.$progname.rc
@@ -151,7 +151,7 @@
# sane environment
umask 022
-# create a .cvsrc, save existing, overwrite only if different
+# create a .cvsrc
echo ++ creating CVS configuration (${OPENPKG_WORK}/.cvsrc)
sed -e 's;^ *;;' EOF ${OPENPKG_WORK}/.cvsrc
cvs -z4
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 29-Mar-2003 12:07:42
Branch: HEAD Handle: 2003032911074100
Modified files:
openpkg-re openpkg-dev
Log:
enhance non-developer contribution .diff with more information
Summary:
RevisionChanges Path
1.75+25 -28 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.74 -r1.75 openpkg-dev
--- openpkg-re/openpkg-dev28 Mar 2003 13:02:55 - 1.74
+++ openpkg-re/openpkg-dev29 Mar 2003 11:07:41 - 1.75
@@ -945,41 +945,38 @@
fi
fi
else
-echo ++ generating patch file (${OPENPKG_WORK}/${basename}.diff)
msg=$2
-if [ .${msg} != . ]; then
-if [ -f ${msg} ]; then
-if [ ${dry} -eq 0 ]; then
-cat ${msg} ${OPENPKG_WORK}/${basename}.diff
-echo ${OPENPKG_WORK}/${basename}.diff
-else
-cat ${msg}
-fi
-else
-if [ ${dry} -eq 0 ]; then
-echo ${msg} ${OPENPKG_WORK}/${basename}.diff
-echo ${OPENPKG_WORK}/${basename}.diff
-else
-echo ${msg}
-fi
-fi
-else
-if [ ${dry} -eq 0 ]; then
-rm -f ${OPENPKG_WORK}/${basename}.diff /dev/null 21 || true
-else
-echo rm -f ${OPENPKG_WORK}/${basename}.diff
-fi
-fi
-if [ ${dry} -eq 0 ]; then
-( cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} diff -N -u3 src/${name} )
${OPENPKG_WORK}/${basename}.diff
-else
-( cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} diff -N -u3 src/${name} )
+
+echo ++ determining contributor identification
+thisdate=`${OPENPKG_INST}/lib/openpkg/shtool echo -e '%D-%m-%Y'`
+username=`${OPENPKG_INST}/lib/openpkg/shtool echo -e '%u'`
+hostname=`${OPENPKG_INST}/lib/openpkg/shtool echo -e '%h%d'`
+realname=`(getent passwd; cat /etc/passwd; ypcat passwd; nidump passwd .)
2/dev/null |\
+ grep ^${username}: | awk -F: '{ print $5; }'`
+if [ .$realname = . ]; then
+realname=NN
fi
+
+echo ++ generating patch file (${OPENPKG_WORK}/${basename}.diff)
+( echo From: $realname [EMAIL PROTECTED]
+ echo Date: $thisdate
+ if [ .${msg} = . ]; then
+ msg=unknown contribution
+ fi
+ if [ -f ${msg} ]; then
+ msg=`cat ${msg}`
+ fi
+ echo Subject: ${msg}
+ echo
+ ( cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} diff -N -u3 src/${name} )
+) ${OPENPKG_WORK}/${basename}.diff
+
echo ++ uploading patch file to OpenPKG contribution area
if [ ${dry} -eq 0 ]; then
${OPENPKG_INST}/lib/openpkg/curl --upload-file
${OPENPKG_WORK}/${basename}.diff ${OPENPKG_DIST}/${basename}.diff
else
echo ${OPENPKG_INST}/lib/openpkg/curl --upload-file
${OPENPKG_WORK}/${basename}.diff ${OPENPKG_DIST}/${basename}.diff
+cat ${OPENPKG_WORK}/${basename}.diff
fi
fi
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 28-Mar-2003 14:02:56
Branch: HEAD Handle: 2003032813025500
Modified files:
openpkg-re openpkg-dev
Log:
add an ad-hoc check to make sure PMODs use really the current date
Summary:
RevisionChanges Path
1.74+6 -0 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.73 -r1.74 openpkg-dev
--- openpkg-re/openpkg-dev27 Mar 2003 09:53:35 - 1.73
+++ openpkg-re/openpkg-dev28 Mar 2003 13:02:55 - 1.74
@@ -845,6 +845,12 @@
rpm_name=`${OPENPKG_INST}/bin/rpm -q --qf %{NAME} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
rpm_summary=`${OPENPKG_INST}/bin/rpm -q --qf %{SUMMARY} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
+echo ++ consistency checking release number
+rpm_release_req=`date '+%Y%m%d'`
+if [ .$rpm_release_new != .$rpm_release_req ]; then
+die package has release number \$rpm_release_new\ (expected
\$rpm_release_req\)
+fi
+
echo ++ releasing ${basename}.${ext} to OpenPKG distribution area
if [ ${dry} -eq 0 ]; then
chmod 664 ${OPENPKG_WORK}/pkg/src/${basename}.${ext}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 27-Mar-2003 09:41:20
Branch: HEAD Handle: 2003032708411900
Modified files:
openpkg-re openpkg-dev
Log:
try to fix detection of old version on release
Summary:
RevisionChanges Path
1.71+1 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.70 -r1.71 openpkg-dev
--- openpkg-re/openpkg-dev25 Mar 2003 15:14:31 - 1.70
+++ openpkg-re/openpkg-dev27 Mar 2003 08:41:19 - 1.71
@@ -805,7 +805,7 @@
echo ++ determine information about old version
tmpfile=${OPENPKG_TEMP}/${name}${GUID}
cvs_rev=`cd ${OPENPKG_WORK}; cvs stat src/${name}/${name}.spec 2/dev/null
| awk '/Repository revision:/ { print $3; }'`
-cvs co -p -r${cvs_rev} openpkg-src/${name}/${name}.spec ${tmpfile}
2/dev/null
+cvs -d ${OPENPKG_REPO} co -p -r${cvs_rev} openpkg-src/${name}/${name}.spec
${tmpfile} 2/dev/null
rpm_version_old=`${OPENPKG_INST}/bin/rpm -q --qf %{VERSION} --specfile
${tmpfile} 2/dev/null`
rpm_release_old=`${OPENPKG_INST}/bin/rpm -q --qf %{RELEASE} --specfile
${tmpfile} 2/dev/null`
rm -f ${tmpfile}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 27-Mar-2003 09:57:18
Branch: HEAD Handle: 2003032708571700
Modified files:
openpkg-re openpkg-dev
Log:
one more missing repository specification
Summary:
RevisionChanges Path
1.72+1 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.71 -r1.72 openpkg-dev
--- openpkg-re/openpkg-dev27 Mar 2003 08:41:19 - 1.71
+++ openpkg-re/openpkg-dev27 Mar 2003 08:57:17 - 1.72
@@ -804,7 +804,7 @@
echo ++ determine information about old version
tmpfile=${OPENPKG_TEMP}/${name}${GUID}
-cvs_rev=`cd ${OPENPKG_WORK}; cvs stat src/${name}/${name}.spec 2/dev/null
| awk '/Repository revision:/ { print $3; }'`
+cvs_rev=`cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} stat
src/${name}/${name}.spec 2/dev/null | awk '/Repository revision:/ { print $3; }'`
cvs -d ${OPENPKG_REPO} co -p -r${cvs_rev} openpkg-src/${name}/${name}.spec
${tmpfile} 2/dev/null
rpm_version_old=`${OPENPKG_INST}/bin/rpm -q --qf %{VERSION} --specfile
${tmpfile} 2/dev/null`
rpm_release_old=`${OPENPKG_INST}/bin/rpm -q --qf %{RELEASE} --specfile
${tmpfile} 2/dev/null`
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 27-Mar-2003 10:53:36
Branch: HEAD Handle: 2003032709533500
Modified files:
openpkg-re openpkg-dev
Log:
add help and peek commands
Summary:
RevisionChanges Path
1.73+39 -4 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.72 -r1.73 openpkg-dev
--- openpkg-re/openpkg-dev27 Mar 2003 08:57:17 - 1.72
+++ openpkg-re/openpkg-dev27 Mar 2003 09:53:35 - 1.73
@@ -39,12 +39,12 @@
# program version
prog_name=openpkg-dev
-prog_vers=0.9.2
-prog_date=12-Mar-2003
+prog_vers=0.9.3
+prog_date=27-Mar-2003
# default configuration
OPENPKG_INST=/cw
-OPENPKG_WILD=*
+OPENPKG_WILD=*
OPENPKG_WORK=${HOME}/work/openpkg
OPENPKG_TEMP=/tmp/${LOGNAME}/openpkg
OPENPKG_MODE=contributor# contributor
@@ -245,6 +245,7 @@
\$ openpkg-dev branch switch to a different branch
\$ openpkg-dev execute ... execute command on instance closest to branch
\$ openpkg-dev list .. list source and binary packages
+\$ openpkg-dev peek .. peek at file list of binary package
\$ openpkg-dev search search a package on master server
\$ openpkg-dev new ... create new packag from scratch
@@ -254,6 +255,7 @@
\$ openpkg-dev install ... install a package
\$ openpkg-dev kill .. kill the environment
+\$ openpkg-dev help .. display this command summary
EOF
}
@@ -763,6 +765,33 @@
fi
}
+peek () {
+for name in $*; do
+if [ ! -f ${OPENPKG_WORK}/src/${name}/${name}.spec ]; then
+warn ${OPENPKG_WORK}/src/${name}/${name}.spec not found
+continue
+fi
+template=`HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm --eval
'%{_rpmfilename}'`
+rpmfile=`HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm -q --qf ${template}
\
+ --specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
+rpmdir=`HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm --eval '%{_rpmdir}'`
+if [ ! -f $rpmdir/$rpmfile ]; then
+die binary RPM not found: $rpmdir/$rpmfile
+fi
+echo ++ peeking at file list of binary RPM: $rpmfile
+filter=sed -e 's;^;\\ \\ \\ ;'
+tmpfile=${OPENPKG_TEMP}/${name}${GUID}
+OIFS=$IFS; IFS=
+
+for configfile in `HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm -qplc
$rpmdir/$rpmfile`; do
+IFS=$OIFS
+filter=$filter -e \s;^ (.* ${configfile})\$;C1;\
+done
+IFS=$OIFS
+HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm -qplv $rpmdir/$rpmfile | eval
$filter
+done
+}
+
diff () {
# the name comes from the cvs diff command. It is actually a
# dry run of release() without altering anything.
@@ -1146,6 +1175,10 @@
done
}
+help () {
+cat ${OPENPKG_WORK}/00README
+}
+
#
if [ $# -eq 0 ]; then
@@ -1170,10 +1203,11 @@
setup | set*) cmd=setup ;;
bash| ba* ) cmd=bash;;
update | u* ) cmd=update ;;
-package | p* ) cmd=package ;;
+package | pa* ) cmd=package ;;
branch | br* ) cmd=branch ;;
execute | e* ) cmd=execute ;;
list| lis*) cmd=list;;
+peek| pe* ) cmd=peek;;
search | sea*) cmd=search ;;
new | n* ) cmd=new ;;
diff| d* ) cmd=diff;;
@@ -1181,6 +1215,7 @@
release | r* ) cmd=release ;;
install | i* ) cmd=install ;;
kill| k* ) cmd=kill;;
+help| h* ) cmd=help;;
*) die unknown command \${cmd}\ ;;
esac
${cmd} $@
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 25-Mar-2003 12:16:03
Branch: HEAD Handle: 2003032511160200
Modified files:
openpkg-re openpkg-dev
Log:
cleanup and fix setup command
Summary:
RevisionChanges Path
1.68+5 -3 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.67 -r1.68 openpkg-dev
--- openpkg-re/openpkg-dev24 Mar 2003 15:17:39 - 1.67
+++ openpkg-re/openpkg-dev25 Mar 2003 11:16:02 - 1.68
@@ -226,9 +226,11 @@
HOME=${OPENPKG_WORK}
export HOME
cvs -q -d ${OPENPKG_REPO} checkout openpkg-dev-web openpkg-dev-doc
openpkg-dev-re openpkg-dev-adm
- cvs -q -d ${OPENPKG_REPO} checkout -r ${OPENPKG_CTAG:-HEAD} openpkg-dev-src
- # mv openpkg-dev/* .
- # rmdir openpkg-dev
+ if [ .${OPENPKG_CTAG:-HEAD} = .HEAD ]; then
+ cvs -q -d ${OPENPKG_REPO} checkout openpkg-dev-src
+ else
+ cvs -q -d ${OPENPKG_REPO} checkout -r ${OPENPKG_CTAG} openpkg-dev-src
+ fi
)
echo ++ creating README file (${OPENPKG_REPO}/00README)
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 25-Mar-2003 14:13:20
Branch: HEAD Handle: 2003032513132000
Modified files:
openpkg-re openpkg-dev
Log:
ok, provide a 'openpkg-dev lint file-or-dir [...]' command
Summary:
RevisionChanges Path
1.69+19 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.68 -r1.69 openpkg-dev
--- openpkg-re/openpkg-dev25 Mar 2003 11:16:02 - 1.68
+++ openpkg-re/openpkg-dev25 Mar 2003 13:13:20 - 1.69
@@ -1123,6 +1123,23 @@
done
}
+lint () {
+for p in $*; do
+if [ -d $p ]; then
+files=`find $p -name '*.spec' -print`
+else
+files=$p
+fi
+for file in $files; do
+echo ++ Linting package specification: $file
+${OPENPKG_WORK}/re/speclint.pl $file
+if [ $? -gt 0 ]; then
+die unacceptable specification
+fi
+done
+done
+}
+
#
if [ $# -eq 0 ]; then
@@ -1150,7 +1167,8 @@
package | p* ) cmd=package ;;
branch | br* ) cmd=branch ;;
execute | e* ) cmd=execute ;;
-list| l* ) cmd=list;;
+list| lis*) cmd=list;;
+lint| lin*) cmd=lint;;
search | sea*) cmd=search ;;
diff| d* ) cmd=diff;;
release | r* ) cmd=release ;;
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 25-Mar-2003 16:14:31
Branch: HEAD Handle: 2003032515143100
Modified files:
openpkg-re openpkg-dev
Log:
flush pending changes
Summary:
RevisionChanges Path
1.70+17 -11 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.69 -r1.70 openpkg-dev
--- openpkg-re/openpkg-dev25 Mar 2003 13:13:20 - 1.69
+++ openpkg-re/openpkg-dev25 Mar 2003 15:14:31 - 1.70
@@ -239,16 +239,21 @@
\$ openpkg-dev setup . already been done ;)
\$ openpkg-dev bash .. enter development environment
-\$ openpkg-dev package ... switch to a different package
\$ openpkg-dev update update development environment from master server
+
+\$ openpkg-dev package ... switch to a different package
\$ openpkg-dev branch switch to a different branch
\$ openpkg-dev execute ... execute command on instance closest to branch
-\$ openpkg-dev install ... install a package
\$ openpkg-dev list .. list source and binary packages
+\$ openpkg-dev search search a package on master server
+
+\$ openpkg-dev new ... create new packag from scratch
\$ openpkg-dev diff .. dry run release
+\$ openpkg-dev lint .. lint package specification
\$ openpkg-dev release ... release package changes to master server
-\$ openpkg-dev kill .. kill the environment
+\$ openpkg-dev install ... install a package
+\$ openpkg-dev kill .. kill the environment
EOF
}
@@ -792,7 +797,7 @@
fi
echo ++ linting package specification (${name}.spec)
-${OPENPKG_WORK}/re/speclint.pl ${OPENPKG_WORK}/src/${name}/${name}.spec
+perl ${OPENPKG_WORK}/re/speclint.pl
${OPENPKG_WORK}/src/${name}/${name}.spec
if [ $? -gt 0 ]; then
die unacceptable specification:
${OPENPKG_WORK}/src/${name}/${name}.spec
fi
@@ -967,11 +972,12 @@
( cd ${OPENPKG_WORK}/src cvs -d ${OPENPKG_REPO} add ${name} )
echo ++ creating openpkg-src/${name}/${name}.spec skeleton
+year=`date '+%Y'`
( echo ##
echo ## ${name}.spec -- OpenPKG RPM Specification
- echo ## Copyright (c) 2000-2003 Cable Wireless Deutschland GmbH
- echo ## Copyright (c) 2000-2003 The OpenPKG Project
http://www.openpkg.org/
- echo ## Copyright (c) 2000-2003 Ralf S. Engelschall [EMAIL PROTECTED]
+ echo ## Copyright (c) 2000-${year} Cable Wireless Deutschland GmbH
+ echo ## Copyright (c) 2000-${year} The OpenPKG Project
http://www.openpkg.org/
+ echo ## Copyright (c) 2000-${year} Ralf S. Engelschall [EMAIL PROTECTED]
echo ##
echo ## Permission to use, copy, modify, and distribute this software for
echo ## any purpose with or without fee is hereby granted, provided that
@@ -1132,7 +1138,7 @@
fi
for file in $files; do
echo ++ Linting package specification: $file
-${OPENPKG_WORK}/re/speclint.pl $file
+perl ${OPENPKG_WORK}/re/speclint.pl $file
if [ $? -gt 0 ]; then
die unacceptable specification
fi
@@ -1168,13 +1174,13 @@
branch | br* ) cmd=branch ;;
execute | e* ) cmd=execute ;;
list| lis*) cmd=list;;
-lint| lin*) cmd=lint;;
search | sea*) cmd=search ;;
+new | n* ) cmd=new ;;
diff| d* ) cmd=diff;;
+lint| lin*) cmd=lint;;
release | r* ) cmd=release ;;
-kill| k* ) cmd=kill;;
-new | n* ) cmd=new ;;
install | i* ) cmd=install ;;
+kill| k* ) cmd=kill;;
*) die unknown command \${cmd}\ ;;
esac
${cmd} $@
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 24-Mar-2003 16:17:39
Branch: HEAD Handle: 2003032415173900
Modified files:
openpkg-re openpkg-dev
Log:
ok, let's rock and no longer allow a package to be released before
speclint agreed
Summary:
RevisionChanges Path
1.67+7 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.66 -r1.67 openpkg-dev
--- openpkg-re/openpkg-dev22 Mar 2003 20:52:20 - 1.66
+++ openpkg-re/openpkg-dev24 Mar 2003 15:17:39 - 1.67
@@ -789,6 +789,12 @@
die ${OPENPKG_WORK}/src/${name}/${name}.spec not found
fi
+echo ++ linting package specification (${name}.spec)
+${OPENPKG_WORK}/re/speclint.pl ${OPENPKG_WORK}/src/${name}/${name}.spec
+if [ $? -gt 0 ]; then
+die unacceptable specification:
${OPENPKG_WORK}/src/${name}/${name}.spec
+fi
+
echo ++ determine information about old version
tmpfile=${OPENPKG_TEMP}/${name}${GUID}
cvs_rev=`cd ${OPENPKG_WORK}; cvs stat src/${name}/${name}.spec 2/dev/null
| awk '/Repository revision:/ { print $3; }'`
@@ -828,7 +834,7 @@
else
(cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} -n up web/news.txt)
/dev/null 21
fi
-if [ .${rpm_version_old} = . -a .${rpm_version_new} != . ]; then
+if [ .${rpm_version_old} = . -a .${rpm_version_new} != . ]; then
package_type=New
else
package_type=Upgraded
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 22-Mar-2003 21:52:20
Branch: HEAD Handle: 2003032220522000
Modified files:
openpkg-re openpkg-dev
Log:
add our old ftp searching stuff as 'openpkg-dev search name' here,
too
Summary:
RevisionChanges Path
1.66+31 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.65 -r1.66 openpkg-dev
--- openpkg-re/openpkg-dev20 Mar 2003 19:53:01 - 1.65
+++ openpkg-re/openpkg-dev22 Mar 2003 20:52:20 - 1.66
@@ -1086,6 +1086,35 @@
done
}
+search_for () {
+URL=`echo $2 | sed -e 's| *$||'`
+PKG=`${OPENPKG_INST}/lib/openpkg/curl -l -s $URL |\
+ sed -e 's|[^-a-zA-Z0-9_\.]||g' |\
+ grep ^$1 | sort`
+if [ .$PKG != . ]; then
+for pkg in $PKG; do
+NAME=`echo $pkg | sed -e 's;\.src\.rpm$;;' -e 's;\.src\.sh$;;'`
+NAME=`echo $NAME | cut -c-35`
+DLOC=`echo $pkg | sed -e s;^;$URL;`
+echo $NAME $DLOC
+done
+fi
+}
+
+search () {
+for i in $@; do
+search_for $i ftp://ftp.openpkg.org/current/SRC/
+search_for $i ftp://ftp.openpkg.org/release/1.2/UPD/
+search_for $i ftp://ftp.openpkg.org/release/1.2/SRC/
+search_for $i ftp://ftp.openpkg.org/release/1.2/SRC/PLUS/
+search_for $i ftp://ftp.openpkg.org/release/1.1/UPD/
+search_for $i ftp://ftp.openpkg.org/release/1.1/SRC/
+search_for $i ftp://ftp.openpkg.org/release/1.1/SRC/PLUS/
+search_for $i ftp://ftp.openpkg.org/release/1.0/UPD/
+search_for $i ftp://ftp.openpkg.org/release/1.0/SRC/
+done
+}
+
#
if [ $# -eq 0 ]; then
@@ -1107,13 +1136,14 @@
# handle command
case ${cmd} in
-setup | s* ) cmd=setup ;;
+setup | set*) cmd=setup ;;
bash| ba* ) cmd=bash;;
update | u* ) cmd=update ;;
package | p* ) cmd=package ;;
branch | br* ) cmd=branch ;;
execute | e* ) cmd=execute ;;
list| l* ) cmd=list;;
+search | sea*) cmd=search ;;
diff| d* ) cmd=diff;;
release | r* ) cmd=release ;;
kill| k* ) cmd=kill;;
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-re/ openpkg-dev
On Thu, Mar 20, 2003, Ralf S. Engelschall wrote: On Wed, Mar 19, 2003, Thomas Lotterer wrote: effect a compromise between error and create for nonexisting packages: create on enter, cleanup on leave if empty I would be even more radical: remove all files there which are older than 1 day. It's a temporary area while working with packages. Anything older than 1 day can be safely removed IMHO. This would require some find/rm combination and that's in fact what i started with. However, after some testing i found no portable, safe and fool-proof way to detect if a directory is empty or contains just junk and the path does not point to some dangerous (errornous) directory like '/' so i went back a step and replaced a still unsafe screen-sized code snipped with a single rmdir line. Deleting files is probably too much magic anyway, so i assume the best we can do is to provide some cleanup function with a -dry option, of course. -- [EMAIL PROTECTED] Development Team, Operations Northern Europe, Cable Wireless __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 20-Mar-2003 20:53:01
Branch: HEAD Handle: 2003032019530100
Modified files:
openpkg-re openpkg-dev
Log:
avoid a sticky HEAD tag
Summary:
RevisionChanges Path
1.65+5 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.64 -r1.65 openpkg-dev
--- openpkg-re/openpkg-dev19 Mar 2003 21:56:24 - 1.64
+++ openpkg-re/openpkg-dev20 Mar 2003 19:53:01 - 1.65
@@ -340,7 +340,11 @@
echo ++ updating to branch ${branch}
( HOME=${OPENPKG_WORK}
export HOME
- cvs update -r ${branch}
+ if [ .${branch} = .HEAD ]; then
+ cvs update -A
+ else
+ cvs update -r ${branch}
+ fi
)
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 19-Mar-2003 22:39:49
Branch: HEAD Handle: 2003031921394900
Modified files:
openpkg-re openpkg-dev
Log:
effect a compromise between error and create for nonexisting packages:
create on enter, cleanup on leave if empty
Summary:
RevisionChanges Path
1.63+4 -0 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.62 -r1.63 openpkg-dev
--- openpkg-re/openpkg-dev12 Mar 2003 15:12:24 - 1.62
+++ openpkg-re/openpkg-dev19 Mar 2003 21:39:49 - 1.63
@@ -729,6 +729,10 @@
echo ++ entering OpenPKG shell environment
${bash} --rcfile .bashrc
echo ++ leaving OpenPKG shell environment
+
+# remove workdir if it is completely empty
+package -query workdir ${OPENPKG_SPEC} /dev/null
+rmdir $workdir 2/dev/null
}
list () {
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev pmod-psod.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 19-Mar-2003 22:56:24
Branch: HEAD Handle: 2003031921562400
Modified files:
openpkg-re openpkg-dev pmod-psod.txt
Log:
list using new $P$B$E semantics
Summary:
RevisionChanges Path
1.64+14 -2 openpkg-re/openpkg-dev
1.35+5 -2 openpkg-re/pmod-psod.txt
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.63 -r1.64 openpkg-dev
--- openpkg-re/openpkg-dev19 Mar 2003 21:39:49 - 1.63
+++ openpkg-re/openpkg-dev19 Mar 2003 21:56:24 - 1.64
@@ -736,8 +736,20 @@
}
list () {
-ls -l ${OPENPKG_WORK}/pkg/src/$1*
-ls -l ${OPENPKG_WORK}/pkg/bin/$1*
+if [ .$1 = . ]; then
+if [ .$P = . ]; then
+die package cannot be identified. \$P might not be set properly.
+fi
+if [ .$E = . -o ! -x $E/bin/rpm ]; then
+die $E/bin/rpm not executable. \$E might not be set properly.
+fi
+locationid=`$E/bin/rpm --eval %{_rpmfilename} | sed -e 's;^.*}-;;' -e
's;\.rpm$;;'`
+ls -l ${OPENPKG_WORK}/pkg/src/$P* | egrep /$P-[^-]+-[^-]+\.(no)?src.rpm$
+ls -l ${OPENPKG_WORK}/pkg/bin/$P* | egrep
/$P-[^-]+-[^-]+\.[^-]+-[^-]+-${locationid}.rpm$
+else
+ls -l ${OPENPKG_WORK}/pkg/src/$1*
+ls -l ${OPENPKG_WORK}/pkg/bin/$1*
+fi
}
diff () {
@@ .
patch -p0 '@@ .'
Index: openpkg-re/pmod-psod.txt
$ cvs diff -u -r1.34 -r1.35 pmod-psod.txt
--- openpkg-re/pmod-psod.txt 12 Mar 2003 15:12:24 - 1.34
+++ openpkg-re/pmod-psod.txt 19 Mar 2003 21:56:24 - 1.35
@@ -150,9 +150,12 @@
#OPTION2 removes all files from dst cache (required if vendor uses same
filename for different releases)
- list source and binary packages by executing the list function. The
- argument is optional and a asterix is added to it automatically.
+ wildcard argument is optional and a asterix is added to it automatically.
+ If the wildcard is omitted, $P will be taken and a more restrictive match
+ to OpenPKG/RPM filename conventions will be used.
-openpkg-dev$ openpkg-dev list $P
+openpkg-dev$ openpkg-dev list
+openpkg-dev$ openpkg-dev list wildcard
- diff before a release by executing the diff function. This is a
dry run of the release function without altering anything.
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-re/ openpkg-dev
On Wed, Mar 19, 2003, Thomas Lotterer wrote: effect a compromise between error and create for nonexisting packages: create on enter, cleanup on leave if empty I would be even more radical: remove all files there which are older than 1 day. It's a temporary area while working with packages. Anything older than 1 day can be safely removed IMHO. Ralf S. Engelschall [EMAIL PROTECTED] www.engelschall.com __ The OpenPKG Projectwww.openpkg.org Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev pmod-psod.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 12-Mar-2003 16:12:25
Branch: HEAD Handle: 2003031215122400
Modified files:
openpkg-re openpkg-dev pmod-psod.txt
Log:
getting air after a deep dive
Summary:
RevisionChanges Path
1.62+336 -94openpkg-re/openpkg-dev
1.34+30 -6 openpkg-re/pmod-psod.txt
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.61 -r1.62 openpkg-dev
--- openpkg-re/openpkg-dev11 Mar 2003 09:12:35 - 1.61
+++ openpkg-re/openpkg-dev12 Mar 2003 15:12:24 - 1.62
@@ -34,11 +34,13 @@
# - create a reinstall option which includes -bs, -bb, -Uvh on demand
# - allow skipping of repository modules, i.e. no -doc
# - copy proprietary packages to private area based on license description
+# - should we eval the environment and, if yes, at which time
+# - environment/script interaction may need performance improvements
# program version
prog_name=openpkg-dev
-prog_vers=0.9.1
-prog_date=30-Dec-2002
+prog_vers=0.9.2
+prog_date=12-Mar-2003
# default configuration
OPENPKG_INST=/cw
@@ -51,9 +53,13 @@
#OPENPKG_MODE=developer # developer
[EMAIL PROTECTED]:/e/openpkg/cvs# developer
#OPENPKG_DIST=master.openpkg.org:/e/openpkg/ftp/current/SRC/# developer
-OPENPKG_REV=
-OPENPKG_EXEC=
-export OPENPKG_INST OPENPKG_WILD OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE
OPENPKG_REPO OPENPKG_DIST OPENPKG_REV OPENPKG_EXEC
+export OPENPKG_INST OPENPKG_WILD OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE
OPENPKG_REPO OPENPKG_DIST
+
+# enforced and user controlled (through package/branch/execute) variables
+OPENPKG_SPEC=${OPENPKG_SPEC}; P=${P} # P (package, spec file without .spec
suffix)
+OPENPKG_CTAG=${OPENPKG_CTAG}; B=${B} # B (cvs tag, branch)
+OPENPKG_EXEC=${OPENPKG_EXEC}; E=${E} # E (exec, instance)
+export OPENPKG_SPEC P OPENPKG_CTAG B OPENPKG_EXEC E
# override configuration from ${HOME}/.openpkg-dev*.rc
progname=`basename $0`
@@ -84,6 +90,9 @@
--mode=* ) OPENPKG_MODE=${arg} ;;
--repo=* ) OPENPKG_REPO=${arg} ;;
--dist=* ) OPENPKG_DIST=${arg} ;;
+--spec=* ) OPENPKG_SPEC=${arg} ;;
+--ctag=* ) OPENPKG_CTAG=${arg} ;;
+--exec=* ) OPENPKG_EXEC=${arg} ;;
-* ) help=Invalid option \`${opt}'; break ;;
*) break ;;
esac
@@ -217,7 +226,7 @@
HOME=${OPENPKG_WORK}
export HOME
cvs -q -d ${OPENPKG_REPO} checkout openpkg-dev-web openpkg-dev-doc
openpkg-dev-re openpkg-dev-adm
- cvs -q -d ${OPENPKG_REPO} checkout ${OPENPKG_REV} openpkg-dev-src
+ cvs -q -d ${OPENPKG_REPO} checkout -r ${OPENPKG_CTAG:-HEAD} openpkg-dev-src
# mv openpkg-dev/* .
# rmdir openpkg-dev
)
@@ -228,6 +237,7 @@
\$ openpkg-dev setup . already been done ;)
\$ openpkg-dev bash .. enter development environment
+\$ openpkg-dev package ... switch to a different package
\$ openpkg-dev update update development environment from master server
\$ openpkg-dev branch switch to a different branch
\$ openpkg-dev execute ... execute command on instance closest to branch
@@ -250,51 +260,145 @@
)
}
+package () {
+# no parameter means guessing
+if [ .$1 = . ]; then
+P=`echo ${PWD} | sed -e s;^${OPENPKG_WORK}/src/;; -e 's;/.*$;;'`
+echo ${P}
+return
+fi
+
+# setup query, if any query=
+if [ .$1 = .-query ]; then
+shift
+query=echo \$${1}
+shift
+fi
+
+# setup variables for use or query
+package=$1
+sourcedir=${OPENPKG_WORK}/src
+workdir=${sourcedir}/${package}
+
+# execute query, if any
+if [ .${query} != . ]; then
+eval ${query}
+return
+fi
+
+# switch to given package
+if [ ! -d ${sourcedir} ]; then
+die no ${sourcedir} directory found
+fi
+if [ -d ${workdir} ]; then
+echo ++ using existing directory ${workdir}
+else
+echo ++ creating new directory ${workdir}
+mkdir ${workdir}
+fi
+}
+
branch () {
-anybin2branch $1
-echo ++ branching to ${BRANCH}
+# no parameter means guessing
+if [ .$1
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 11-Mar-2003 10:12:36
Branch: HEAD Handle: 2003031109123500
Modified files:
openpkg-re openpkg-dev
Log:
do not leave bash environment on error
Summary:
RevisionChanges Path
1.61+1 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.60 -r1.61 openpkg-dev
--- openpkg-re/openpkg-dev11 Mar 2003 09:10:24 - 1.60
+++ openpkg-re/openpkg-dev11 Mar 2003 09:12:35 - 1.61
@@ -417,7 +417,7 @@
}
openpkg-dev () {
-command \${OPENPKG_WORK}/re/openpkg-dev \${1+\$@} || exit \$?
+command \${OPENPKG_WORK}/re/openpkg-dev \${1+\$@}
if [ .\$1 = .branch ]; then
cd \$PWD
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 10-Mar-2003 12:14:26
Branch: HEAD Handle: 2003031011142500
Modified files:
openpkg-re openpkg-dev
Log:
solve prompt issue
Summary:
RevisionChanges Path
1.58+7 -4 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.57 -r1.58 openpkg-dev
--- openpkg-re/openpkg-dev6 Mar 2003 21:15:55 - 1.57
+++ openpkg-re/openpkg-dev10 Mar 2003 11:14:25 - 1.58
@@ -253,7 +253,6 @@
export HOME
cvs update -r ${BRANCH}
)
-echo FIXME: please run \cd .\ to update prompt
echo FIXME: still using ${OPENPKG_INST}, automatic instance selection not
implemented, yet
}
@@ -357,6 +356,13 @@
unset CD_FUNC_PACKET CD_FUNC_TAGSRC CD_FUNC_CVSTAG
}
+openpkg-dev () {
+command \${OPENPKG_WORK}/re/openpkg-dev ${1+\$@} || exit $?
+if [ .\$1 = .branch ]; then
+cd \$PWD
+fi
+}
+
# prepare for a indivdual package
P=$1
cd \${INITIAL_CWD}
@@ -383,9 +389,6 @@
rpm () {
HOME=\${OPENPKG_WORK} command \${OPENPKG_INST}/bin/rpm \$@
}
-
-# redirect openpkg-dev command to latest version
-alias openpkg-dev=\${OPENPKG_WORK}/re/openpkg-dev
# sane environment
umask 022
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 06-Mar-2003 22:15:55
Branch: HEAD Handle: 2003030621155500
Modified files:
openpkg-re openpkg-dev
Log:
partial but useful branch command implementation
Summary:
RevisionChanges Path
1.57+61 -0 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.56 -r1.57 openpkg-dev
--- openpkg-re/openpkg-dev3 Mar 2003 10:46:29 - 1.56
+++ openpkg-re/openpkg-dev6 Mar 2003 21:15:55 - 1.57
@@ -226,6 +226,7 @@
\$ openpkg-dev setup . already been done ;)
\$ openpkg-dev bash .. enter development environment
\$ openpkg-dev update update development environment from master server
+\$ openpkg-dev branch switch to a different branch
\$ openpkg-dev install ... install a package
\$ openpkg-dev list .. list source and binary packages
\$ openpkg-dev diff .. dry run release
@@ -245,6 +246,65 @@
)
}
+branch () {
+anybin2branch $1
+echo ++ branching to ${BRANCH}
+( HOME=${OPENPKG_WORK}
+ export HOME
+ cvs update -r ${BRANCH}
+)
+echo FIXME: please run \cd .\ to update prompt
+echo FIXME: still using ${OPENPKG_INST}, automatic instance selection not
implemented, yet
+}
+
+# convert any (branch|instance|name) into branch and set ${BRANCH}
+#
+# Branch Instance Name
+# --- --
+# HEAD/cwCURRENT
+# OPENPKG_1_STABLE/cw1 1-STABLE
+# OPENPKG_1_2_SOLID /cw12 1.2
+# OPENPKG_1_1_SOLID /cw11 1.1
+# OPENPKG_1_0_SOLID /cw10 1.0
+#
+anybin2branch () {
+# remove surrounding whitespaces, take first arg only, toupper
+BRANCH=`echo $1 | cut -f 1 -d | tr '[a-z]' '[A-Z]'`
+
+# strip off any abbreviated form of a leading OPENPKG_
+BRANCH=`echo ${BRANCH} | sed -e
's;^O\{0,1\}P\{0,1\}E\{0,1\}N\{0,1\}P\{0,1\}K\{0,1\}G\{0,1\}_\{0,1\};;'`
+
+# transform instance into branch
+BRANCH=`echo ${BRANCH} | sed -e 's;^/[A-Z]\{1,\}$;HEAD;' -e
's;^/[A-Z]\{1,\}\([1-9]\);\1_;'`
+
+# replace dots from (SOLID name) and dashes (STABLE name) with underscore for
convenience
+BRANCH=`echo ${BRANCH} | sed -e 's;[\.-];_;g'`
+
+# check for HEAD (branch) aka CURRENT (name)
+echo CURRENT | egrep -q ^${BRANCH} BRANCH=HEAD
+echo HEAD| egrep -q ^${BRANCH} BRANCH=HEAD
+
+if [ .${BRANCH} != .HEAD ]; then
+
+# extract branchpoint (1, 1_1 ...) and optional direction
+BRANBP=`echo ${BRANCH} | sed -e
's;^\([1-9][0-9]*\(_\{0,1\}[0-9]*\)\)\(.*\)$;\1;' -e 's;_*$;;'`
+BRANDR=`echo ${BRANCH} | sed -e
's;^\([1-9][0-9]*\(_\{0,1\}[0-9]*\)\)\(.*\)$;\3;' -e 's;^_*;;'`
+
+# select direction, check optional direction
+echo ${BRANBP} | grep -q '_'
+if [ $? = 0 ]; then
+BRANCH=OPENPKG_${BRANBP}_SOLID
+echo SOLID | egrep -q ^${BRANDR} || die automatic (SOLID) vs.
manual (${BRANDR}) direction mismatch
+else
+BRANCH=OPENPKG_${BRANBP}_STABLE
+echo STABLE | egrep -q ^${BRANDR} || die automatic (STABLE) vs.
manual (${BRANDR}) direction mismatch
+fi
+
+unset BRANBP
+unset BRANDR
+fi
+}
+
bash () {
cd ${OPENPKG_WORK} || die cannot cd to ${OPENPKG_WORK}
@@ -724,6 +784,7 @@
case ${cmd} in
setup | s* ) cmd=setup ;;
update | u* ) cmd=update ;;
+branch | br* ) cmd=branch ;;
bash| b* ) cmd=bash;;
list| l* ) cmd=list;;
diff| d* ) cmd=diff;;
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev pmod-psod.txt
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 03-Mar-2003 11:16:48
Branch: HEAD Handle: 2003030310164601
Modified files:
openpkg-re openpkg-dev pmod-psod.txt
Log:
correct INITIAL_CWD behaviour when package is given and depending on
src existence
Summary:
RevisionChanges Path
1.55+5 -1 openpkg-re/openpkg-dev
1.33+1 -1 openpkg-re/pmod-psod.txt
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.54 -r1.55 openpkg-dev
--- openpkg-re/openpkg-dev1 Mar 2003 11:25:09 - 1.54
+++ openpkg-re/openpkg-dev3 Mar 2003 10:16:46 - 1.55
@@ -334,10 +334,14 @@
fi
# determine initial working directory
-INITIAL_CWD=${OPENPKG_WORK}/src
+INITIAL_CWD=${OPENPKG_WORK}
if [ .$1 != . ]; then
if [ -d ${INITIAL_CWD}/src/$1 ]; then
INITIAL_CWD=${INITIAL_CWD}/src/$1
+fi
+else
+if [ -d ${INITIAL_CWD}/src ]; then
+INITIAL_CWD=${INITIAL_CWD}/src
fi
fi
export INITIAL_CWD
@@ .
patch -p0 '@@ .'
Index: openpkg-re/pmod-psod.txt
$ cvs diff -u -r1.32 -r1.33 pmod-psod.txt
--- openpkg-re/pmod-psod.txt 19 Feb 2003 11:25:26 - 1.32
+++ openpkg-re/pmod-psod.txt 3 Mar 2003 10:16:47 - 1.33
@@ -112,7 +112,7 @@
openpkd-dev$ cd src/$P
openpkg-dev$ vi $P.spec
openpkg-dev$ for i in `echo *`; do f=${OPENPKG_WORK}/dst/$P/$i; if [ -f $f ];
then rm $f; fi; done #OPTION1
-openpkg-dev$ rm ${OPENPKG_WORK}/dst/$P/
#OPTION2
+openpkg-dev$ rm ${OPENPKG_WORK}/dst/$P/*
#OPTION2
openpkg-dev$ rpm --fetch $P.spec
openpkg-dev$ rpm -ba $P.spec
openpkg-dev$ rpm -qplv ${OPENPKG_WORK}/pkg/bin/$P-*-`date +%Y%m%d`.*.rpm | more
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 03-Mar-2003 11:46:30
Branch: HEAD Handle: 2003030310462900
Modified files:
openpkg-re openpkg-dev
Log:
add package and CVS status tag reporting to cd()
Summary:
RevisionChanges Path
1.56+16 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.55 -r1.56 openpkg-dev
--- openpkg-re/openpkg-dev3 Mar 2003 10:16:46 - 1.55
+++ openpkg-re/openpkg-dev3 Mar 2003 10:46:29 - 1.56
@@ -276,10 +276,25 @@
# prompt to indicate openpkg-dev bash environment
cd () {
builtin cd \${1-\${OPENPKG_WORK}}
-PS1=[EMAIL PROTECTED]:\${PWD}\\nopenpkg-dev\$
+CD_FUNC_PACKET=\${P:[EMAIL PROTECTED]
+CD_FUNC_TAGSRC=''
+if [ -r CVS/Entries ]; then
+CD_FUNC_TAGSRC=\$CD_FUNC_TAGSRC CVS/Entries
+fi
+if [ -r CVS/Tag ]; then
+CD_FUNC_TAGSRC=\$CD_FUNC_TAGSRC CVS/Tag
+fi
+if [ .\$CD_FUNC_TAGSRC = . ]; then
+CD_FUNC_CVSTAG=no CVS
+else
+CD_FUNC_CVSTAG=\`cat \$CD_FUNC_TAGSRC | sed -e 's;^\(/.*//\)$;\1THEAD;'
-n -e 's;^/.*//T;;p' | sort | uniq | tr '\n' '|' | sed -e 's;|$;;'\`
+CD_FUNC_CVSTAG=\${CD_FUNC_CVSTAG:-HEAD}
+fi
+PS1=[EMAIL PROTECTED]:\${PWD}
[\$CD_FUNC_PACKET\${CD_FUNC_CVSTAG}]\\nopenpkg-dev\$
if [ .\${TERM} = .xterm ]; then
echo -n ]0;[EMAIL PROTECTED]:\${PWD}
fi
+unset CD_FUNC_PACKET CD_FUNC_TAGSRC CD_FUNC_CVSTAG
}
# prepare for a indivdual package
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 01-Mar-2003 12:25:10
Branch: HEAD Handle: 2003030111250900
Modified files:
openpkg-re openpkg-dev
Log:
we already can enter the src/ part, because in 95% of all cases we
want to be there anyway
Summary:
RevisionChanges Path
1.54+1 -1 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.53 -r1.54 openpkg-dev
--- openpkg-re/openpkg-dev23 Feb 2003 08:26:16 - 1.53
+++ openpkg-re/openpkg-dev1 Mar 2003 11:25:09 - 1.54
@@ -334,7 +334,7 @@
fi
# determine initial working directory
-INITIAL_CWD=${OPENPKG_WORK}
+INITIAL_CWD=${OPENPKG_WORK}/src
if [ .$1 != . ]; then
if [ -d ${INITIAL_CWD}/src/$1 ]; then
INITIAL_CWD=${INITIAL_CWD}/src/$1
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 23-Feb-2003 09:24:56 Branch: HEAD Handle: 2003022308245600 Modified files: openpkg-re openpkg-dev Log: mention install command Summary: RevisionChanges Path 1.52+1 -0 openpkg-re/openpkg-dev patch -p0 ' .' Index: openpkg-re/openpkg-dev $ cvs diff -u -r1.51 -r1.52 openpkg-dev --- openpkg-re/openpkg-dev31 Jan 2003 11:34:06 - 1.51 +++ openpkg-re/openpkg-dev23 Feb 2003 08:24:56 - 1.52 -226,6 +226,7 \$ openpkg-dev setup . already been done ;) \$ openpkg-dev bash .. enter development environment \$ openpkg-dev update update development environment from master server +\$ openpkg-dev install ... install a package \$ openpkg-dev list .. list source and binary packages \$ openpkg-dev diff .. dry run release \$ openpkg-dev release ... release package changes to master server . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 23-Feb-2003 09:26:17
Branch: HEAD Handle: 2003022308261600
Modified files:
openpkg-re openpkg-dev
Log:
make sure sources are available before building
Summary:
RevisionChanges Path
1.53+1 -0 openpkg-re/openpkg-dev
patch -p0 ' .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.52 -r1.53 openpkg-dev
--- openpkg-re/openpkg-dev23 Feb 2003 08:24:56 - 1.52
+++ openpkg-re/openpkg-dev23 Feb 2003 08:26:16 - 1.53
-663,6 +663,7
rpmdir=`HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm --eval '%{_rpmdir}'`
if [ ! -f $rpmdir/$rpmfile ]; then
echo ++ building $package ($rpmfile)
+(cd ${OPENPKG_WORK}/src/${name} HOME=${OPENPKG_WORK}
${OPENPKG_INST}/bin/rpm --fetch ${name}.spec)
(cd ${OPENPKG_WORK}/src/${name} HOME=${OPENPKG_WORK}
${OPENPKG_INST}/bin/rpm -bb ${name}.spec)
if [ ! -f $rpmdir/$rpmfile ]; then
warn failed to build $package ($rpmfile)
.
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 31-Jan-2003 12:34:06 Branch: HEAD Handle: 2003013111340600 Modified files: openpkg-re openpkg-dev Log: fix disclaimer text Summary: RevisionChanges Path 1.51+1 -1 openpkg-re/openpkg-dev patch -p0 '@@ .' Index: openpkg-re/openpkg-dev $ cvs diff -u -r1.50 -r1.51 openpkg-dev --- openpkg-re/openpkg-dev26 Jan 2003 10:41:27 - 1.50 +++ openpkg-re/openpkg-dev31 Jan 2003 11:34:06 - 1.51 @@ -566,7 +566,7 @@ echo ## the above copyright notice and this permission notice appear in all echo ## copies. echo ## - echo ## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + echo ## THIS SOFTWARE IS PROVIDED \`\`AS IS'' AND ANY EXPRESSED OR IMPLIED echo ## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF echo ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. echo ## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 26-Jan-2003 11:41:28
Branch: HEAD Handle: 2003012610412700
Modified files:
openpkg-re openpkg-dev
Log:
Add an openpkg-dev install pkg [pkg ...] command which allows
me to easily bump up the /cw instance with dependend packages without
having to do manually lots of cd pkg rpm -bb .. rpm -Uvh
..
Summary:
RevisionChanges Path
1.50+38 -0 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.49 -r1.50 openpkg-dev
--- openpkg-re/openpkg-dev20 Jan 2003 12:36:56 - 1.49
+++ openpkg-re/openpkg-dev26 Jan 2003 10:41:27 - 1.50
@@ -89,6 +89,10 @@
#
+warn () {
+echo ${prog_name}:WARNING: $1 12
+}
+
die () {
# exit gracefully
echo ${prog_name}:ERROR: $1 12
@@ -644,6 +648,39 @@
( cd ${OPENPKG_WORK}/re/vcheck cvs -d ${OPENPKG_REPO} add vc.${name} )
}
+install () {
+for name in $*; do
+if [ ! -f ${OPENPKG_WORK}/src/${name}/${name}.spec ]; then
+warn ${OPENPKG_WORK}/src/${name}/${name}.spec not found
+continue
+fi
+package=`HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm -q --qf
%{NAME}-%{VERSION}-%{RELEASE} \
+ --specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
+template=`HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm --eval
'%{_rpmfilename}'`
+rpmfile=`HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm -q --qf ${template}
\
+ --specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
+rpmdir=`HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm --eval '%{_rpmdir}'`
+if [ ! -f $rpmdir/$rpmfile ]; then
+echo ++ building $package ($rpmfile)
+(cd ${OPENPKG_WORK}/src/${name} HOME=${OPENPKG_WORK}
${OPENPKG_INST}/bin/rpm -bb ${name}.spec)
+if [ ! -f $rpmdir/$rpmfile ]; then
+warn failed to build $package ($rpmfile)
+continue
+fi
+fi
+HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm -q $package /dev/null 21
continue
+echo ++ installing $package ($rpmfile)
+if [ .$HOSTNAME = . ]; then
+HOSTNAME=`hostname`
+fi
+ssh -t -x root@${HOSTNAME} HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm
-Uvh $rpmdir/$rpmfile
+HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm -q $package /dev/null 21
+if [ $? -ne 0 ]; then
+warn failed to install $package
+fi
+done
+}
+
#
if [ $# -eq 0 ]; then
@@ -672,6 +709,7 @@
release | r* ) cmd=release ;;
kill| k* ) cmd=kill;;
new | n* ) cmd=new ;;
+install | i* ) cmd=install ;;
*) die unknown command \${cmd}\ ;;
esac
${cmd} $@
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 20-Jan-2003 13:36:56
Branch: HEAD Handle: 2003012012365600
Modified files:
openpkg-re openpkg-dev
Log:
this is the branch-hack which works fine now, guys...
Summary:
RevisionChanges Path
1.49+4 -0 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.48 -r1.49 openpkg-dev
--- openpkg-re/openpkg-dev15 Jan 2003 10:18:42 - 1.48
+++ openpkg-re/openpkg-dev20 Jan 2003 12:36:56 - 1.49
@@ -159,6 +159,10 @@
# source areas
%_sourcedir%(echo \${OPENPKG_WORK})/dst/%{name}
%_specdir %(echo \${OPENPKG_WORK})/src/%{name}
+
+# source areas (special setup; enable on demand)
+#%_sourcedir%(echo \${OPENPKG_WORK})/dst/%{name}
+#%_specdir %(echo \${OPENPKG_WORK})/%(pwd | sed -e
's;^.*/\\(src-[^/][^/]*\).*\$;=\\1;' -e 's;^[^=].*\$;src;' -e 's;^=;;')/%{name}
# temporary areas
%_builddir %(echo \${OPENPKG_TEMP})
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 15-Jan-2003 11:18:42
Branch: HEAD Handle: 2003011510184200
Modified files:
openpkg-re openpkg-dev
Log:
make sure 'openpkg-dev update' uses it own local .cvsrc
Summary:
RevisionChanges Path
1.48+5 -2 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.47 -r1.48 openpkg-dev
--- openpkg-re/openpkg-dev8 Jan 2003 16:02:38 - 1.47
+++ openpkg-re/openpkg-dev15 Jan 2003 10:18:42 - 1.48
@@ -229,8 +229,11 @@
update () {
echo ++ updating ${OPENPKG_REPO}/{src,web,doc,re,adm}
-cd ${OPENPKG_WORK} || die cannot cd to ${OPENPKG_WORK}
-cvs -d ${OPENPKG_REPO} update
+( cd ${OPENPKG_WORK} || die cannot cd to ${OPENPKG_WORK}
+ HOME=${OPENPKG_WORK}
+ export HOME
+ cvs -d ${OPENPKG_REPO} update
+)
}
bash () {
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 08-Jan-2003 17:02:38
Branch: HEAD Handle: 2003010816023800
Modified files:
openpkg-re openpkg-dev
Log:
support no-source packages
Summary:
RevisionChanges Path
1.47+15 -8 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.46 -r1.47 openpkg-dev
--- openpkg-re/openpkg-dev4 Jan 2003 12:14:27 - 1.46
+++ openpkg-re/openpkg-dev8 Jan 2003 16:02:38 - 1.47
@@ -356,12 +356,19 @@
dry=0
fi
-basename=`echo $1 | sed -e 's;\.src\.rpm$;;'`
+basename=`echo $1 | sed -e 's;\.src\.rpm$;;' -e 's;\.nosrc\.rpm$;;'`
name=`echo ${basename} | sed -e 's;-[^-][^-]*-[^-][^-]*$;;'`
if [ .${OPENPKG_MODE} = .developer ]; then
echo ++ perform environment consistency checks
-if [ ! -f ${OPENPKG_WORK}/pkg/src/${basename}.src.rpm ]; then
-die ${OPENPKG_WORK}/pkg/src/${basename}.src.rpm not found
+ext=
+if [ -f ${OPENPKG_WORK}/pkg/src/${basename}.src.rpm ]; then
+ext=src.rpm
+fi
+if [ -f ${OPENPKG_WORK}/pkg/src/${basename}.nosrc.rpm ]; then
+ext=nosrc.rpm
+fi
+if [ .$ext = . ]; then
+die ${OPENPKG_WORK}/pkg/src/${basename}.[no]src.rpm not found
fi
if [ ! -f ${OPENPKG_WORK}/src/${name}/${name}.spec ]; then
die ${OPENPKG_WORK}/src/${name}/${name}.spec not found
@@ -381,13 +388,13 @@
rpm_name=`${OPENPKG_INST}/bin/rpm -q --qf %{NAME} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
rpm_summary=`${OPENPKG_INST}/bin/rpm -q --qf %{SUMMARY} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
-echo ++ releasing ${basename}.src.rpm to OpenPKG distribution area
+echo ++ releasing ${basename}.${ext} to OpenPKG distribution area
if [ ${dry} -eq 0 ]; then
-chmod 664 ${OPENPKG_WORK}/pkg/src/${basename}.src.rpm
-scp -p ${OPENPKG_WORK}/pkg/src/${basename}.src.rpm ${OPENPKG_DIST}
+chmod 664 ${OPENPKG_WORK}/pkg/src/${basename}.${ext}
+scp -p ${OPENPKG_WORK}/pkg/src/${basename}.${ext} ${OPENPKG_DIST}
else
-echo chmod 664 ${OPENPKG_WORK}/pkg/src/${basename}.src.rpm
-echo scp -p ${OPENPKG_WORK}/pkg/src/${basename}.src.rpm ${OPENPKG_DIST}
+echo chmod 664 ${OPENPKG_WORK}/pkg/src/${basename}.${ext}
+echo scp -p ${OPENPKG_WORK}/pkg/src/${basename}.${ext} ${OPENPKG_DIST}
fi
if [ -f ${OPENPKG_WORK}/pkg/src/${basename}.src.sh ]; then
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re/ openpkg-dev
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: 02-Jan-2003 15:39:17
Branch: HEAD Handle: 2003010214391700
Modified files:
openpkg-re openpkg-dev
Log:
Oooops, always use the rpm from the instance we are working on...
Summary:
RevisionChanges Path
1.45+6 -6 openpkg-re/openpkg-dev
patch -p0 '@@ .'
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.44 -r1.45 openpkg-dev
--- openpkg-re/openpkg-dev30 Dec 2002 20:56:54 - 1.44
+++ openpkg-re/openpkg-dev2 Jan 2003 14:39:17 - 1.45
@@ -371,15 +371,15 @@
tmpfile=${OPENPKG_TEMP}/${name}${GUID}
cvs_rev=`cd ${OPENPKG_WORK}; cvs stat src/${name}/${name}.spec 2/dev/null
| awk '/Repository revision:/ { print $3; }'`
cvs co -p -r${cvs_rev} openpkg-src/${name}/${name}.spec ${tmpfile}
2/dev/null
-rpm_version_old=`rpm -q --qf %{VERSION} --specfile ${tmpfile} 2/dev/null`
-rpm_release_old=`rpm -q --qf %{RELEASE} --specfile ${tmpfile} 2/dev/null`
+rpm_version_old=`${OPENPKG_INST}/bin/rpm -q --qf %{VERSION} --specfile
${tmpfile} 2/dev/null`
+rpm_release_old=`${OPENPKG_INST}/bin/rpm -q --qf %{RELEASE} --specfile
${tmpfile} 2/dev/null`
rm -f ${tmpfile}
echo ++ determine information about new version
-rpm_version_new=`rpm -q --qf %{VERSION} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
-rpm_release_new=`rpm -q --qf %{RELEASE} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
-rpm_name=`rpm -q --qf %{NAME} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
-rpm_summary=`rpm -q --qf %{SUMMARY} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
+rpm_version_new=`${OPENPKG_INST}/bin/rpm -q --qf %{VERSION} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
+rpm_release_new=`${OPENPKG_INST}/bin/rpm -q --qf %{RELEASE} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
+rpm_name=`${OPENPKG_INST}/bin/rpm -q --qf %{NAME} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
+rpm_summary=`${OPENPKG_INST}/bin/rpm -q --qf %{SUMMARY} --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
echo ++ releasing ${basename}.src.rpm to OpenPKG distribution area
if [ ${dry} -eq 0 ]; then
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re openpkg-dev
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: 22-Dec-2002 11:09:48
Branch: HEAD Handle: 2002122210094800
Modified files:
openpkg-re openpkg-dev
Log:
update generated template to reflect recent changes
Summary:
RevisionChanges Path
1.43+8 -2 openpkg-re/openpkg-dev
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.42 -r1.43 openpkg-dev
--- openpkg-re/openpkg-dev30 Nov 2002 12:56:12 - 1.42
+++ openpkg-re/openpkg-dev22 Dec 2002 10:09:48 - 1.43
@@ -580,20 +580,26 @@
echo # build information
echo Prefix: %{l_prefix}
echo BuildRoot:%{l_buildroot}
- echo BuildPreReq: OpenPKG, openpkg = 20020206
- echo PreReq: OpenPKG, openpkg = 20020206
+ echo BuildPreReq: OpenPKG, openpkg = 20021218
+ echo PreReq: OpenPKG, openpkg = 20021218
echo AutoReq: no
echo AutoReqProv: no
echo
echo %description
echo ${name} is the most badly packaged program in the OpenPKG world.
echo
+ echo Options: none
+ echo
echo %prep
echo %setup -q
echo
echo %build
echo CC=\%{l_cc}\ \\
+ echo CXX=\%{l_cxx}\ \\
echo CFLAGS=\%{l_cflags -O}\ \\
+ echo CXXFLAGS=\%{l_cxxflags -O}\ \\
+ echo CPPFLAGS=\%{l_cppflags}\ \\
+ echo LDFLAGS=\%{l_ldflags}\ \\
echo ./configure \\
echo --prefix=%{l_prefix}
echo %{l_make} %{l_mflags -O}
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re openpkg-dev
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: 27-Nov-2002 15:44:51
Branch: HEAD Handle: 2002112714445100
Modified files:
openpkg-re openpkg-dev
Log:
make sure the RPMs are group-writeable
Summary:
RevisionChanges Path
1.41+7 -3 openpkg-re/openpkg-dev
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.40 -r1.41 openpkg-dev
--- openpkg-re/openpkg-dev21 Nov 2002 10:19:22 - 1.40
+++ openpkg-re/openpkg-dev27 Nov 2002 14:44:51 - 1.41
@@ -383,17 +383,21 @@
echo ++ releasing ${basename}.src.rpm to OpenPKG distribution area
if [ ${dry} -eq 0 ]; then
-scp ${OPENPKG_WORK}/pkg/src/${basename}.src.rpm ${OPENPKG_DIST}
+chmod 664 ${OPENPKG_WORK}/pkg/src/${basename}.src.rpm
+scp -p ${OPENPKG_WORK}/pkg/src/${basename}.src.rpm ${OPENPKG_DIST}
else
-echo scp ${OPENPKG_WORK}/pkg/src/${basename}.src.rpm ${OPENPKG_DIST}
+echo chmod 664 ${OPENPKG_WORK}/pkg/src/${basename}.src.rpm
+echo scp -p ${OPENPKG_WORK}/pkg/src/${basename}.src.rpm ${OPENPKG_DIST}
fi
if [ -f ${OPENPKG_WORK}/pkg/src/${basename}.src.sh ]; then
echo ++ releasing ${basename}.src.sh to OpenPKG distribution area
if [ ${dry} -eq 0 ]; then
+chmod 664 ${OPENPKG_WORK}/pkg/src/${basename}.src.sh
scp ${OPENPKG_WORK}/pkg/src/${basename}.src.sh ${OPENPKG_DIST}
else
-echo scp ${OPENPKG_WORK}/pkg/src/${basename}.src.sh ${OPENPKG_DIST}
+echo chmod 664 ${OPENPKG_WORK}/pkg/src/${basename}.src.sh
+echo scp -p ${OPENPKG_WORK}/pkg/src/${basename}.src.sh
${OPENPKG_DIST}
fi
fi
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-re openpkg-dev
OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 29-Aug-2002 11:32:45
Branch: HEAD Handle: 2002082910324500
Modified files:
openpkg-re openpkg-dev
Log:
cleanup
Summary:
RevisionChanges Path
1.37+3 -2 openpkg-re/openpkg-dev
Index: openpkg-re/openpkg-dev
$ cvs diff -u -r1.36 -r1.37 openpkg-dev
--- openpkg-re/openpkg-dev8 Aug 2002 07:04:36 - 1.36
+++ openpkg-re/openpkg-dev29 Aug 2002 09:32:45 - 1.37
@@ -548,7 +548,7 @@
echo URL: http://www.${name}.org/;
echo Vendor: John Doe
echo Packager: The OpenPKG Project
- echo Distribution: OpenPKG [EXP]
+ echo Distribution: OpenPKG [EVAL]
echo Group:Misc
echo License: GPL
echo Version: 7.42
@@ -593,7 +593,7 @@
( cd ${OPENPKG_WORK}/src/${name} cvs add ${name}.spec )
echo ++ creating openpkg-re/vcheck/vc.${name} skeleton
-( echo config = {
+( echo config = {
echo }
echo
echo prog ${name} = {
@@ -601,6 +601,7 @@
echo url = ftp://ftp.${name}.org/pub/${name}/;
echo regex = ${name}-(__VER__)\.tar\.gz
echo }
+ echo
) ${OPENPKG_WORK}/re/vcheck/vc.${name}
( cd ${OPENPKG_WORK}/re/vcheck cvs add vc.${name} )
}
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
