[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 22-Dec-2006 22:12:26
Branch: HEAD Handle: 200611122500
Modified files:
openpkg-tools/cmd dev.sh
Log:
new -h (headersonly) option to "openpkg dev build", handy for
adjusting Release: header without actually building
Summary:
RevisionChanges Path
1.97+6 -1 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.96 -r1.97 dev.sh
--- openpkg-tools/cmd/dev.sh 22 Dec 2006 20:55:36 - 1.96
+++ openpkg-tools/cmd/dev.sh 22 Dec 2006 21:12:25 - 1.97
@@ -2293,6 +2293,7 @@
build () {
force=0
+headersonly=0
packages=""
defall=""
defpkg=""
@@ -2311,6 +2312,7 @@
fi
;;
.-f ) force=1 ;;
+.-h ) headersonly=1 ;;
* ) packages="${packages} $1"
esac
shift
@@ -2358,6 +2360,9 @@
fi
fi
fi
+if [ $headersonly -eq 1 ]; then
+continue
+fi
package=`rpmE -q --qf "%{NAME}-%{VERSION}-%{RELEASE}" \
--specfile ${OPENPKG_WORK}/$S/${name}/${name}.spec`
@@ -2939,7 +2944,7 @@
\$ openpkg dev bprep # [[spec]...] [-f][-D with...] rpmE -bp
spec (force, opt)
\$ openpkg dev branch # [ctag] switch to
a different branch
\$ openpkg dev bsource # [[spec]...] [-f][-s][-D with...] rpmE -bs
[--short-circuit] spec (force, opt)
-\$ openpkg dev build # [[spec]...] [-f][-f][-D with...] build a
package (force, option)
+\$ openpkg dev build # [[spec]...] [-f][-h][-D with...] build a
package (force, headersonly, option)
\$ openpkg dev clean # [-l][-t][-f] [[spec]...] clean logs
and/or temp (force all)
\$ openpkg dev diff# alias for
"release -dry"
\$ openpkg dev erase # [[spec]...] [-f] erase a
package (forcibly)
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 22-Dec-2006 21:55:36
Branch: HEAD Handle: 200610553600
Modified files:
openpkg-tools/cmd dev.sh
Log:
workaround for specs that have multiple "openpkg >= " (build)prereqs
Summary:
RevisionChanges Path
1.96+5 -4 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.95 -r1.96 dev.sh
--- openpkg-tools/cmd/dev.sh 22 Dec 2006 19:48:40 - 1.95
+++ openpkg-tools/cmd/dev.sh 22 Dec 2006 20:55:36 - 1.96
@@ -935,17 +935,18 @@
(builtin cd ${OPENPKG_WORK}/$S/${name} && cvs update)
else
echo "++ joining package ${name} with HEAD"
+#FIXME the sed -n -e '1p' aka head -1 lines only workaround
a problem with specs that have multiple "openpkg >= " (build)prereqs, e.g.
openpkg-tools
(cd ${OPENPKG_WORK}/$S/${name} || exit 1
anchestor=""; cvs log ${name}.spec | sed -n -e '/^symbolic
names:/,/^[^ \t]/p' | sed -e '1d' -e 's/^[ \t]*//' -e '$d' | ${EGREP}
"^${B}_MP: " >/dev/null && anchestor="${B}_MP"
tmpfile="${OPENPKG_TEMP}/${name}${GUID}"
haverelease=`${EGREP} <${name}.spec '^Release:'`
- havebprereq=`${EGREP} <${name}.spec '^BuildPreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
- haverprereq=`${EGREP} <${name}.spec '^PreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
+ havebprereq=`${EGREP} <${name}.spec '^BuildPreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;' | sed -n -e
'1p'`
+ haverprereq=`${EGREP} <${name}.spec '^PreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;' | sed -n -e
'1p'`
cvs up -p -r1 ${name}.spec >${tmpfile} 2>/dev/null
joinrelease=`${EGREP} <${tmpfile} '^Release: '`
joinversion=`${EGREP} <${tmpfile} '^Version: '`
- joinbprereq=`${EGREP} <${tmpfile} '^BuildPreReq: .*openpkg
*>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
- joinrprereq=`${EGREP} <${tmpfile} '^PreReq: .*openpkg
*>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
+ joinbprereq=`${EGREP} <${tmpfile} '^BuildPreReq: .*openpkg
*>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;' | sed -n -e '1p'`
+ joinrprereq=`${EGREP} <${tmpfile} '^PreReq: .*openpkg
*>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;' | sed -n -e '1p'`
sed <${name}.spec >${name}.spec.n \
-e "s;^Release: .*$;$joinrelease;" \
-e "s;^Version: .*$;$joinversion;" \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 22-Dec-2006 20:48:41
Branch: HEAD Handle: 2006122219484000
Modified files:
openpkg-tools/cmd dev.sh
Log:
add support for tracking merge point (MP) when committing on branches
Summary:
RevisionChanges Path
1.95+27 -3 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.94 -r1.95 dev.sh
--- openpkg-tools/cmd/dev.sh 22 Dec 2006 19:36:06 - 1.94
+++ openpkg-tools/cmd/dev.sh 22 Dec 2006 19:48:40 - 1.95
@@ -1890,7 +1890,13 @@
if [ ${bundle} -eq 1 ]; then
bundle_files="${bundle_files} ${files}"
elif [ ${dry} -eq 0 ]; then
-( builtin cd ${OPENPKG_WORK}/$S && command cvs commit -F
"${msg}" $files )
+( builtin cd ${OPENPKG_WORK}/$S || exit 1;
+ command cvs commit -F "${msg}" $files;
+ if [ ".${B}" != .HEAD ]; then
+ command cvs tag -F -r1 ${B}_MP \
+ `for i in $files; do command cvs ls -d $i |
${EGREP} -v '^\? ' | sed -e "s;^;$i/;"; done`
+ fi
+)
else
echo cvs commit -F "${msg}" $files
( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files |
${cvs_diff_colorize} )
@@ -1899,7 +1905,13 @@
if [ ${bundle} -eq 1 ]; then
bundle_files="${bundle_files} ${files}"
elif [ ${dry} -eq 0 ]; then
-( builtin cd ${OPENPKG_WORK}/$S && command cvs commit
$files )
+( builtin cd ${OPENPKG_WORK}/$S || exit 1;
+ command cvs commit "${msg}" $files;
+ if [ ".${B}" != .HEAD ]; then
+ command cvs tag -F -r1 ${B}_MP \
+ `for i in $files; do command cvs ls -d $i |
${EGREP} -v '^\? ' | sed -e "s;^;$i/;"; done`
+ fi
+)
else
echo cvs commit $files
( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files |
${cvs_diff_colorize} )
@@ -1908,7 +1920,13 @@
if [ ${bundle} -eq 1 ]; then
bundle_files="${bundle_files} ${files}"
elif [ ${dry} -eq 0 ]; then
-( builtin cd ${OPENPKG_WORK}/$S && command cvs commit -m
"${msg}" $files )
+( builtin cd ${OPENPKG_WORK}/$S || exit 1;
+ command cvs commit -m "${msg}" $files;
+ if [ ".${B}" != .HEAD ]; then
+ command cvs tag -F -r1 ${B}_MP \
+ `for i in $files; do command cvs ls -d $i |
${EGREP} -v '^\? ' | sed -e "s;^;$i/;"; done`
+ fi
+)
else
echo cvs commit -m "${msg}" $files
( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files |
${cvs_diff_colorize} )
@@ -1956,6 +1974,12 @@
fi
scp -o "Compression no" -o "Cipher blowfish" ${bundle_srpms}
${OPENPKG_SAVE}/${upload}/
eval "builtin cd ${OPENPKG_WORK}/$S && command cvs commit
${bundle_msg} ${bundle_files}"
+( builtin cd ${OPENPKG_WORK}/$S || exit 1;
+ if [ ".${B}" != .HEAD ]; then
+ command cvs tag -F -r1 ${B}_MP \
+ `for i in $bundle_files; do command cvs ls -d $i |
${EGREP} -v '^\? ' | sed -e "s;^;$i/;"; done`
+ fi
+)
else
echo chmod 664 ${bundle_srpms}
if [ ".${bundle_wipes}" != . ]; then
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 22-Dec-2006 20:36:07
Branch: HEAD Handle: 2006122219360600
Modified files:
openpkg-tools/cmd dev.sh
Log:
add support for merging all changes from a merge point (MP)
Summary:
RevisionChanges Path
1.94+9 -2 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.93 -r1.94 dev.sh
--- openpkg-tools/cmd/dev.sh 22 Dec 2006 19:34:41 - 1.93
+++ openpkg-tools/cmd/dev.sh 22 Dec 2006 19:36:06 - 1.94
@@ -935,7 +935,8 @@
(builtin cd ${OPENPKG_WORK}/$S/${name} && cvs update)
else
echo "++ joining package ${name} with HEAD"
-(builtin cd ${OPENPKG_WORK}/$S/${name} || exit 1
+(cd ${OPENPKG_WORK}/$S/${name} || exit 1
+ anchestor=""; cvs log ${name}.spec | sed -n -e '/^symbolic
names:/,/^[^ \t]/p' | sed -e '1d' -e 's/^[ \t]*//' -e '$d' | ${EGREP}
"^${B}_MP: " >/dev/null && anchestor="${B}_MP"
tmpfile="${OPENPKG_TEMP}/${name}${GUID}"
haverelease=`${EGREP} <${name}.spec '^Release:'`
havebprereq=`${EGREP} <${name}.spec '^BuildPreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
@@ -951,7 +952,13 @@
-e "s;^\(BuildPreReq: .*openpkg *>=
*\)[^,]*\(.*\)$;\1$joinbprereq\2;" \
-e "s;^\(PreReq: .*openpkg *>=
*\)[^,]*\(.*\)$;\1$joinrprereq\2;" \
&& mv ${name}.spec.n ${name}.spec
- cvs update -j1
+ if [ ".$anchestor" = . ]; then
+ echo "++ merging all changes from branchpoint"
+ cvs update -j1
+ else
+ echo "++ merging all changes from $anchestor"
+ cvs update -j$anchestor -j1
+ fi
sed <${name}.spec >${name}.spec.n \
-e "s;^Release: .*;$haverelease;" \
-e "s;^\(BuildPreReq: .*openpkg *>=
*\)[^,]*\(.*\)$;\1$havebprereq\2;" \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 22-Dec-2006 20:34:44
Branch: HEAD Handle: 2006122219344100
Modified files:
openpkg-tools/cmd dev.sh
Log:
ignore (untagged) directories to avoid HEAD:2_STABLE combi detection
Summary:
RevisionChanges Path
1.93+1 -1 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.92 -r1.93 dev.sh
--- openpkg-tools/cmd/dev.sh 2 Dec 2006 22:56:30 - 1.92
+++ openpkg-tools/cmd/dev.sh 22 Dec 2006 19:34:41 - 1.93
@@ -1020,7 +1020,7 @@
fi
if [ ".${cvstagfiles}" != . ]; then
branch=`cat ${cvstagfiles} \
-| sed -e 's;//THEAD$;//THEAD_STICKY;' -e 's;//$;//THEAD;' -n -e
's;^.*//T;;p' \
+| sed -e '/^D\//d' -e 's;//THEAD$;//THEAD_STICKY;' -e
's;//$;//THEAD;' -n -e 's;^.*//T;;p' \
| sort | uniq | tr '\n' ':' | sed -e 's;:$;;'`
fi
echo "${branch}"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 02-Dec-2006 23:56:30
Branch: HEAD Handle: 2006120222563000
Modified files:
openpkg-tools/cmd dev.sh
Log:
choose save minimum version of bootstrap since not all features are
backward compatible, e.g. set-uid wrapper
Summary:
RevisionChanges Path
1.92+2 -2 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.91 -r1.92 dev.sh
--- openpkg-tools/cmd/dev.sh 26 Oct 2006 20:21:41 - 1.91
+++ openpkg-tools/cmd/dev.sh 2 Dec 2006 22:56:30 - 1.92
@@ -2101,8 +2101,8 @@
echo "# build information"
echo "Prefix: %{l_prefix}"
echo "BuildRoot:%{l_buildroot}"
- echo "BuildPreReq: OpenPKG, openpkg >= 20040130"
- echo "PreReq: OpenPKG, openpkg >= 20040130"
+ echo "BuildPreReq: OpenPKG, openpkg >= 20060823"
+ echo "PreReq: OpenPKG, openpkg >= 20060823"
echo "AutoReq: no"
echo "AutoReqProv: no"
echo ""
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 26-Oct-2006 22:21:42
Branch: HEAD Handle: 2006102621214100
Modified files:
openpkg-tools/cmd dev.sh
Log:
reduce automatic checkouts to the bare minimum of package sources when
running setup
Summary:
RevisionChanges Path
1.91+1 -7 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.90 -r1.91 dev.sh
--- openpkg-tools/cmd/dev.sh 26 Oct 2006 20:19:53 - 1.90
+++ openpkg-tools/cmd/dev.sh 26 Oct 2006 20:21:41 - 1.91
@@ -865,16 +865,10 @@
# checkout the CVS module(s)
if [ ".${P}" = . ]; then
-echo "++ checking out source areas
(${OPENPKG_REPO}/{adm,doc,re,src,web,registry,tools})"
+echo "++ checking out source areas (${OPENPKG_REPO}/${OPENPKG_RMOD})"
( builtin cd "${OPENPKG_WORK}"
HOME="${OPENPKG_WORK}"
export HOME
- cvs -q -d "${OPENPKG_REPO}" checkout -d adm openpkg-adm
- cvs -q -d "${OPENPKG_REPO}" checkout -d doc openpkg-doc
- cvs -q -d "${OPENPKG_REPO}" checkout -d re openpkg-re
- cvs -q -d "${OPENPKG_REPO}" checkout -d web openpkg-web
- cvs -q -d "${OPENPKG_REPO}" checkout -d toolsopenpkg-tools
- cvs -q -d "${OPENPKG_REPO}" checkout -d registry openpkg-registry
if [ ".${B:-HEAD}" = .HEAD ]; then
cvs -q -d "${OPENPKG_REPO}" checkout -d src "${OPENPKG_RMOD}"
else
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 26-Oct-2006 22:19:54
Branch: HEAD Handle: 2006102621195300
Modified files:
openpkg-tools/cmd dev.sh
Log:
add options to complement recently added OPENPKG_NAME and OPENPKG_MAIL
variables
Summary:
RevisionChanges Path
1.90+17 -1 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.89 -r1.90 dev.sh
--- openpkg-tools/cmd/dev.sh 26 Oct 2006 20:01:58 - 1.89
+++ openpkg-tools/cmd/dev.sh 26 Oct 2006 20:19:53 - 1.90
@@ -143,7 +143,7 @@
OPENPKG_MAIL="[EMAIL PROTECTED]"
;;
esac
-export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO
OPENPKG_RMOD OPENPKG_SAVE OPENPKG_DIST
+export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO
OPENPKG_RMOD OPENPKG_SAVE OPENPKG_DIST OPENPKG_NAME OPENPKG_MAIL
# enforced and user controlled (through package/branch/execute) variables
OPENPKG_SPEC="${OPENPKG_SPEC}"; P="$P" # package, spec file without .spec
suffix
@@ -216,6 +216,8 @@
--exec=* ) OPENPKG_EXEC=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--exec=${arg}";;
--trun=* ) OPENPKG_TRUN=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--trun=${arg}";;
--sdir=* ) OPENPKG_SDIR=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--sdir=${arg}";;
+--name=* ) OPENPKG_NAME=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--name=${arg}";;
+--mail=* ) OPENPKG_MAIL=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--mail=${arg}";;
-* ) help="Invalid option \`${opt}'"; break ;;
*) break ;;
esac
@@ -3166,6 +3168,20 @@
fallback to "src". While working within the Development Shell this
setting can be changed at any time by running the "srcdir" command.
+=item B<--name=>I
+
+Specify the full name to be used when creating patches for contributors.
+If omitted the variable C is read from F<~/openpkg/dev.rc>,
+read from environment.
+The default is a guess from querying shell user identification.
+
+=item B<--mail=>I
+
+Specify the full name to be used when creating patches for contributors.
+If omitted the variable C is read from F<~/openpkg/dev.rc>,
+read from environment.
+The default is a guess from shell login, hostname and domainname.
+
=back
=head1 FILES
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 26-Oct-2006 22:02:00
Branch: HEAD Handle: 2006102621015800
Modified files:
openpkg-tools/cmd dev.sh
Log:
compatiblity hint for developers, telling them about the new
OPENPKG_SAVE config
Summary:
RevisionChanges Path
1.89+12 -0 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.88 -r1.89 dev.sh
--- openpkg-tools/cmd/dev.sh 24 Oct 2006 10:40:09 - 1.88
+++ openpkg-tools/cmd/dev.sh 26 Oct 2006 20:01:58 - 1.89
@@ -2980,6 +2980,18 @@
[ ".${OPENPKG_REPO}" = . ] && die "OPENPKG_REPO is not set";
[ ".${OPENPKG_SAVE}" = . ] && die "OPENPKG_SAVE is not set";
+# compatiblity FIXME
+echo "${OPENPKG_DIST}" | ${EGREP} '[^a-zA-Z0-9_]' >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+warn "deprecated use of OPENPKG_DIST=${OPENPKG_DIST}."
+warn "Variable was renamed to OPENPKG_SAVE. See manual page."
+warn "This might come from your ~/.openpkg/dev.rc file. Please fix."
+warn "Three second penalty :-)"
+sleep 3
+OPENPKG_SAVE=${OPENPKG_DIST}
+OPENPKG_DIST=""
+fi
+
# handle command
case ${cmd} in
bash| ba* ) cmd="bash";;
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 24-Oct-2006 12:40:09
Branch: HEAD Handle: 2006102411400900
Modified files:
openpkg-tools/cmd dev.sh
Log:
subshells require cvs shell function escaping, also modify two similar
occurrences for consistency
Summary:
RevisionChanges Path
1.88+5 -5 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.87 -r1.88 dev.sh
--- openpkg-tools/cmd/dev.sh 24 Oct 2006 10:23:11 - 1.87
+++ openpkg-tools/cmd/dev.sh 24 Oct 2006 10:40:09 - 1.88
@@ -1887,7 +1887,7 @@
if [ ${bundle} -eq 1 ]; then
bundle_files="${bundle_files} ${files}"
elif [ ${dry} -eq 0 ]; then
-( builtin cd ${OPENPKG_WORK}/$S && cvs commit -F
"${msg}" $files )
+( builtin cd ${OPENPKG_WORK}/$S && command cvs commit -F
"${msg}" $files )
else
echo cvs commit -F "${msg}" $files
( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files |
${cvs_diff_colorize} )
@@ -1896,7 +1896,7 @@
if [ ${bundle} -eq 1 ]; then
bundle_files="${bundle_files} ${files}"
elif [ ${dry} -eq 0 ]; then
-( builtin cd ${OPENPKG_WORK}/$S && cvs commit $files )
+( builtin cd ${OPENPKG_WORK}/$S && command cvs commit
$files )
else
echo cvs commit $files
( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files |
${cvs_diff_colorize} )
@@ -1905,7 +1905,7 @@
if [ ${bundle} -eq 1 ]; then
bundle_files="${bundle_files} ${files}"
elif [ ${dry} -eq 0 ]; then
-( builtin cd ${OPENPKG_WORK}/$S && cvs commit -m
"${msg}" $files )
+( builtin cd ${OPENPKG_WORK}/$S && command cvs commit -m
"${msg}" $files )
else
echo cvs commit -m "${msg}" $files
( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files |
${cvs_diff_colorize} )
@@ -1952,14 +1952,14 @@
echo "rm ${bundle_wipes}" | sftp $uath
fi
scp -o "Compression no" -o "Cipher blowfish" ${bundle_srpms}
${OPENPKG_SAVE}/${upload}/
-eval "builtin cd ${OPENPKG_WORK}/$S && cvs commit ${bundle_msg}
${bundle_files}"
+eval "builtin cd ${OPENPKG_WORK}/$S && command cvs commit
${bundle_msg} ${bundle_files}"
else
echo chmod 664 ${bundle_srpms}
if [ ".${bundle_wipes}" != . ]; then
echo "echo \"rm ${bundle_wipes}\" | sftp $uath"
fi
echo "scp -o \"Compression no\" -o \"Cipher blowfish\"
${bundle_srpms} ${OPENPKG_SAVE}/${upload}/"
-echo "builtin cd ${OPENPKG_WORK}/$S && cvs commit ${bundle_msg}
${bundle_files}"
+echo "builtin cd ${OPENPKG_WORK}/$S && command cvs commit
${bundle_msg} ${bundle_files}"
( builtin cd ${OPENPKG_WORK}/$S && cvs diff ${bundle_files} |
${cvs_diff_colorize} )
fi
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 24-Oct-2006 12:23:11
Branch: HEAD Handle: 2006102411231100
Modified files:
openpkg-tools/cmd dev.sh
Log:
support distribution release prefix
Summary:
RevisionChanges Path
1.87+26 -13 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.86 -r1.87 dev.sh
--- openpkg-tools/cmd/dev.sh 24 Oct 2006 10:22:00 - 1.86
+++ openpkg-tools/cmd/dev.sh 24 Oct 2006 10:23:11 - 1.87
@@ -129,6 +129,7 @@
[EMAIL PROTECTED]:/v/openpkg/cvs
OPENPKG_RMOD=openpkg-src
[EMAIL PROTECTED]:/
+OPENPKG_DIST=""
OPENPKG_NAME="$realname"
OPENPKG_MAIL="[EMAIL PROTECTED]"
;;
@@ -137,11 +138,12 @@
OPENPKG_REPO=:pserver:[EMAIL PROTECTED]:/v/openpkg/cvs
OPENPKG_RMOD=openpkg-src
OPENPKG_SAVE=ftp://ftp.openpkg.org/contrib/00UPLOAD
+OPENPKG_DIST=""
OPENPKG_NAME="$realname"
OPENPKG_MAIL="[EMAIL PROTECTED]"
;;
esac
-export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO
OPENPKG_RMOD OPENPKG_SAVE
+export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO
OPENPKG_RMOD OPENPKG_SAVE OPENPKG_DIST
# enforced and user controlled (through package/branch/execute) variables
OPENPKG_SPEC="${OPENPKG_SPEC}"; P="$P" # package, spec file without .spec
suffix
@@ -208,6 +210,7 @@
--repo=* ) OPENPKG_REPO=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--repo=${arg}";;
--rmod=* ) OPENPKG_RMOD=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--rmod=${arg}";;
--save=* ) OPENPKG_SAVE=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--save=${arg}";;
+--dist=* ) OPENPKG_DIST=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--dist=${arg}";;
--spec=* ) OPENPKG_SPEC=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--spec=${arg}";;
--ctag=* ) OPENPKG_CTAG=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--ctag=${arg}";;
--exec=* ) OPENPKG_EXEC=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--exec=${arg}";;
@@ -696,7 +699,7 @@
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'`
+BRANCH=`echo "$B" | sed -e 's;^OPENPKG_;;' -e "s;^${OPENPKG_DIST};;"
-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
@@ -711,11 +714,11 @@
upload=""
rpmwipe=""
if [ ".${BRANCH}" = .HEAD ]; then
-rpm_release_req=`date '+%Y%m%d'`
+rpm_release_req="${OPENPKG_DIST}`date '+%Y%m%d'`"
upload="current/SRC/00UPLOAD"
fi
if [ ".${BRANCH}" = .STABLE ]; then
-rpm_release_req="${OPMAJORV}.`date '+%Y%m%d'`"
+rpm_release_req="${OPENPKG_DIST}${OPMAJORV}.`date '+%Y%m%d'`"
upload="stable/${OPMAJORV}/SRC/00UPLOAD"
fi
if [ ".${BRANCH}" = .SOLID ]; then
@@ -725,24 +728,24 @@
cvs_release=`builtin cd ${OPENPKG_WORK}/$S/${name} && cvs log
-r${cvs_rev} ${name}.spec 2>/dev/null | fgrep $RELEASE`
if [ ".${cvs_release}" = . ]; then
echo "++ detected post-branch pre-release engineering phase
- keep zero update number"
-rpm_release_req="${OPMAJORV}.${OPMINORV}.0"
+rpm_release_req="${OPENPKG_DIST}${OPMAJORV}.${OPMINORV}.0"
upload="release/${OPMAJORV}.${OPMINORV}/SRC"
rpmwipe="${name}-${rpm_version_old}-${rpm_release_old}"
[ ".${rpmfile}" = ".${rpmwipe}" ] && rpmwipe=""
else
update=`expr ${update} + 1`
-rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
+
rpm_release_req="${OPENPKG_DIST}${OPMAJORV}.${OPMINORV}.${update}"
upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD"
fi
else
echo "${update}" | ${EGREP} "^[0-9]{8}$" >/dev/null
if [ $? != 0 ]; then
update=`expr ${update} + 1`
-rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
+
rpm_release_req="${OPENPKG_DIST}${OPMAJORV}.${OPMINOR
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 24-Oct-2006 12:22:00
Branch: HEAD Handle: 200610241122
Modified files:
openpkg-tools/cmd dev.sh
Log:
relax CVS requirements and more easily support local repository
Summary:
RevisionChanges Path
1.86+21 -21 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.85 -r1.86 dev.sh
--- openpkg-tools/cmd/dev.sh 24 Oct 2006 10:17:55 - 1.85
+++ openpkg-tools/cmd/dev.sh 24 Oct 2006 10:22:00 - 1.86
@@ -668,14 +668,14 @@
_autorel () {
echo "++ determine old version (if any)"
tmpfile="${OPENPKG_TEMP}/${name}${GUID}"
-cvs_stat=`builtin cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} stat
$S/${name}/${name}.spec 2>/dev/null | grep 'Repository revision:'`
+cvs_stat=`builtin cd ${OPENPKG_WORK}/$S/${name} && cvs stat ${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_RMOD}/${name}/${name}.spec" >${tmpfile} 2>/dev/null
+( builtin cd ${OPENPKG_WORK}/$S/${name} && cvs up -p -r${cvs_rev}
${name}.spec >${tmpfile} 2>/dev/null )
rpm_version_old=`rpmE -q --qf "%{VERSION}" --specfile ${tmpfile}
2>/dev/null`
rpm_release_old=`rpmE -q --qf "%{RELEASE}" --specfile ${tmpfile}
2>/dev/null`
command rm -f ${tmpfile}
@@ -722,7 +722,7 @@
update=`echo ${rpm_release_old} | sed -e 's;^.*\.;;'`
if [ ".${update}" = .0 ]; then
RELEASE=`echo "$B" | sed -e 's;_SOLID$;_RELEASE;'`
-cvs_release=`builtin cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO}
log -r${cvs_rev} $S/${name}/${name}.spec 2>/dev/null | fgrep $RELEASE`
+cvs_release=`builtin cd ${OPENPKG_WORK}/$S/${name} && cvs log
-r${cvs_rev} ${name}.spec 2>/dev/null | fgrep $RELEASE`
if [ ".${cvs_release}" = . ]; then
echo "++ detected post-branch pre-release engineering phase
- keep zero update number"
rpm_release_req="${OPMAJORV}.${OPMINORV}.0"
@@ -941,7 +941,7 @@
haverelease=`${EGREP} <${name}.spec '^Release:'`
havebprereq=`${EGREP} <${name}.spec '^BuildPreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
haverprereq=`${EGREP} <${name}.spec '^PreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
- cvs -d ${OPENPKG_REPO} co -p -r1
"${OPENPKG_RMOD}/${name}/${name}.spec" >${tmpfile} 2>/dev/null
+ cvs up -p -r1 ${name}.spec >${tmpfile} 2>/dev/null
joinrelease=`${EGREP} <${tmpfile} '^Release: '`
joinversion=`${EGREP} <${tmpfile} '^Version: '`
joinbprereq=`${EGREP} <${tmpfile} '^BuildPreReq: .*openpkg
*>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
@@ -969,7 +969,7 @@
export HOME
for subdir in adm doc re src src.* web tools; do
if [ -d $subdir ]; then
- cvs -d ${OPENPKG_REPO} update $subdir
+ ( cd $subdir && cvs update )
fi
done
)
@@ -1873,7 +1873,7 @@
fi
echo "++ determining commit file list"
-files="$S/${name}"
+files="${name}"
echo "++ committing changes to CVS repository"
builtin cd "${OPENPKG_WORK}" || die "cannot cd to
${OPENPKG_WORK}"
@@ -1881,28 +1881,28 @@
if [ ${bundle} -eq 1 ]; then
bundle_files="${bundle_files} ${files}"
elif [ ${dry} -eq 0 ]; then
-cvs -d ${OPENPKG_REPO} commit -F "${msg}" $files
+( builtin cd ${OPENPKG_WORK}/$S && cvs commit -F
"${msg}" $files )
else
echo cvs commit -F "${msg}" $files
-cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
+( builtin cd ${OPENPKG_WORK}/$S && cvs diff $files |
${cvs_diff_colorize} )
fi
elif [ ".${msg}" = ".-" ]; then
if [ ${bundle} -eq 1
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 24-Oct-2006 12:17:56
Branch: HEAD Handle: 2006102411175500
Modified files:
openpkg-tools/cmd dev.sh
Log:
free OPENPKG_DIST variable for different purpose by renaming it to
OPENPKG_SAVE
Summary:
RevisionChanges Path
1.85+20 -20 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.84 -r1.85 dev.sh
--- openpkg-tools/cmd/dev.sh 24 Oct 2006 08:10:20 - 1.84
+++ openpkg-tools/cmd/dev.sh 24 Oct 2006 10:17:55 - 1.85
@@ -128,7 +128,7 @@
OPENPKG_MODE=developer
[EMAIL PROTECTED]:/v/openpkg/cvs
OPENPKG_RMOD=openpkg-src
-[EMAIL PROTECTED]:/
+[EMAIL PROTECTED]:/
OPENPKG_NAME="$realname"
OPENPKG_MAIL="[EMAIL PROTECTED]"
;;
@@ -136,12 +136,12 @@
OPENPKG_MODE=contributor
OPENPKG_REPO=:pserver:[EMAIL PROTECTED]:/v/openpkg/cvs
OPENPKG_RMOD=openpkg-src
-OPENPKG_DIST=ftp://ftp.openpkg.org/contrib/00UPLOAD
+OPENPKG_SAVE=ftp://ftp.openpkg.org/contrib/00UPLOAD
OPENPKG_NAME="$realname"
OPENPKG_MAIL="[EMAIL PROTECTED]"
;;
esac
-export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO
OPENPKG_RMOD OPENPKG_DIST
+export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO
OPENPKG_RMOD OPENPKG_SAVE
# enforced and user controlled (through package/branch/execute) variables
OPENPKG_SPEC="${OPENPKG_SPEC}"; P="$P" # package, spec file without .spec
suffix
@@ -207,7 +207,7 @@
--mode=* ) OPENPKG_MODE=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--mode=${arg}";;
--repo=* ) OPENPKG_REPO=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--repo=${arg}";;
--rmod=* ) OPENPKG_RMOD=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--rmod=${arg}";;
---dist=* ) OPENPKG_DIST=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--dist=${arg}";;
+--save=* ) OPENPKG_SAVE=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--save=${arg}";;
--spec=* ) OPENPKG_SPEC=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--spec=${arg}";;
--ctag=* ) OPENPKG_CTAG=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--ctag=${arg}";;
--exec=* ) OPENPKG_EXEC=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--exec=${arg}";;
@@ -1813,9 +1813,9 @@
fi
fi
-area=`echo ${OPENPKG_DIST}/${upload}/ | sed -e 's;[EMAIL
PROTECTED]:/;OpenPKG ;'`
-uath=`echo ${OPENPKG_DIST} | sed -e 's;:.*$;;'`
-dist=`echo ${OPENPKG_DIST} | sed -e 's;^.*:;;'`
+area=`echo ${OPENPKG_SAVE}/${upload}/ | sed -e 's;[EMAIL
PROTECTED]:/;OpenPKG ;'`
+uath=`echo ${OPENPKG_SAVE} | sed -e 's;:.*$;;'`
+save=`echo ${OPENPKG_SAVE} | sed -e 's;^.*:;;'`
exts="${ext}"
if [ ".${name}" = .openpkg ]; then
if [ ! -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh" ]; then
@@ -1833,15 +1833,15 @@
elif [ ${dry} -eq 0 ]; then
chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
if [ ".${rpmwipe}" != . ]; then
-echo "rm ${dist}/${upload}/${rpmwipe}.${ext}" | sftp
$uath
+echo "rm ${save}/${upload}/${rpmwipe}.${ext}" | sftp
$uath
fi
-scp -o "Compression no" -o "Cipher blowfish"
"${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}" "${OPENPKG_DIST}/${upload}/"
+scp -o "Compression no" -o "Cipher blowfish"
"${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}" "${OPENPKG_SAVE}/${upload}/"
else
echo "chmod 664
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}"
if [ ".${rpmwipe}" != . ]; then
-echo "echo \"rm
${dist}/${upload}/${rpmwipe}.${ext}\" | sftp $uath"
+echo "echo \"rm
${save}/${upload}/${rpmwipe}.${ext}\" | sftp $uath"
fi
-echo "scp -o \"Compression no\" -o \"Cipher blowfish\"
\"${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}\" \"${OPENPKG_DIST}/${upload}/\""
+echo "scp -o \"Compression no\" -o \"Cipher blowfish\"
\"${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}\" \"${OPENPKG_SAVE}/${upload}/\""
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 24-Oct-2006 10:10:21
Branch: HEAD Handle: 2006102409102000
Modified files:
openpkg-tools/cmd dev.sh
Log:
remove legacy and compatibility code
Summary:
RevisionChanges Path
1.84+0 -23 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.83 -r1.84 dev.sh
--- openpkg-tools/cmd/dev.sh 22 Oct 2006 08:18:46 - 1.83
+++ openpkg-tools/cmd/dev.sh 24 Oct 2006 08:10:20 - 1.84
@@ -185,12 +185,6 @@
# output as "HEAD_STICKY" which means that this becomes a third
# "hardcoded" pseudotag.
-# override configuration from ${HOME}/.openpkg-dev.rc (LEGACY)
-if [ -f ${HOME}/.openpkg-dev.rc ]; then
-echo "openpkg:dev:WARNING: legacy ~/.openpkg-dev.rc found (please rename
to ~/.openpkg/dev.rc)" 1>&2
-. ${HOME}/.openpkg-dev.rc
-fi
-
# override configuration from ${HOME}/.openpkg/dev.rc (OFFICIAL)
if [ -f ${HOME}/.openpkg/dev.rc ]; then
. ${HOME}/.openpkg/dev.rc
@@ -1760,23 +1754,6 @@
# developer section
if [ ".${OPENPKG_MODE}" = .developer ]; then
-# compatiblity FIXME
-echo "${OPENPKG_DIST}" | ${EGREP} "/current/SRC/?$" >/dev/null
2>&1
-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
-if [ ".${OPENPKG_WILD}" != . ]; then
-warn "deprecated use of OPENPKG_WILD. Do not use it."
-warn "Please list all instances in OPENPKG_INST (space
delimited)."
-warn "This might come from your ~/.openpkg/dev.rc file.
Please fix."
-warn "Three second penalty :-)"
-sleep 3
-fi
-
echo "++ determine [no]src extension"
ext=""
[ -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.src.rpm" ] &&
ext="src.rpm"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh lint-rpm.pl
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 22-Oct-2006 10:18:47
Branch: HEAD Handle: 2006102209184600
Modified files:
openpkg-tools/cmd dev.sh lint-rpm.pl
Log:
cleanup lint-rpm stuff
Summary:
RevisionChanges Path
1.83+2 -3 openpkg-tools/cmd/dev.sh
1.6 +2 -2 openpkg-tools/cmd/lint-rpm.pl
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.82 -r1.83 dev.sh
--- openpkg-tools/cmd/dev.sh 15 Oct 2006 13:37:06 - 1.82
+++ openpkg-tools/cmd/dev.sh 22 Oct 2006 08:18:46 - 1.83
@@ -1828,7 +1828,7 @@
bin_rpmdir=`rpmE --eval '%{_rpmdir}'`
if [ -f "$bin_rpmdir/$bin_rpmfile" ]; then
echo "++ linting ${bin_rpmfile} (binary package)"
-openpkgT lint-rpm --check=layout,attrib
$bin_rpmdir/$bin_rpmfile
+openpkgT lint-rpm $bin_rpmdir/$bin_rpmfile
if [ $? -gt 0 ]; then
die "unacceptable specification:
$bin_rpmdir/$bin_rpmfile"
fi
@@ -2650,8 +2650,7 @@
bin_rpmdir=`HOME=${OPENPKG_WORK} rpmE --eval '%{_rpmdir}'`
if [ -f "$bin_rpmdir/$bin_rpmfile" ]; then
echo "++ linting ${bin_rpmdir}/${bin_rpmfile} (binary
package)"
-echo openpkgT lint-rpm --check=layout,attrib
$bin_rpmdir/$bin_rpmfile
-openpkgT lint-rpm --check=layout,attrib
$bin_rpmdir/$bin_rpmfile
+openpkgT lint-rpm $bin_rpmdir/$bin_rpmfile
if [ $? -gt 0 -a $force -ne 1 ]; then
die "unacceptable specification:
$bin_rpmdir/$bin_rpmfile"
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/lint-rpm.pl
$ cvs diff -u -r1.5 -r1.6 lint-rpm.pl
--- openpkg-tools/cmd/lint-rpm.pl 1 Jan 2006 14:04:49 - 1.5
+++ openpkg-tools/cmd/lint-rpm.pl 22 Oct 2006 08:18:46 - 1.6
@@ -34,8 +34,8 @@
my $ctx = new OpenPKG::Ctx;
# program information
-my $progname = "rpmlint";
-my $progvers = "0.0.1";
+my $progname = "lint-rpm";
+my $progvers = "1.0.0";
# parameters (defaults)
my $version = 0;
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 15-Oct-2006 15:37:07
Branch: HEAD Handle: 2006101514370600
Modified files:
openpkg-tools/cmd dev.sh
Log:
adjust for newer world order
Summary:
RevisionChanges Path
1.82+2 -2 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.81 -r1.82 dev.sh
--- openpkg-tools/cmd/dev.sh 29 Sep 2006 06:22:43 - 1.81
+++ openpkg-tools/cmd/dev.sh 15 Oct 2006 13:37:06 - 1.82
@@ -2108,8 +2108,8 @@
echo "Summary: Badly Packaged Program"
echo "URL: http://www.${name}.org/";
echo "Vendor: John Doe"
- echo "Packager: OpenPKG"
- echo "Distribution: OpenPKG"
+ echo "Packager: OpenPKG Foundation e.V."
+ echo "Distribution: OpenPKG Community"
echo "Class:EVAL"
echo "Group:Unknown"
echo "License: DoePL"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 29-Sep-2006 08:22:43
Branch: HEAD Handle: 2006092907224300
Modified files:
openpkg-tools/cmd dev.sh
Log:
be more efficient by performing direct lookups by key (if possible)
instead of fetching the whole database; also add little bit of NIS+
support
Summary:
RevisionChanges Path
1.81+6 -2 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.80 -r1.81 dev.sh
--- openpkg-tools/cmd/dev.sh 29 Sep 2006 06:20:10 - 1.80
+++ openpkg-tools/cmd/dev.sh 29 Sep 2006 06:22:43 - 1.81
@@ -107,8 +107,12 @@
fi
fi
fi
-realname=`(getent passwd; cat /etc/passwd; ypcat passwd; nidump passwd .)
2>/dev/null |\
- grep "^${username}:" | awk -F: '{ print $5; }'`
+realname=`(getent passwd "${username}"; \
+ grep "^${username}:" /etc/passwd; \
+ ypmatch "${username}" passwd; \
+ nismatch "${username}" passwd; \
+ nidump passwd . | grep "^${username}:") 2>/dev/null |\
+ sed -e 'q' | awk -F: '{ print $5; }'`
if [ ".$realname" = . ]; then
realname="unknown"
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 29-Sep-2006 08:20:10
Branch: HEAD Handle: 2006092907201000
Modified files:
openpkg-tools/cmd dev.sh
Log:
I usually wish bundled commits already for _two_ packages, not
starting at _three_
Summary:
RevisionChanges Path
1.80+1 -1 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.79 -r1.80 dev.sh
--- openpkg-tools/cmd/dev.sh 4 Jul 2006 13:02:23 - 1.79
+++ openpkg-tools/cmd/dev.sh 29 Sep 2006 06:20:10 - 1.80
@@ -1725,7 +1725,7 @@
for name in $all; do
names=`expr $names + 1`
done
-if [ ".${msg}" != . -a $names -gt 2 ]; then
+if [ ".${msg}" != . -a $names -gt 1 ]; then
bundle=1
bundle_files=""
bundle_srpms=""
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 04-Jul-2006 15:02:26
Branch: HEAD Handle: 2006070414022300
Modified files:
openpkg-tools/cmd dev.sh
Log:
replace "openpkg dev search" file listing logic by repository index
crawling logic
Summary:
RevisionChanges Path
1.79+70 -26 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.78 -r1.79 dev.sh
--- openpkg-tools/cmd/dev.sh 20 Jun 2006 13:20:45 - 1.78
+++ openpkg-tools/cmd/dev.sh 4 Jul 2006 13:02:23 - 1.79
@@ -2487,21 +2487,53 @@
done
}
-search_for () {
-URL=`echo $2 | sed -e 's| *$||'`
-openpkg register --printstatus >/dev/null 2>&1 \
-&& URL=`openpkg register --rewriteurls $URL`
-PKG=`$E/lib/openpkg/curl -l -s $URL |\
- sed -e 's|[^-a-zA-Z0-9_\.]||g' |\
- grep "^$1" | sort -r`
-if [ ".$PKG" != . ]; then
-for pkg in $PKG; do
+search_index ()
+{
+local findpkg="$1"
+local urls="$2"
+
+local url=""
+local baseurl=""
+local index=""
+for url in $urls; do
+openpkgE register --printstatus >/dev/null 2>&1 && url=`openpkgE
register --rewriteurls $url`
+case $url in
+*/00INDEX.rdf )
+baseurl=`echo $url | sed -e 's;/00INDEX.rdf$;;'`
+index=`$curlT -s "$url"`
+;;
+*/00INDEX.rdf.bz2 )
+baseurl=`echo $url | sed -e 's;/00INDEX.rdf.bz2$;;'`
+index=`$curlT -s "$url" | $bzipT -q -d`
+;;
+* )
+baseurl=`echo $url | sed -e 's;/$;;'`
+index=`$curlT -s "$baseurl/00INDEX.rdf"`
+if [ ".$index" = . ]; then
+index=`$curlT -s "$baseurl/00INDEX.rdf.bz2" | $bzipT -q
-d`
+fi
+;;
+esac
+
+local pkg pkgs
+pkgs=`printf "===%s===" "$index" \
+| awk 'BEGIN { D="" } /'$findpkg'<\/Name>/ { print D }' \
+| sed -e 's;^[^"]*";;' -e 's;"[^"]*$;;'`
+for pkg in $pkgs; 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"
+echo "$NAME $baseurl/$pkg"
done
-fi
+
+local resource resources
+resources=`printf "===%s===" "$index" \
+ | grep -v /Binary/ \
+ | awk '/ftp://ftp.openpkg.org";
+fi
+if [ ".${packages}" = . ]; then
if [ ".$P" = . ]; then
die "package cannot be identified. Neither parameter given nor
\$P set."
fi
all="$P"
else
-all="$*"
+all="${packages}"
fi
-for i in $all; do
-search_for $i ftp://ftp.openpkg.org/current/SRC/
-search_for $i ftp://ftp.openpkg.org/stable/SRC/
-REL=`$E/lib/openpkg/curl -l -s ftp://ftp.openpkg.org/release/ |\
- sed -e 's;
;;' |\
- egrep '^[1-9][0-9]*\.[0-9]+$' | sort -rn`
-for r in $REL; do
-search_for $i ftp://ftp.openpkg.org/release/$r/UPD/
-search_for $i ftp://ftp.openpkg.org/release/$r/SRC/
-search_for $i ftp://ftp.openpkg.org/release/$r/SRC/PLUS/
-done
+for name in $all; do
+search_index $name $urls
done
}
@@ -2898,7 +2942,7 @@
\$ openpkg dev query # matchinstance|canonifybranch query
script internals
\$ openpkg dev release # [[spec]...] [-dry] [-m "msg"]release
package changes to master server
\$ openpkg dev run # [[spec]...] [-dry] -c "cmd" [-f] append cmd
to %prep for spec and run rpm -bp
-\$ openpkg dev search # [[spec]...] search a
package on master server
+\$ openpkg dev search # [-r repourl...] [[spec]...] search a
package in repository index
\$ openpkg dev setup # [[[spec]ctag]exec] initial
setup of openpkg dev working environment
\$ openpkg dev srcdir # [dir]use a
different source directory
\$ openpkg dev test# [[spec]...] run
functional test (reserved for future us
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 20-Jun-2006 15:20:46
Branch: HEAD Handle: 2006062014204500
Modified files:
openpkg-tools/cmd dev.sh
Log:
allow M.N.MMDD release naming on SOLID branches, too
Summary:
RevisionChanges Path
1.78+10 -3 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.77 -r1.78 dev.sh
--- openpkg-tools/cmd/dev.sh 8 Jun 2006 19:11:48 - 1.77
+++ openpkg-tools/cmd/dev.sh 20 Jun 2006 13:20:45 - 1.78
@@ -737,9 +737,16 @@
upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD"
fi
else
-update=`expr ${update} + 1`
-rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
-upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD"
+echo "${update}" | ${EGREP} "^[0-9]{8}$" >/dev/null
+if [ $? != 0 ]; then
+update=`expr ${update} + 1`
+rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
+upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD"
+else
+update=`date '+%Y%m%d'`
+rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
+upload="solid/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD"
+fi
fi
fi
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 08-Jun-2006 21:11:48
Branch: HEAD Handle: 2006060820114800
Modified files:
openpkg-tools/cmd dev.sh
Log:
use an 00UPLOAD directory also for CURRENT in order to circumvent some
remaining long-standing permission problems which occur when one
uploads the same RPM filename again (happens when updating a package
twice per day)
Summary:
RevisionChanges Path
1.77+2 -2 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.76 -r1.77 dev.sh
--- openpkg-tools/cmd/dev.sh 14 Apr 2006 17:48:30 - 1.76
+++ openpkg-tools/cmd/dev.sh 8 Jun 2006 19:11:48 - 1.77
@@ -714,11 +714,11 @@
rpmwipe=""
if [ ".${BRANCH}" = .HEAD ]; then
rpm_release_req=`date '+%Y%m%d'`
-upload="current/SRC"
+upload="current/SRC/00UPLOAD"
fi
if [ ".${BRANCH}" = .STABLE ]; then
rpm_release_req="${OPMAJORV}.`date '+%Y%m%d'`"
-upload="stable/${OPMAJORV}/SRC"
+upload="stable/${OPMAJORV}/SRC/00UPLOAD"
fi
if [ ".${BRANCH}" = .SOLID ]; then
update=`echo ${rpm_release_old} | sed -e 's;^.*\.;;'`
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 14-Apr-2006 19:48:30
Branch: HEAD Handle: 2006041418483000
Modified files:
openpkg-tools/cmd dev.sh
Log:
commit a change which is pending since a longer time: allow one to set
the contributor/developer's official name and mail address in
~/.openpkg/dev.rc
Summary:
RevisionChanges Path
1.76+73 -11 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.75 -r1.76 dev.sh
--- openpkg-tools/cmd/dev.sh 24 Jan 2006 09:42:09 - 1.75
+++ openpkg-tools/cmd/dev.sh 14 Apr 2006 17:48:30 - 1.76
@@ -37,7 +37,7 @@
unset OPENPKG_TOOLS_CMDPATH
fi
-# export variables
+# export variables
export OPENPKG_TOOLS
export OPENPKG_TOOLS_APIPATH
export OPENPKG_TOOLS_CMDPATH
@@ -49,24 +49,92 @@
export OPENPKG_TOOLS_CMDPATH_TRUN
export OPENPKG_ARGS
+# determine environment identification
+username="`(id -un) 2>/dev/null`"
+if [ ".$username" = . ]; then
+str="`(id) 2>/dev/null`"
+if [ ".`echo $str | grep '^uid[ ]*=[]*[0-9]*('`" != . ]; then
+username=`echo $str | sed -e 's/^uid[]*=[]*[0-9]*(//' -e
's/).*$//'`
+fi
+if [ ".$username" = . ]; then
+username="$LOGNAME"
+if [ ".$username" = . ]; then
+username="$USER"
+if [ ".$username" = . ]; then
+username="`(whoami) 2>/dev/null |\
+ awk '{ printf("%s", $1); }'`"
+if [ ".$username" = . ]; then
+username="`(who am i) 2>/dev/null |\
+ awk '{ printf("%s", $1); }'`"
+if [ ".$username" = . ]; then
+username='unknown'
+fi
+fi
+fi
+fi
+fi
+fi
+domainname=''
+hostname="`(uname -n) 2>/dev/null |\
+ awk '{ printf("%s", $1); }'`"
+if [ ".$hostname" = . ]; then
+hostname="`(hostname) 2>/dev/null |\
+ awk '{ printf("%s", $1); }'`"
+if [ ".$hostname" = . ]; then
+hostname='unknown'
+fi
+fi
+case $hostname in
+*.* )
+domainname=".`echo $hostname | cut -d. -f2-`"
+hostname="`echo $hostname | cut -d. -f1`"
+;;
+esac
+if [ ".$domainname" = . ]; then
+if [ -f /etc/resolv.conf ]; then
+domainname="`grep '^[]*domain' /etc/resolv.conf | sed -e 'q'
|\
+ sed -e 's/.*domain//' \
+ -e 's/^[]*//' -e 's/^ *//' -e 's/^ *//' \
+ -e 's/^\.//' -e 's/^/./' |\
+ awk '{ printf("%s", $1); }'`"
+if [ ".$domainname" = . ]; then
+domainname="`grep '^[]*search' /etc/resolv.conf | sed -e 'q'
|\
+ sed -e 's/.*search//' \
+ -e 's/^[]*//' -e 's/^ *//' -e 's/^
*//' \
+ -e 's/ .*//' -e 's/ .*//' \
+ -e 's/^\.//' -e 's/^/./' |\
+ awk '{ printf("%s", $1); }'`"
+fi
+fi
+fi
+realname=`(getent passwd; cat /etc/passwd; ypcat passwd; nidump passwd .)
2>/dev/null |\
+ grep "^${username}:" | awk -F: '{ print $5; }'`
+if [ ".$realname" = . ]; then
+realname="unknown"
+fi
+
# default configuration
OPENPKG_INST=`[ -r /etc/openpkg ] && grep /openpkg ftp://ftp.openpkg.org/contrib/00UPLOAD
+OPENPKG_NAME="$realname"
+OPENPKG_MAIL="[EMAIL PROTECTED]"
;;
esac
export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO
OPENPKG_RMOD OPENPKG_DIST
@@ -1531,6 +1599,7 @@
# enter environment
echo "++ entering OpenPKG development shell (mode:
[1m${OPENPKG_MODE}[m)"
+echo "++ OpenPKG ${OPENPKG_MODE}: [1m${OPENPKG_NAME}[m
<${OPENPKG_MAIL}>"
${bash} --rcfile .bashrc${GUID}
command rm .bashrc${GUID}
echo "++ leaving OpenPKG development shell"
@@ -1854,16 +1923,9 @@
echo "++ determining contributor identification"
shtoolE=`rpmE --eval '%{l_shtool}'`
thisdate=`${shtoolE} echo -e '%D-%m-%Y'`
-username=`${shtoolE} echo -e '%u'`
-hostname=`${shtoolE} echo -e '%h%d'`
-realname=`(getent passwd; cat /etc/passwd; ypcat pas
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 24-Jan-2006 10:42:10
Branch: HEAD Handle: 2006012409420900
Modified files:
openpkg-tools/cmd dev.sh
Log:
"openpkg dev search" using registry
Summary:
RevisionChanges Path
1.75+4 -0 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.74 -r1.75 dev.sh
--- openpkg-tools/cmd/dev.sh 24 Jan 2006 09:40:08 - 1.74
+++ openpkg-tools/cmd/dev.sh 24 Jan 2006 09:42:09 - 1.75
@@ -351,6 +351,8 @@
openpkgi -t "$@"
elif [ ".$1" = .rpm ]; then
openpkgi -e "$@"
+elif [ ".$1" = .register ]; then
+openpkgi -e "$@"
elif [ ".$1" = .rpm2cpio ]; then
openpkgi -e "$@"
elif [ ".$E" = ".$T" ]; then
@@ -2418,6 +2420,8 @@
search_for () {
URL=`echo $2 | sed -e 's| *$||'`
+openpkg register --printstatus >/dev/null 2>&1 \
+&& URL=`openpkg register --rewriteurls $URL`
PKG=`$E/lib/openpkg/curl -l -s $URL |\
sed -e 's|[^-a-zA-Z0-9_\.]||g' |\
grep "^$1" | sort -r`
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-toolsDate: 24-Jan-2006 10:40:08 Branch: HEAD Handle: 2006012409400800 Modified files: openpkg-tools/cmd dev.sh Log: gracefully handle environments with missing /etc/openpkg Summary: RevisionChanges Path 1.74+1 -1 openpkg-tools/cmd/dev.sh patch -p0 <<'@@ .' Index: openpkg-tools/cmd/dev.sh $ cvs diff -u -r1.73 -r1.74 dev.sh --- openpkg-tools/cmd/dev.sh 1 Jan 2006 14:04:48 - 1.73 +++ openpkg-tools/cmd/dev.sh 24 Jan 2006 09:40:08 - 1.74 @@ -50,7 +50,7 @@ export OPENPKG_ARGS # default configuration -OPENPKG_INST=`grep /openpkg
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 19-Nov-2005 23:15:11
Branch: HEAD Handle: 2005111922151100
Modified files:
openpkg-tools/cmd dev.sh
Log:
"openpkg dev" checkout handle new openpkg-registry module
Summary:
RevisionChanges Path
1.72+7 -6 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.71 -r1.72 dev.sh
--- openpkg-tools/cmd/dev.sh 27 Oct 2005 07:51:12 - 1.71
+++ openpkg-tools/cmd/dev.sh 19 Nov 2005 22:15:11 - 1.72
@@ -785,15 +785,16 @@
# checkout the CVS module(s)
if [ ".${P}" = . ]; then
-echo "++ checking out source areas
(${OPENPKG_REPO}/{adm,doc,re,src,web,tools})"
+echo "++ checking out source areas
(${OPENPKG_REPO}/{adm,doc,re,src,web,registry,tools})"
( builtin cd "${OPENPKG_WORK}"
HOME="${OPENPKG_WORK}"
export HOME
- cvs -q -d "${OPENPKG_REPO}" checkout -d adm openpkg-adm
- cvs -q -d "${OPENPKG_REPO}" checkout -d doc openpkg-doc
- cvs -q -d "${OPENPKG_REPO}" checkout -d reopenpkg-re
- cvs -q -d "${OPENPKG_REPO}" checkout -d web openpkg-web
- cvs -q -d "${OPENPKG_REPO}" checkout -d tools openpkg-tools
+ cvs -q -d "${OPENPKG_REPO}" checkout -d adm openpkg-adm
+ cvs -q -d "${OPENPKG_REPO}" checkout -d doc openpkg-doc
+ cvs -q -d "${OPENPKG_REPO}" checkout -d re openpkg-re
+ cvs -q -d "${OPENPKG_REPO}" checkout -d web openpkg-web
+ cvs -q -d "${OPENPKG_REPO}" checkout -d toolsopenpkg-tools
+ cvs -q -d "${OPENPKG_REPO}" checkout -d registry openpkg-registry
if [ ".${B:-HEAD}" = .HEAD ]; then
cvs -q -d "${OPENPKG_REPO}" checkout -d src "${OPENPKG_RMOD}"
else
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 27-Oct-2005 09:51:12
Branch: HEAD Handle: 2005102708511200
Modified files:
openpkg-tools/cmd dev.sh
Log:
CVS 1.12.13 has problems if the client requests compression (although
its ChangeLog says those problems were fixed)
Summary:
RevisionChanges Path
1.71+0 -1 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.70 -r1.71 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Oct 2005 19:24:37 - 1.70
+++ openpkg-tools/cmd/dev.sh 27 Oct 2005 07:51:12 - 1.71
@@ -719,7 +719,6 @@
echo "++ creating CVS configuration (${OPENPKG_WORK}/.cvsrc)"
updatedir=""; [ ".${P}" = . ] && updatedir="-d"
sed -e 's;^ *;;' <"${OPENPKG_WORK}/.cvsrc"
-cvs -z4
checkout -P
update -P $updatedir
diff -u -d
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Oct-2005 21:24:37
Branch: HEAD Handle: 2005101220243700
Modified files:
openpkg-tools/cmd dev.sh
Log:
add join option to "update" to merge HEAD while avoiding conflicts for
Release and selected PreReq/BuildPreReq headers
Summary:
RevisionChanges Path
1.70+33 -3 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.69 -r1.70 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Oct 2005 19:24:31 - 1.69
+++ openpkg-tools/cmd/dev.sh 12 Oct 2005 19:24:37 - 1.70
@@ -835,10 +835,12 @@
update () {
full=0
+join=0
packages=""
while [ ".$1" != . ]; do
case ".$1" in
.-f ) full=1 ;;
+.-j ) join=1 ;;
* ) packages="${packages} $1"
esac
shift
@@ -854,8 +856,36 @@
if [ $full -eq 0 ]; then
for name in $all; do
[ -d ${OPENPKG_WORK}/$S/${name}/CVS ] || continue;
-echo "++ updating package ${name}"
-(builtin cd ${OPENPKG_WORK}/$S/${name} && cvs update)
+if [ ${join} -eq 0 ]; then
+echo "++ updating package ${name}"
+(builtin cd ${OPENPKG_WORK}/$S/${name} && cvs update)
+else
+echo "++ joining package ${name} with HEAD"
+(builtin cd ${OPENPKG_WORK}/$S/${name} || exit 1
+ tmpfile="${OPENPKG_TEMP}/${name}${GUID}"
+ haverelease=`${EGREP} <${name}.spec '^Release:'`
+ havebprereq=`${EGREP} <${name}.spec '^BuildPreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
+ haverprereq=`${EGREP} <${name}.spec '^PreReq:
.*openpkg *>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
+ cvs -d ${OPENPKG_REPO} co -p -r1
"${OPENPKG_RMOD}/${name}/${name}.spec" >${tmpfile} 2>/dev/null
+ joinrelease=`${EGREP} <${tmpfile} '^Release: '`
+ joinversion=`${EGREP} <${tmpfile} '^Version: '`
+ joinbprereq=`${EGREP} <${tmpfile} '^BuildPreReq: .*openpkg
*>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
+ joinrprereq=`${EGREP} <${tmpfile} '^PreReq: .*openpkg
*>= *' | sed -e 's;^.*openpkg *>= *;;' -e 's;,* .*$;;'`
+ sed <${name}.spec >${name}.spec.n \
+-e "s;^Release: .*$;$joinrelease;" \
+-e "s;^Version: .*$;$joinversion;" \
+-e "s;^\(BuildPreReq: .*openpkg *>=
*\)[^,]*\(.*\)$;\1$joinbprereq\2;" \
+-e "s;^\(PreReq: .*openpkg *>=
*\)[^,]*\(.*\)$;\1$joinrprereq\2;" \
+&& mv ${name}.spec.n ${name}.spec
+ cvs update -j1
+ sed <${name}.spec >${name}.spec.n \
+-e "s;^Release: .*;$haverelease;" \
+-e "s;^\(BuildPreReq: .*openpkg *>=
*\)[^,]*\(.*\)$;\1$havebprereq\2;" \
+-e "s;^\(PreReq: .*openpkg *>=
*\)[^,]*\(.*\)$;\1$haverprereq\2;" \
+&& mv ${name}.spec.n ${name}.spec
+ command rm ${tmpfile}
+)
+fi
done
else
echo "++ updating ${OPENPKG_REPO}/{adm,doc,re,src.*,web,tools}"
@@ -2801,7 +2831,7 @@
\$ openpkg dev test# [[spec]...] run
functional test (reserved for future use)
\$ openpkg dev tools # [path] tools to
run (default to instance internals)
\$ openpkg dev track # [[spec]...] track
version
-\$ openpkg dev update # [[spec]...] [-f] update
files in specdir or full update from CVS
+\$ openpkg dev update # [[spec]...] [-f][-j] update
specs (full) (join to HEAD)
\$ openpkg dev vim # [[spec]...] [-f] spec edit
and lint (if HEAD or forced)
EOF
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Oct-2005 21:24:32
Branch: HEAD Handle: 2005101220243100
Modified files:
openpkg-tools/cmd dev.sh
Log:
add capability to wipe out replaced source packages which change
vendor version after branch before release (assumes user has enough
karma on server)
Summary:
RevisionChanges Path
1.69+20 -0 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.68 -r1.69 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Oct 2005 19:24:26 - 1.68
+++ openpkg-tools/cmd/dev.sh 12 Oct 2005 19:24:31 - 1.69
@@ -641,6 +641,7 @@
fi
rpm_release_req=""
upload=""
+rpmwipe=""
if [ ".${BRANCH}" = .HEAD ]; then
rpm_release_req=`date '+%Y%m%d'`
upload="current/SRC"
@@ -658,6 +659,8 @@
echo "++ detected post-branch pre-release engineering phase
- keep zero update number"
rpm_release_req="${OPMAJORV}.${OPMINORV}.0"
upload="release/${OPMAJORV}.${OPMINORV}/SRC"
+rpmwipe="${name}-${rpm_version_old}-${rpm_release_old}"
+[ ".${rpmfile}" = ".${rpmwipe}" ] && rpmwipe=""
else
update=`expr ${update} + 1`
rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
@@ -1618,6 +1621,7 @@
bundle=1
bundle_files=""
bundle_srpms=""
+bundle_wipes=""
bundle_msg=""
if [ -f "${msg}" ]; then
bundle_msg="-F \"${msg}\""
@@ -1721,6 +1725,7 @@
fi
area=`echo ${OPENPKG_DIST}/${upload}/ | sed -e 's;[EMAIL
PROTECTED]:/;OpenPKG ;'`
+uath=`echo ${OPENPKG_DIST} | sed -e 's;:.*$;;'`
dist=`echo ${OPENPKG_DIST} | sed -e 's;^.*:;;'`
exts="${ext}"
if [ ".${name}" = .openpkg ]; then
@@ -1733,11 +1738,20 @@
echo "++ releasing ${rpmfile}.${ext} to distribution area
${area}"
if [ ${bundle} -eq 1 ]; then
bundle_srpms="${bundle_srpms}
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}"
+if [ ".${rpmwipe}" != . ]; then
+bundle_wipes="${bundle_wipes}
${OPENPKG_WORK}/pkg/src/${rpmwipe}.${ext}"
+fi
elif [ ${dry} -eq 0 ]; then
chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
+if [ ".${rpmwipe}" != . ]; then
+echo "rm ${dist}/${upload}/${rpmwipe}.${ext}" | sftp
$uath
+fi
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}"
+if [ ".${rpmwipe}" != . ]; then
+echo "echo \"rm
${dist}/${upload}/${rpmwipe}.${ext}\" | sftp $uath"
+fi
echo "scp -o \"Compression no\" -o \"Cipher blowfish\"
\"${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}\" \"${OPENPKG_DIST}/${upload}/\""
fi
done
@@ -1846,10 +1860,16 @@
builtin cd "${OPENPKG_WORK}" || die "cannot cd to ${OPENPKG_WORK}"
if [ ${dry} -eq 0 ]; then
chmod 664 ${bundle_srpms}
+if [ ".${bundle_wipes}" != . ]; then
+echo "rm ${bundle_wipes}" | sftp $uath
+fi
scp -o "Compression no" -o "Cipher blowfish" ${bundle_srpms}
${OPENPKG_DIST}/${upload}/
eval "cvs -d ${OPENPKG_REPO} commit ${bundle_msg}
${bundle_files}"
else
echo chmod 664 ${bundle_srpms}
+if [ ".${bundle_wipes}" != . ]; then
+echo "echo \"rm ${bundle_wipes}\" | sftp $uath"
+fi
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}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Oct-2005 21:24:26
Branch: HEAD Handle: 2005101220242600
Modified files:
openpkg-tools/cmd dev.sh
Log:
consolidate .src.sh handling for openpkg package with usual .src.rpm
handling using a loop
Summary:
RevisionChanges Path
1.68+17 -22 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.67 -r1.68 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Oct 2005 19:22:31 - 1.67
+++ openpkg-tools/cmd/dev.sh 12 Oct 2005 19:24:26 - 1.68
@@ -1720,32 +1720,27 @@
fi
fi
-area=`echo ${OPENPKG_DIST}/${upload} | sed -e 's;[EMAIL
PROTECTED]:/;OpenPKG ;'`
-echo "++ releasing ${rpmfile}.${ext} to distribution area
${area}"
-if [ ${bundle} -eq 1 ]; then
-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"
${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\"
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext} ${OPENPKG_DIST}/${upload}/"
-fi
-
+area=`echo ${OPENPKG_DIST}/${upload}/ | sed -e 's;[EMAIL
PROTECTED]:/;OpenPKG ;'`
+dist=`echo ${OPENPKG_DIST} | sed -e 's;^.*:;;'`
+exts="${ext}"
if [ ".${name}" = .openpkg ]; then
-if [ -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh" ]; then
-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 -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\" ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh ${OPENPKG_DIST}/${upload}/"
-fi
-else
+if [ ! -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh" ]; then
die "required file
${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh missing"
fi
+exts="${exts} src.sh"
fi
+for ext in $exts; do
+echo "++ releasing ${rpmfile}.${ext} to distribution area
${area}"
+if [ ${bundle} -eq 1 ]; then
+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"
"${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\"
\"${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}\" \"${OPENPKG_DIST}/${upload}/\""
+fi
+done
echo "++ determining commit message"
if [ ".$msg" = . ]; then
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Oct-2005 21:22:31
Branch: HEAD Handle: 2005101220223100
Modified files:
openpkg-tools/cmd dev.sh
Log:
consistently omit leading and trailing slashes from path elements and
explicitly add slashes when using those elements
Summary:
RevisionChanges Path
1.67+10 -10 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.66 -r1.67 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Oct 2005 19:22:26 - 1.66
+++ openpkg-tools/cmd/dev.sh 12 Oct 2005 19:22:31 - 1.67
@@ -60,7 +60,7 @@
OPENPKG_MODE=developer
[EMAIL PROTECTED]:/v/openpkg/cvs
OPENPKG_RMOD=openpkg-src
-[EMAIL PROTECTED]:/
+[EMAIL PROTECTED]:
;;
* )
OPENPKG_MODE=contributor
@@ -643,11 +643,11 @@
upload=""
if [ ".${BRANCH}" = .HEAD ]; then
rpm_release_req=`date '+%Y%m%d'`
-upload="current/SRC/"
+upload="current/SRC"
fi
if [ ".${BRANCH}" = .STABLE ]; then
rpm_release_req="${OPMAJORV}.`date '+%Y%m%d'`"
-upload="stable/${OPMAJORV}/SRC/"
+upload="stable/${OPMAJORV}/SRC"
fi
if [ ".${BRANCH}" = .SOLID ]; then
update=`echo ${rpm_release_old} | sed -e 's;^.*\.;;'`
@@ -657,16 +657,16 @@
if [ ".${cvs_release}" = . ]; then
echo "++ detected post-branch pre-release engineering phase
- keep zero update number"
rpm_release_req="${OPMAJORV}.${OPMINORV}.0"
-upload="release/${OPMAJORV}.${OPMINORV}/SRC/"
+upload="release/${OPMAJORV}.${OPMINORV}/SRC"
else
update=`expr ${update} + 1`
rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
-upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
+upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD"
fi
else
update=`expr ${update} + 1`
rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
-upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
+upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD"
fi
fi
}
@@ -1729,7 +1729,7 @@
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\"
${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
@@ -1740,7 +1740,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\" ${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"
@@ -1851,11 +1851,11 @@
builtin cd "${OPENPKG_WORK}" || die "cannot cd to ${OPENPKG_WORK}"
if [ ${dry} -eq 0 ]; then
chmod 664 ${bundle_srpms}
-scp -o "Compression no" -o "Cipher blowfish" ${bundle_srpms}
${OPENPKG_DIST}/${upload}
+scp -o "Compression no" -o "Cipher blowfish" ${bundle_srpms}
${OPENPKG_DIST}/${upload}/
eval "cvs -d ${OPENPKG_REPO} commit ${bundle_msg}
${bundle_files}"
else
echo chmod 664 ${bundle_srpms}
-echo "scp -o \"Compression no\" -o \"Cipher blowfish\"
${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 ${OPENP
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Oct-2005 21:22:26
Branch: HEAD Handle: 2005101220222600
Modified files:
openpkg-tools/cmd dev.sh
Log:
improve quoting so dry run output can be copied and pasted into shell
Summary:
RevisionChanges Path
1.66+3 -3 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.65 -r1.66 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Oct 2005 19:22:20 - 1.65
+++ openpkg-tools/cmd/dev.sh 12 Oct 2005 19:22:26 - 1.66
@@ -1729,7 +1729,7 @@
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"
${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
@@ -1740,7 +1740,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"
${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"
@@ -1855,7 +1855,7 @@
eval "cvs -d ${OPENPKG_REPO} commit ${bundle_msg}
${bundle_files}"
else
echo chmod 664 ${bundle_srpms}
-echo scp -o "Compression no" -o "Cipher blowfish"
${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}
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Oct-2005 21:22:20
Branch: HEAD Handle: 2005101220222000
Modified files:
openpkg-tools/cmd dev.sh
Log:
add missing chmod(1) output when dry run
Summary:
RevisionChanges Path
1.65+1 -0 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.64 -r1.65 dev.sh
--- openpkg-tools/cmd/dev.sh 11 Oct 2005 21:46:59 - 1.64
+++ openpkg-tools/cmd/dev.sh 12 Oct 2005 19:22:20 - 1.65
@@ -1854,6 +1854,7 @@
scp -o "Compression no" -o "Cipher blowfish" ${bundle_srpms}
${OPENPKG_DIST}/${upload}
eval "cvs -d ${OPENPKG_REPO} commit ${bundle_msg}
${bundle_files}"
else
+echo chmod 664 ${bundle_srpms}
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}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 11-Oct-2005 23:46:59
Branch: HEAD Handle: 2005101122465900
Modified files:
openpkg-tools/cmd dev.sh
Log:
detected and handle post-branch pre-release engineering phase
Summary:
RevisionChanges Path
1.64+14 -4 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.63 -r1.64 dev.sh
--- openpkg-tools/cmd/dev.sh 11 Oct 2005 20:37:07 - 1.63
+++ openpkg-tools/cmd/dev.sh 11 Oct 2005 21:46:59 - 1.64
@@ -651,13 +651,23 @@
fi
if [ ".${BRANCH}" = .SOLID ]; then
update=`echo ${rpm_release_old} | sed -e 's;^.*\.;;'`
-if [ ".${update}" = . ]; then
-update=0
+if [ ".${update}" = .0 ]; then
+RELEASE=`echo "$B" | sed -e 's;_SOLID$;_RELEASE;'`
+cvs_release=`builtin cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO}
log -r${cvs_rev} $S/${name}/${name}.spec 2>/dev/null | fgrep $RELEASE`
+if [ ".${cvs_release}" = . ]; then
+echo "++ detected post-branch pre-release engineering phase
- keep zero update number"
+rpm_release_req="${OPMAJORV}.${OPMINORV}.0"
+upload="release/${OPMAJORV}.${OPMINORV}/SRC/"
+else
+update=`expr ${update} + 1`
+rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
+upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
+fi
else
update=`expr ${update} + 1`
+rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
+upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
fi
-rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
-upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
fi
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-toolsDate: 11-Oct-2005 22:37:07 Branch: HEAD Handle: 2005101121370700 Modified files: openpkg-tools/cmd dev.sh Log: change default from hard-coded instances to automatic detection of suitable instance(s) Summary: RevisionChanges Path 1.63+2 -1 openpkg-tools/cmd/dev.sh patch -p0 <<'@@ .' Index: openpkg-tools/cmd/dev.sh $ cvs diff -u -r1.62 -r1.63 dev.sh --- openpkg-tools/cmd/dev.sh 11 Oct 2005 16:11:24 - 1.62 +++ openpkg-tools/cmd/dev.sh 11 Oct 2005 20:37:07 - 1.63 @@ -50,7 +50,8 @@ export OPENPKG_ARGS # default configuration -OPENPKG_INST="/openpkg-dev /openpkg-22 /openpkg-21 /openpkg-20" +OPENPKG_INST=`grep /openpkg
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 11-Oct-2005 18:11:25
Branch: HEAD Handle: 2005101117112400
Modified files:
openpkg-tools/cmd dev.sh
Log:
prevent race condition where temporary .bashrc files overwrite each
other when "openpkg dev" is launched simultaneously on multiple host
using shared OPENPKG_WORK dir
Summary:
RevisionChanges Path
1.62+37 -36 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.61 -r1.62 dev.sh
--- openpkg-tools/cmd/dev.sh 10 Oct 2005 10:00:51 - 1.61
+++ openpkg-tools/cmd/dev.sh 11 Oct 2005 16:11:24 - 1.62
@@ -1396,9 +1396,6 @@
[ ".$4" != . ] && openpkg_dev_tools "$4"
[ ".$5" != . ] && openpkg_dev_src "$5"
cd
-
-# self destruction
-command rm ${OPENPKG_WORK}/.bashrc
}
bash () {
@@ -1437,37 +1434,37 @@
T="${RV}"
fi
-# create a .bashrc
- >.bashrc
-dumpfunc -i bashrcprolog>>.bashrc
-dumpfuncwarn>>.bashrc
-dumpfuncerror >>.bashrc
-dumpfuncmakedir >>.bashrc
-dumpfuncuwhich >>.bashrc
-dumpfuncinitmpx >>.bashrc
-dumpfuncopenpkgi>>.bashrc
-dumpfuncopenpkgE>>.bashrc
-dumpfuncopenpkgT>>.bashrc
-dumpfuncopenpkg >>.bashrc
-dumpfuncrpmi>>.bashrc
-dumpfuncrpmE>>.bashrc
-dumpfuncrpmT>>.bashrc
-dumpfuncrpm >>.bashrc
-dumpfuncrpm2cpioi >>.bashrc
-dumpfuncrpm2cpioE >>.bashrc
-dumpfuncrpm2cpioT >>.bashrc
-dumpfuncrpm2cpio>>.bashrc
-dumpfuncopenpkg_dev_package >>.bashrc
-dumpfuncopenpkg_dev_branch >>.bashrc
-dumpfuncopenpkg_dev_execute >>.bashrc
-dumpfuncopenpkg_dev_tools >>.bashrc
-dumpfuncopenpkg_dev_srcdir >>.bashrc
-dumpfunc_arg2sh >>.bashrc
-dumpfunc_env2sh >>.bashrc
-dumpfunc_root >>.bashrc
-dumpfuncroot>>.bashrc
-dumpfunccvs >>.bashrc
-dumpfunc -i bashrcepilog>>.bashrc
+# create a unique .bashrc
+ >.bashrc${GUID}
+dumpfunc -i bashrcprolog>>.bashrc${GUID}
+dumpfuncwarn>>.bashrc${GUID}
+dumpfuncerror >>.bashrc${GUID}
+dumpfuncmakedir >>.bashrc${GUID}
+dumpfuncuwhich >>.bashrc${GUID}
+dumpfuncinitmpx >>.bashrc${GUID}
+dumpfuncopenpkgi>>.bashrc${GUID}
+dumpfuncopenpkgE>>.bashrc${GUID}
+dumpfuncopenpkgT>>.bashrc${GUID}
+dumpfuncopenpkg >>.bashrc${GUID}
+dumpfuncrpmi>>.bashrc${GUID}
+dumpfuncrpmE>>.bashrc${GUID}
+dumpfuncrpmT>>.bashrc${GUID}
+dumpfuncrpm >>.bashrc${GUID}
+dumpfuncrpm2cpioi >>.bashrc${GUID}
+dumpfuncrpm2cpioE >>.bashrc${GUID}
+dumpfuncrpm2cpioT >>.bashrc${GUID}
+dumpfuncrpm2cpio>>.bashrc${GUID}
+dumpfuncopenpkg_dev_package >>.bashrc${GUID}
+dumpfuncopenpkg_dev_branch >>.bashrc${GUID}
+dumpfuncopenpkg_dev_execute >>.bashrc${GUID}
+dumpfuncopenpkg_dev_tools >>.bashrc${GUID}
+dumpfuncopenpkg_dev_srcdir >>.bashrc${GUID}
+dumpfunc_arg2sh >>.bashrc${GUID}
+dumpfunc_env2sh >>.bashrc${GUID}
+dumpfunc_root >>.bashrc${GUID}
+dumpfuncroot>>.bashrc${GUID}
+dumpfunccvs >>.bashrc${GUID}
+dumpfunc -i bashrcepilog>>.bashrc${GUID}
# make sure temporary area exists
if [ ! -d ${OPENPKG_TEMP} ]; then
@@ -1488,7 +1485,8 @@
# enter environment
echo "++ entering OpenPKG development shell (mode:
[1m${OPENPKG_MODE}[m)"
-${bash} --rcfile .bashrc
+${bash} --rcfile .bashrc${GUID}
+command rm .bashrc${GUID}
echo "++ leaving Ope
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 10-Oct-2005 12:00:52
Branch: HEAD Handle: 2005101011005100
Modified files:
openpkg-tools/cmd dev.sh
Log:
add a "erase" command to "openpkg dev" to ease privilege handling
(like "install" does)
Summary:
RevisionChanges Path
1.61+50 -0 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.60 -r1.61 dev.sh
--- openpkg-tools/cmd/dev.sh 10 Oct 2005 09:58:53 - 1.60
+++ openpkg-tools/cmd/dev.sh 10 Oct 2005 10:00:51 - 1.61
@@ -2045,6 +2045,54 @@
done
}
+erase () {
+force=0
+packages=""
+while [ ".$1" != . ]; do
+case ".$1" in
+.-f ) force=1 ;;
+ * ) packages="${packages} $1"
+esac
+shift
+done
+if [ ".${packages}" = . ]; then
+if [ ".$P" = . ]; then
+die "package cannot be identified. Neither parameter given nor
\$P set."
+fi
+all="$P"
+else
+all="${packages}"
+fi
+erasethem=""
+for name in $all; do
+rpmE -q $name >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+warn "nothing to erase for $name"
+else
+erasethem="$erasethem${erasethem:+ }$name"
+fi
+done
+if [ ".$erasethem" != . ]; then
+if [ ".$HOSTNAME" = . ]; then
+HOSTNAME=`hostname`
+fi
+initmpx $E
+if [ $force -ne 0 ]; then
+echo "++ erasing $erasethem forced"
+ssh -t -x "[EMAIL PROTECTED]" ${RPMCMD} -e "$erasethem" --nodeps
+else
+echo "++ erasing $erasethem"
+ssh -t -x "[EMAIL PROTECTED]" ${RPMCMD} -e "$erasethem"
+fi
+for name in $erasethem; do
+rpmE -q $name >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+error "failed to erase $name"
+fi
+done
+fi
+}
+
install () {
force=0
packages=""
@@ -2707,6 +2755,7 @@
\$ openpkg dev build # [[spec]...] [-f][-f][-D with...] build a
package (force, option)
\$ openpkg dev clean # [-l][-t][-f] [[spec]...] clean logs
and/or temp (force all)
\$ openpkg dev diff# alias for
"release -dry"
+\$ openpkg dev erase # [[spec]...] [-f] erase a
package (forcibly)
\$ openpkg dev execute # [exec] execute
command on instance closest to branch
\$ openpkg dev fetch # [[spec]...] [-s][-a] fetch
sources; clean selected or all dst files
\$ openpkg dev help# display
this command summary and update 00README
@@ -2781,6 +2830,7 @@
build | bu* ) cmd="build" ;;
clean | cl* ) cmd="clean" ;;
diff| di* ) cmd="diff";;
+erase | er* ) cmd="erase" ;;
execute | ex* ) cmd="execute" ;;
fetch | fe* ) cmd="fetch" ;;
help| he* ) cmd="help";;
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 10-Oct-2005 11:58:53
Branch: HEAD Handle: 2005101010585300
Modified files:
openpkg-tools/cmd dev.sh
Log:
Change cleanup handling of logs and temp based on Steve's feedback.
Short: now "install" cleans local logs and temp from all but the
current package, "clean -a" cleans all logs and local temp.
Long: usually multiple packages are given to "install" to satisfy
build dependencies of the current package and the developer has
little interest in the resulting logs and temp. However, the
information about the current package might be useful when runtime
testing reveals problems. So it is kept now.
A "release" assumes a milestone in development is reached and
cleans all logs and local temp (it cannot access remote temp) for
the packages listed.
A "clean" works orthogonal to related commands and cleans local
logs and local temp (it cannot access remote temp) for the
packages listed, keeping logs from other hosts where work mighth
still in progress. Along with -l it discards all logs for all
packages, with -t it discards all contents of the local temp
directory and -f does both.
The result is a compromise between keeping useful information as
long as possible while saving disk space.
Summary:
RevisionChanges Path
1.60+49 -13 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.59 -r1.60 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Aug 2005 20:29:38 - 1.59
+++ openpkg-tools/cmd/dev.sh 10 Oct 2005 09:58:53 - 1.60
@@ -1864,15 +1864,49 @@
}
clean () {
-echo "++ cleaning up logs ${OPENPKG_WORK}/$S"
-rm ${OPENPKG_WORK}/$S/*/[EMAIL PROTECTED] >/dev/null 2>&1 || true
-case ${OPENPKG_TEMP} in
-/?* ) ;;
- * ) die "temporary area ${OPENPKG_TEMP} seems to be strange" ;;
-esac
-if [ -d ${OPENPKG_TEMP} ]; then
-echo "++ cleaning temporary area ${OPENPKG_TEMP}"
-rm -rf ${OPENPKG_TEMP}/* ${OPENPKG_TEMP}/.[a-z]* >/dev/null 2>&1 ||
true
+cleanlogs=0
+cleantemp=0
+force=0
+packages=""
+while [ ".$1" != . ]; do
+case ".$1" in
+ .-l ) cleanlogs=1 ;;
+ .-t ) cleantemp=1 ;;
+ .-f ) force=1 ;;
+ .-* ) die "unsupported option \"$1\"." ;;
+ * ) packages="${packages} $1"
+esac
+shift
+done
+
+if [ $force -eq 1 -o $cleanlogs -eq 1 ]; then
+echo "++ cleaning up all logs in ${OPENPKG_WORK}/$S"
+rm ${OPENPKG_WORK}/$S/*/[EMAIL PROTECTED] >/dev/null 2>&1 || true
+fi
+if [ $force -eq 1 -o $cleantemp -eq 1 ]; then
+case ${OPENPKG_TEMP} in
+/?* ) ;;
+ * ) die "temporary area ${OPENPKG_TEMP} seems to be strange" ;;
+esac
+if [ -d ${OPENPKG_TEMP} ]; then
+echo "++ cleaning temporary area ${OPENPKG_TEMP}"
+rm -rf ${OPENPKG_TEMP}/* ${OPENPKG_TEMP}/.[a-z]* >/dev/null 2>&1
|| true
+fi
+fi
+if [ $force -eq 0 -a $cleanlogs -eq 0 -a $cleantemp -eq 0 ]; then
+if [ ".${packages}" = . ]; then
+if [ ".$P" = . ]; then
+die "package cannot be identified. Neither parameter given
nor \$P set."
+fi
+all="$P"
+else
+all="${packages}"
+fi
+for name in $all; do
+echo "++ cleaning up sources and logs for ${name}"
+rpmE --clean --nodeps ${OPENPKG_WORK}/$S/${name}/${name}.spec
>/dev/null 2>&1 || true
+rm ${OPENPKG_WORK}/$S/${name}/[EMAIL PROTECTED] >/dev/null 2>&1
|| true
+done
fi
}
@@ -2060,9 +2094,11 @@
if [ $? -ne 0 ]; then
warn "failed to install $package"
fi
-echo "++ cleaning up sources and logs"
-rpmE --clean --nodeps ${OPENPKG_WORK}/$S/${name}/${name}.spec
>/dev/null 2>&1 || true
-rm ${OPENPKG_WORK}/$S/${name}/[EMAIL PROTECTED] >/dev/null 2>&1 ||
true
+if [ ".${name}" != ".$P" ]; then
+echo "++ cleaning up sources and logs for ${name}"
+rpmE --clean --nodeps ${OPENPKG_WORK}/$S/${name}/${name}.spec
>/dev/null 2>&1 || true
+rm ${OPENPKG_WORK}/$S/${name}/[EMAIL PROTECTED] >/dev/null 2>&1
|| true
+fi
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Aug-2005 22:29:38
Branch: HEAD Handle: 2005081221293800
Modified files:
openpkg-tools/cmd dev.sh
Log:
"openpkg dev" now knows how to build the .src.sh of the openpkg
bootstrap package
Summary:
RevisionChanges Path
1.59+6 -0 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.58 -r1.59 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Aug 2005 11:34:27 - 1.58
+++ openpkg-tools/cmd/dev.sh 12 Aug 2005 20:29:38 - 1.59
@@ -2149,6 +2149,9 @@
warn "failed to build $package ($rpmfile)"
continue
fi
+if [ ".${name}" = .openpkg ]; then
+(builtin cd ${OPENPKG_WORK}/$S/${name} && eval
"./openpkg.boot -s" 2>&1 | tee -a [EMAIL PROTECTED])
+fi
fi
done
}
@@ -2221,6 +2224,9 @@
opt="`echo ${opt} | tr ' ' '\n' | ${EGREP} . | sed -e 's;^;--define
\";' -e 's;=; ;' -e 's;$;\";' | tr '\n' ' '`"
(builtin cd ${OPENPKG_WORK}/$S/${name} && eval "rpmE ${rpmbuild}
${shortcircuit} ${opt} ${name}.spec" 2>&1 | tee -a [EMAIL PROTECTED])
+if [ ".$rpmbuild" = .-bs -a ".${name}" = .openpkg ]; then
+(builtin cd ${OPENPKG_WORK}/$S/${name} && eval "./openpkg.boot
-s" 2>&1 | tee -a [EMAIL PROTECTED])
+fi
done
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Aug-2005 13:34:27
Branch: HEAD Handle: 2005081212342700
Modified files:
openpkg-tools/cmd dev.sh
Log:
prohibit use of "rpm --recompile" inside development shell (equally
evil as --rebuild)
Summary:
RevisionChanges Path
1.58+1 -0 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.57 -r1.58 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Aug 2005 09:56:32 - 1.57
+++ openpkg-tools/cmd/dev.sh 12 Aug 2005 11:34:27 - 1.58
@@ -320,6 +320,7 @@
for e in "$@"; do
case $e in
--rebuild) error "$0:ERROR: use of \"rpm --rebuild\" is
disabled here to avoid destruction"; return 1 ;;
+--recompile) error "$0:ERROR: use of \"rpm --recompile\" is
disabled here to avoid destruction"; return 1 ;;
esac
done
if [ ".${RPMCMD}" = . ]; then
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Aug-2005 11:56:33
Branch: HEAD Handle: 2005081210563200
Modified files:
openpkg-tools/cmd dev.sh
Log:
add a convenient "openpkg dev" like option interface for running
various "rpm -b*" build instructions
Summary:
RevisionChanges Path
1.57+104 -2 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.56 -r1.57 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Aug 2005 06:45:29 - 1.56
+++ openpkg-tools/cmd/dev.sh 12 Aug 2005 09:56:32 - 1.57
@@ -2152,6 +2152,98 @@
done
}
+rpmbuildconvenience () {
+
+rpmbuild="$1"; shift
+
+force=0
+shortcircuit=""
+packages=""
+defall=""
+defpkg=""
+while [ ".$1" != . ]; do
+case ".$1" in
+.-D ) shift
+ opt="$1"
+ pkg=""; echo "${opt}" | ${EGREP} '::' >/dev/null 2>&1 &&
pkg="`echo ${opt} | sed -e 's;::.*$;;'`"
+ opt="`echo ${opt} | sed -e 's;^.*::;;'`"
+ echo "${opt}" | ${EGREP} '^with_' >/dev/null 2>&1 ||
opt="with_${opt}"
+ echo "${opt}" | ${EGREP} '=' >/dev/null 2>&1 ||
opt="${opt}=yes"
+ if [ ".${pkg}" = . ]; then
+ defall="${defall} ${opt}"
+ else
+ defpkg="${defpkg} ${pkg}::${opt}"
+ fi
+ ;;
+.-f ) force=1 ;;
+.-s ) shortcircuit="--short-circuit" ;;
+.-* ) die "unsupported option \"$1\"." ;;
+ * ) packages="${packages} $1"
+esac
+shift
+done
+
+if [ ".${packages}" = . ]; then
+if [ ".$P" = . ]; then
+die "package cannot be identified. Neither parameter given nor
\$P set."
+fi
+all="$P"
+else
+all="${packages}"
+fi
+for name in $all; do
+opt="`echo ${defpkg} | tr ' ' '\n' | ${EGREP} ^$name:: | sed
's;^.*::;;' | tr '\n' ' '`"
+opt="`echo ${opt} $defall`"
+echo "++ processing ${name} ${opt}"
+if [ ! -f "${OPENPKG_WORK}/$S/${name}/${name}.spec" ]; then
+warn "${OPENPKG_WORK}/$S/${name}/${name}.spec not found"
+continue
+fi
+
+logfile="${OPENPKG_WORK}/$S/${name}/[EMAIL PROTECTED]"
+if [ -f "$logfile" ]; then
+trim="TRUNC"
+if [ ".$shortcircuit" != . ]; then
+case ".$rpmbuild" in
+.-bc ) trim="build" ;;
+.-bi ) trim="install" ;;
+.-bb ) trim="KEEP" ;;
+.-bs ) trim="KEEP" ;;
+esac
+fi
+if [ ".$trim" = .TRUNC ]; then
+>$logfile
+elif [ ".$trim" != .KEEP ]; then
+sed -e "/^Executing(%${trim})/,\$d" <$logfile >$logfile.n &&
mv $logfile.n $logfile
+fi
+fi
+
+opt="`echo ${opt} | tr ' ' '\n' | ${EGREP} . | sed -e 's;^;--define
\";' -e 's;=; ;' -e 's;$;\";' | tr '\n' ' '`"
+(builtin cd ${OPENPKG_WORK}/$S/${name} && eval "rpmE ${rpmbuild}
${shortcircuit} ${opt} ${name}.spec" 2>&1 | tee -a [EMAIL PROTECTED])
+done
+}
+
+bbinary () {
+rpmbuildconvenience -bb "$@"
+}
+
+bcompile () {
+rpmbuildconvenience -bc "$@"
+}
+
+binstall () {
+rpmbuildconvenience -bi "$@"
+}
+
+bprep () {
+rpmbuildconvenience -bp "$@"
+}
+
+bsource () {
+rpmbuildconvenience -bs "$@"
+}
+
+
logview () {
packages=""
while [ ".$1" != . ]; do
@@ -2563,12 +2655,17 @@
cmds and parameters
\$ openpkg dev bash# [[[spec]ctag]exec] enter
development environment
-\$ openpkg dev build # [[spec]...] [-f] [-D with...]build a
package (forcibly) (with option)
+\$ openpkg dev bbinary # [[spec]...] [-f][-s][-D with...] rpmE -bb
[--short-circuit] spec (force, opt)
+\$ openpkg dev bcompile# [[spec]...] [-f][-s][-D with...] rpmE -bc
[--short-circuit] spec (force, opt)
+\$ openpkg dev binstall# [[spec]...] [-f][-s][-D with...] rpmE -bi
[--short-circuit] spec (force, opt)
+\$ openpkg
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Aug-2005 08:45:29
Branch: HEAD Handle: 2005081207452900
Modified files:
openpkg-tools/cmd dev.sh
Log:
whitespace cosmetics - get rid of tabs and trailing spaces
Summary:
RevisionChanges Path
1.56+30 -30 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.55 -r1.56 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Aug 2005 06:43:29 - 1.55
+++ openpkg-tools/cmd/dev.sh 12 Aug 2005 06:45:29 - 1.56
@@ -321,7 +321,7 @@
case $e in
--rebuild) error "$0:ERROR: use of \"rpm --rebuild\" is
disabled here to avoid destruction"; return 1 ;;
esac
-done
+done
if [ ".${RPMCMD}" = . ]; then
error "$0:ERROR: no openpkg rpm found at instance \"$E\""
return 1
@@ -505,7 +505,7 @@
if [ $# -eq 0 ]; then
set -- -i
fi
-
+
# parse command line options
local opt_i=no # interactive shell
local opt_l=no # last command-line
@@ -556,7 +556,7 @@
cmd=$(_arg2sh -t -- "${cmd}")
eval ${prolog}; ssh -t -q -x [EMAIL PROTECTED] ${SHELL} -c "${cmd}";
rv=$?; eval ${epilog}
-# exit with return value of remote command
+# exit with return value of remote command
return $rv
}
@@ -778,7 +778,7 @@
cvs -q -d "${OPENPKG_REPO}" checkout -d adm openpkg-adm
cvs -q -d "${OPENPKG_REPO}" checkout -d doc openpkg-doc
cvs -q -d "${OPENPKG_REPO}" checkout -d reopenpkg-re
- cvs -q -d "${OPENPKG_REPO}" checkout -d web openpkg-web
+ cvs -q -d "${OPENPKG_REPO}" checkout -d web openpkg-web
cvs -q -d "${OPENPKG_REPO}" checkout -d tools openpkg-tools
if [ ".${B:-HEAD}" = .HEAD ]; then
cvs -q -d "${OPENPKG_REPO}" checkout -d src "${OPENPKG_RMOD}"
@@ -2562,33 +2562,33 @@
cmds and parameters
-\$ openpkg dev bash# [[[spec]ctag]exec]enter
development environment
-\$ openpkg dev build # [[spec]...] [-f] [-D with...] build a
package (forcibly) (with option)
-\$ openpkg dev branch # [ctag]switch to a
different branch
-\$ openpkg dev clean # clean the
temporary area
-\$ openpkg dev diff# alias for
"release -dry"
-\$ openpkg dev execute # [exec]execute
command on instance closest to branch
-\$ openpkg dev fetch # [[spec]...] [-s] [-a] fetch
sources; clean selected or all dst files
-\$ openpkg dev help# display this
command summary and update 00README
-\$ openpkg dev install # [[spec]...] [-f] install a
package (forcibly), build if required
-\$ openpkg dev kill# kill the
environment
-\$ openpkg dev lint# [spec|file|path]...] [-f] lint package
specification
-\$ openpkg dev list# [[spec]...] list source
and binary packages
-\$ openpkg dev logview # [[spec]...] view build
logs
-\$ openpkg dev new # spec... [-dry]create new
package from scratch
-\$ openpkg dev package # [spec]switch to a
different package
-\$ openpkg dev peek# [[spec]...] peek at file
list of binary package
-\$ openpkg dev query # matchinstance|canonifybranch query script
internals
-\$ openpkg dev release # [[spec]...] [-dry] [-m "msg"] release
package changes to master server
+\$ openpkg dev bash# [[[spec]ctag]exec] enter
development environment
+\$ openpkg dev build # [[spec]...] [-f] [-D with...]build a
package (forcibly) (with option)
+\$ openpkg dev branch # [ctag] switch to
a different branch
+\$ openpkg dev clean # clean the
temporary area
+\$ openpkg dev diff# alias for
"release -dry"
+\$ openpkg dev execute # [exec]
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Aug-2005 08:43:30
Branch: HEAD Handle: 2005081207432900
Modified files:
openpkg-tools/cmd dev.sh
Log:
"openpkg dev run" now accepting package list argument(s) and reads the
command from a -c option, enabling orthogonal behavior compared to
sibling subcommands
Summary:
RevisionChanges Path
1.55+8 -7 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.54 -r1.55 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Aug 2005 06:41:49 - 1.54
+++ openpkg-tools/cmd/dev.sh 12 Aug 2005 06:43:29 - 1.55
@@ -2334,21 +2334,21 @@
}
run () {
-# the last parameter is the command to execute
force=0
dry=0
packages=""
-while [ ".$2" != . ]; do
+while [ ".$1" != . ]; do
case ".$1" in
+.-c ) shift; cmd="$1" ;;
.-f ) force=1 ;;
.-dry ) dry=1 ;;
+ .-* ) die "unsupported option \"$1\"." ;;
* ) packages="${packages} $1"
esac
shift
done
-execute="$1"
-if [ ".${execute}" = . ]; then
+if [ ".${cmd}" = . ]; then
die "command for execution missing"
fi
@@ -2380,10 +2380,10 @@
for file in $files; do
echo "++ Running command for package specification: $file"
tmpfile="${OPENPKG_TEMP}/${GUID}"
-${AWK} -vexecute="$execute" -vfile="$file" <${file} >${tmpfile} '
+${AWK} -vcmd="$cmd" -vfile="$file" <${file} >${tmpfile} '
BEGIN { flag=0 }
/^%prep$/ { flag=1 }
-/^$/ { if (flag == 1) print ""execute" #"file; flag=0 }
+/^$/ { if (flag == 1) print ""cmd" #"file; flag=0 }
/.*/ { print $0 }'
if [ ${dry} -eq 0 ]; then
rpmE -bp ${tmpfile} --nodeps
@@ -2411,6 +2411,7 @@
.-a ) cleana=1 ;;
.-s ) cleans=1 ;;
.-f ) force=1 ;;
+ .-* ) die "unsupported option \"$1\"." ;;
* ) packages="${packages} $1"
esac
shift
@@ -2579,7 +2580,7 @@
\$ openpkg dev peek# [[spec]...] peek at file
list of binary package
\$ openpkg dev query # matchinstance|canonifybranch query script
internals
\$ openpkg dev release # [[spec]...] [-dry] [-m "msg"] release
package changes to master server
-\$ openpkg dev run # [[spec]...] [-dry] [-f] cmd append cmd to
%prep for spec and run rpm -bp
+\$ openpkg dev run # [[spec]...] [-dry] -c "cmd" [-f] append cmd
to %prep for spec and run rpm -bp
\$ openpkg dev search # [[spec]...] search a
package on master server
\$ openpkg dev setup # [[[spec]ctag]exec]initial setup
of openpkg dev working environment
\$ openpkg dev srcdir # [dir] use a
different source directory
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Aug-2005 08:41:49
Branch: HEAD Handle: 2005081207414900
Modified files:
openpkg-tools/cmd dev.sh
Log:
"openpkg dev track" now accepting package list argument(s), enabling
orthogonal behavior compared to sibling subcommands
Summary:
RevisionChanges Path
1.54+11 -1 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.53 -r1.54 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Aug 2005 06:40:56 - 1.53
+++ openpkg-tools/cmd/dev.sh 12 Aug 2005 06:41:49 - 1.54
@@ -2310,6 +2310,16 @@
track () {
rpmT --help | grep -- --track >/dev/null || die "${RPMCMD:-rpm} does not
support --track"
+
+packages=""
+while [ ".$1" != . ]; do
+case ".$1" in
+.-* ) die "unsupported option \"$1\"." ;;
+ * ) packages="${packages} $1"
+esac
+shift
+done
+
if [ ".${packages}" = . ]; then
if [ ".$P" = . ]; then
die "package cannot be identified. Neither parameter given nor
\$P set."
@@ -2319,7 +2329,7 @@
all="${packages}"
fi
for name in $all; do
-rpmT --track ${name}.spec
+(builtin cd ${OPENPKG_WORK}/$S/${name} && eval "rpmT --track
${name}.spec")
done
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Aug-2005 08:40:56
Branch: HEAD Handle: 2005081207405600
Modified files:
openpkg-tools/cmd dev.sh
Log:
Enable more "openpkg dev" subcommands to work from outside development
shell
Summary:
RevisionChanges Path
1.53+7 -7 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.52 -r1.53 dev.sh
--- openpkg-tools/cmd/dev.sh 11 Aug 2005 11:15:32 - 1.52
+++ openpkg-tools/cmd/dev.sh 12 Aug 2005 06:40:56 - 1.53
@@ -152,6 +152,13 @@
shift
done
+# set P,B,E,T,S without having "cd()" already in place
+[ ".$P" = . ] && P="${OPENPKG_SPEC}"
+[ ".$B" = . ] && B="${OPENPKG_CTAG}"
+[ ".$E" = . ] && E="${OPENPKG_EXEC}"
+[ ".$T" = . ] && T="${OPENPKG_TRUN}"
+[ ".$S" = . ] && S="${OPENPKG_SDIR}"
+
#
# dump a function (optionally only the inner code part)
@@ -669,13 +676,6 @@
matchinstance "${RV-HEAD}"
OPENPKG_EXEC="${RV}"
-# set P,B,E without having "cd()" already in place
-P="${OPENPKG_SPEC}"
-B="${OPENPKG_CTAG}"
-E="${OPENPKG_EXEC}"
-T="${OPENPKG_TRUN}"
-S="${OPENPKG_SDIR}"
-
# sanity check
case "${OPENPKG_WORK}" in
/?* ) ;;
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 11-Aug-2005 13:15:32
Branch: HEAD Handle: 2005081112153200
Modified files:
openpkg-tools/cmd dev.sh
Log:
automatically make sure commit message from file uses absolute path;
fix typo
Summary:
RevisionChanges Path
1.52+6 -1 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.51 -r1.52 dev.sh
--- openpkg-tools/cmd/dev.sh 11 Aug 2005 09:32:33 - 1.51
+++ openpkg-tools/cmd/dev.sh 11 Aug 2005 11:15:32 - 1.52
@@ -1593,6 +1593,11 @@
all="${packages}"
fi
+# make sure commit message from file uses absolute path
+if [ -f "${msg}" ]; then
+echo "${msg}" | ${EGREP} "^/" >/dev/null 2>&1 || msg="`pwd`/${msg}"
+fi
+
# determine whether CVS commit messages can be bundled
bundle=0
names=0
@@ -1762,7 +1767,7 @@
echo "++ determining commit file list"
files="$S/${name}"
-echo "++ comitting changes to CVS repository"
+echo "++ committing changes to CVS repository"
builtin cd "${OPENPKG_WORK}" || die "cannot cd to
${OPENPKG_WORK}"
if [ ".${msg}" != . -a -f "${msg}" ]; then
if [ ${bundle} -eq 1 ]; then
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 11-Aug-2005 11:32:34
Branch: HEAD Handle: 2005081110323300
Modified files:
openpkg-tools/cmd dev.sh
Log:
prohibit use of "cvs commit" inside development shell
Summary:
RevisionChanges Path
1.51+2 -0 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.50 -r1.51 dev.sh
--- openpkg-tools/cmd/dev.sh 10 Aug 2005 12:58:21 - 1.50
+++ openpkg-tools/cmd/dev.sh 11 Aug 2005 09:32:33 - 1.51
@@ -581,6 +581,8 @@
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" ;;
+com|commit) error "$0:ERROR: use of \"cvs commit\" is disabled
here, use \"opd release\""; return 1 ;;
+ci|checkin) error "$0:ERROR: use of \"cvs checkin\" is disabled
here, use \"opd release\""; return 1 ;;
esac
HOME=${OPENPKG_WORK} command cvs ${1+"$@"} | $cvs_colorize
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 10-Aug-2005 14:58:22
Branch: HEAD Handle: 2005081013582100
Modified files:
openpkg-tools/cmd dev.sh
Log:
prohibit use of "rpm --rebuild" inside development shell
Summary:
RevisionChanges Path
1.50+5 -0 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.49 -r1.50 dev.sh
--- openpkg-tools/cmd/dev.sh 10 Aug 2005 11:37:34 - 1.49
+++ openpkg-tools/cmd/dev.sh 10 Aug 2005 12:58:21 - 1.50
@@ -310,6 +310,11 @@
esac
elif [ ".$1" = .rpm ]; then
shift
+for e in "$@"; do
+case $e in
+--rebuild) error "$0:ERROR: use of \"rpm --rebuild\" is
disabled here to avoid destruction"; return 1 ;;
+esac
+done
if [ ".${RPMCMD}" = . ]; then
error "$0:ERROR: no openpkg rpm found at instance \"$E\""
return 1
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 10-Aug-2005 13:37:35
Branch: HEAD Handle: 2005081012373400
Modified files:
openpkg-tools/cmd dev.sh
Log:
openpkg.NET environment requires modification to initial .rpmmacros
Summary:
RevisionChanges Path
1.49+3 -3 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.48 -r1.49 dev.sh
--- openpkg-tools/cmd/dev.sh 10 Aug 2005 11:36:35 - 1.48
+++ openpkg-tools/cmd/dev.sh 10 Aug 2005 11:37:34 - 1.49
@@ -739,9 +739,9 @@
echo "%l_fetch_mirror_0
ftp://ftp.openpkg.org/sources/DST/%{name}/";
echo ""
echo "# use shared storage"
- echo "%_sourcedir /e/openpkg/DST/%{name}"
- echo "%_rpmdir /e/openpkg/PKG/bin"
- echo "%_srcrpmdir /e/openpkg/PKG/src"
+ echo "%_sourcedir /v/openpkg/DST/%{name}"
+ echo "%_rpmdir /v/openpkg/PKG/bin"
+ echo "%_srcrpmdir /v/openpkg/PKG/src"
) >>${OPENPKG_WORK}/.rpmmacros
if [ ! -d "${OPENPKG_WORK}/dst" ]; then
ln -s /v/openpkg/DST "${OPENPKG_WORK}/dst" || die "failed to
link to ${OPENPKG_WORK}/dst directory"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 10-Aug-2005 13:36:35
Branch: HEAD Handle: 2005081012363500
Modified files:
openpkg-tools/cmd dev.sh
Log:
proper identation
Summary:
RevisionChanges Path
1.48+21 -21 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.47 -r1.48 dev.sh
--- openpkg-tools/cmd/dev.sh 10 Aug 2005 11:35:47 - 1.47
+++ openpkg-tools/cmd/dev.sh 10 Aug 2005 11:36:35 - 1.48
@@ -2095,31 +2095,31 @@
fi
if [ $force -eq 0 ]; then
-echo "++ checking release header having format suitable for
automatic modification"
-${EGREP} '^Release: *((([0-9]\.)?[0-9]{8})|[0-9]+\.[0-9]+\.[0-9])$'
<${OPENPKG_WORK}/$S/${name}/${name}.spec >/dev/null
-if [ $? -eq 0 -a ".${OPENPKG_REPO}" = "[EMAIL
PROTECTED]:/v/openpkg/cvs" ]; then
-echo "++ checking whether release header was already modified"
-(builtin cd ${OPENPKG_WORK}/$S/${name} && command cvs 2>&1 diff
-u0 ${name}.spec) \
-| ${EGREP} '^[+-]Release: +' | wc -l | ${EGREP} '^ *2 *'
>/dev/null
-if [ $? -ne 0 ]; then
-echo "++ checking for local added, modified or removed files"
-(builtin cd ${OPENPKG_WORK}/$S/${name} && command cvs 2>&1
stat) \
-| ${EGREP} 'Status: *Locally' >/dev/null
-if [ $? -eq 0 ]; then
-_autorel
-if [ ".$rpm_release_req" = . ]; then
-die "cannot predict required release number for
branch $B"
-fi
-if [ ".$rpm_release_new" != ".$rpm_release_req" ]; then
-echo "++ modifying release number"
-( builtin cd ${OPENPKG_WORK}/$S/${name} \
- && sed -e "s;^\(Release:
*\).*$;\1$rpm_release_req;" <${name}.spec >${name}.spec.n; \
- mv ${name}.spec.n ${name}.spec)
+echo "++ checking release header having format suitable for
automatic modification"
+${EGREP} '^Release:
*((([0-9]\.)?[0-9]{8})|[0-9]+\.[0-9]+\.[0-9])$'
<${OPENPKG_WORK}/$S/${name}/${name}.spec >/dev/null
+if [ $? -eq 0 -a ".${OPENPKG_REPO}" = "[EMAIL
PROTECTED]:/v/openpkg/cvs" ]; then
+echo "++ checking whether release header was already
modified"
+(builtin cd ${OPENPKG_WORK}/$S/${name} && command cvs 2>&1
diff -u0 ${name}.spec) \
+| ${EGREP} '^[+-]Release: +' | wc -l | ${EGREP} '^ *2 *'
>/dev/null
+if [ $? -ne 0 ]; then
+echo "++ checking for local added, modified or removed
files"
+(builtin cd ${OPENPKG_WORK}/$S/${name} && command cvs
2>&1 stat) \
+| ${EGREP} 'Status: *Locally' >/dev/null
+if [ $? -eq 0 ]; then
+_autorel
+if [ ".$rpm_release_req" = . ]; then
+die "cannot predict required release number for
branch $B"
+fi
+if [ ".$rpm_release_new" != ".$rpm_release_req" ];
then
+echo "++ modifying release number"
+( builtin cd ${OPENPKG_WORK}/$S/${name} \
+ && sed -e "s;^\(Release:
*\).*$;\1$rpm_release_req;" <${name}.spec >${name}.spec.n; \
+ mv ${name}.spec.n ${name}.spec)
+fi
fi
fi
fi
fi
-fi
package=`rpmE -q --qf "%{NAME}-%{VERSION}-%{RELEASE}" \
--specfile ${OPENPKG_WORK}/$S/${name}/${name}.spec`
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 10-Aug-2005 13:35:48
Branch: HEAD Handle: 2005081012354700
Modified files:
openpkg-tools/cmd dev.sh
Log:
supress check message when forced not to check
Summary:
RevisionChanges Path
1.47+3 -1 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.46 -r1.47 dev.sh
--- openpkg-tools/cmd/dev.sh 5 Aug 2005 20:45:13 - 1.46
+++ openpkg-tools/cmd/dev.sh 10 Aug 2005 11:35:47 - 1.47
@@ -2094,9 +2094,10 @@
continue
fi
+if [ $force -eq 0 ]; then
echo "++ checking release header having format suitable for
automatic modification"
${EGREP} '^Release: *((([0-9]\.)?[0-9]{8})|[0-9]+\.[0-9]+\.[0-9])$'
<${OPENPKG_WORK}/$S/${name}/${name}.spec >/dev/null
-if [ $? -eq 0 -a $force -eq 0 -a ".${OPENPKG_REPO}" = "[EMAIL
PROTECTED]:/v/openpkg/cvs" ]; then
+if [ $? -eq 0 -a ".${OPENPKG_REPO}" = "[EMAIL
PROTECTED]:/v/openpkg/cvs" ]; then
echo "++ checking whether release header was already modified"
(builtin cd ${OPENPKG_WORK}/$S/${name} && command cvs 2>&1 diff
-u0 ${name}.spec) \
| ${EGREP} '^[+-]Release: +' | wc -l | ${EGREP} '^ *2 *'
>/dev/null
@@ -2118,6 +2119,7 @@
fi
fi
fi
+fi
package=`rpmE -q --qf "%{NAME}-%{VERSION}-%{RELEASE}" \
--specfile ${OPENPKG_WORK}/$S/${name}/${name}.spec`
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-toolsDate: 05-Aug-2005 22:45:13 Branch: HEAD Handle: 2005080521451300 Modified files: openpkg-tools/cmd dev.sh Log: order is important Summary: RevisionChanges Path 1.46+1 -1 openpkg-tools/cmd/dev.sh patch -p0 <<'@@ .' Index: openpkg-tools/cmd/dev.sh $ cvs diff -u -r1.45 -r1.46 dev.sh --- openpkg-tools/cmd/dev.sh 5 Aug 2005 18:36:45 - 1.45 +++ openpkg-tools/cmd/dev.sh 5 Aug 2005 20:45:13 - 1.46 @@ -2616,8 +2616,8 @@ help| he* ) cmd="help";; install | in* ) cmd="install" ;; kill ) cmd="kill";; -lint| li* ) cmd="lint";; list| ls* ) cmd="list";; +lint| li* ) cmd="lint";; logview | lo* ) cmd="logview" ;; new | ne* ) cmd="new" ;; package | pa* ) cmd="package" ;; @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 05-Aug-2005 20:36:46
Branch: HEAD Handle: 2005080519364500
Modified files:
openpkg-tools/cmd dev.sh
Log:
"openpkg dev update" now accepting package list argument(s), enabling
orthogonal behavior compared to sibling subcommands
Summary:
RevisionChanges Path
1.45+36 -11 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.44 -r1.45 dev.sh
--- openpkg-tools/cmd/dev.sh 4 Aug 2005 14:34:15 - 1.44
+++ openpkg-tools/cmd/dev.sh 5 Aug 2005 18:36:45 - 1.45
@@ -812,16 +812,41 @@
}
update () {
-echo "++ updating ${OPENPKG_REPO}/{adm,doc,re,src*,web,tools}"
-( builtin cd ${OPENPKG_WORK} || die "cannot cd to ${OPENPKG_WORK}"
- HOME=${OPENPKG_WORK}
- export HOME
- for subdir in adm doc re src src.* web tools; do
- if [ -d $subdir ]; then
- cvs -d ${OPENPKG_REPO} update $subdir
- fi
- done
-)
+full=0
+packages=""
+while [ ".$1" != . ]; do
+case ".$1" in
+.-f ) full=1 ;;
+ * ) packages="${packages} $1"
+esac
+shift
+done
+if [ ".${packages}" = . ]; then
+if [ ".$P" = . ]; then
+full=1
+fi
+all="$P"
+else
+all="${packages}"
+fi
+if [ $full -eq 0 ]; then
+for name in $all; do
+[ -d ${OPENPKG_WORK}/$S/${name}/CVS ] || continue;
+echo "++ updating package ${name}"
+(builtin cd ${OPENPKG_WORK}/$S/${name} && cvs update)
+done
+else
+echo "++ updating ${OPENPKG_REPO}/{adm,doc,re,src.*,web,tools}"
+( builtin cd ${OPENPKG_WORK} || die "cannot cd to ${OPENPKG_WORK}"
+ HOME=${OPENPKG_WORK}
+ export HOME
+ for subdir in adm doc re src src.* web tools; do
+ if [ -d $subdir ]; then
+ cvs -d ${OPENPKG_REPO} update $subdir
+ fi
+ done
+)
+fi
}
package () {
@@ -2537,7 +2562,7 @@
\$ openpkg dev test# [[spec]...] run
functional test (reserved for future use)
\$ openpkg dev tools # [path]tools to run
(default to instance internals)
\$ openpkg dev track # [[spec]...] track version
-\$ openpkg dev update # update
development environment from master server
+\$ openpkg dev update # [[spec]...] [-f] update files
in specdir or full update from CVS
\$ openpkg dev vim # [[spec]...] [-f] spec edit and
lint (if HEAD or forced)
EOF
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 04-Aug-2005 16:34:15
Branch: HEAD Handle: 2005080415341500
Modified files:
openpkg-tools/cmd dev.sh
Log:
only update release headers having format suitable for automatic
modification
Summary:
RevisionChanges Path
1.44+3 -1 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.43 -r1.44 dev.sh
--- openpkg-tools/cmd/dev.sh 2 Aug 2005 18:31:32 - 1.43
+++ openpkg-tools/cmd/dev.sh 4 Aug 2005 14:34:15 - 1.44
@@ -2069,7 +2069,9 @@
continue
fi
-if [ $force -eq 0 -a ".${OPENPKG_REPO}" = "[EMAIL
PROTECTED]:/v/openpkg/cvs" ]; then
+echo "++ checking release header having format suitable for
automatic modification"
+${EGREP} '^Release: *((([0-9]\.)?[0-9]{8})|[0-9]+\.[0-9]+\.[0-9])$'
<${OPENPKG_WORK}/$S/${name}/${name}.spec >/dev/null
+if [ $? -eq 0 -a $force -eq 0 -a ".${OPENPKG_REPO}" = "[EMAIL
PROTECTED]:/v/openpkg/cvs" ]; then
echo "++ checking whether release header was already modified"
(builtin cd ${OPENPKG_WORK}/$S/${name} && command cvs 2>&1 diff
-u0 ${name}.spec) \
| ${EGREP} '^[+-]Release: +' | wc -l | ${EGREP} '^ *2 *'
>/dev/null
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 02-Aug-2005 20:31:33
Branch: HEAD Handle: 2005080219313200
Modified files:
openpkg-tools/cmd dev.sh
Log:
"openpkg dev build" now detects when a rebuild is needed because the
spec file is newer than rpm file
Summary:
RevisionChanges Path
1.43+1 -1 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.42 -r1.43 dev.sh
--- openpkg-tools/cmd/dev.sh 2 Aug 2005 18:29:09 - 1.42
+++ openpkg-tools/cmd/dev.sh 2 Aug 2005 18:31:32 - 1.43
@@ -2098,7 +2098,7 @@
rpmfile=`rpmE -q --qf "${template}" \
--specfile ${OPENPKG_WORK}/$S/${name}/${name}.spec`
rpmdir=`rpmE --eval '%{_rpmdir}'`
-if [ ! -f "$rpmdir/$rpmfile" -o $force -ne 0 ]; then
+if [ ! -f "$rpmdir/$rpmfile" -o
${OPENPKG_WORK}/$S/${name}/${name}.spec -nt "$rpmdir/$rpmfile" -o $force -ne 0
]; then
echo "++ building $package ($rpmfile)"
opt="`echo ${opt} | tr ' ' '\n' | ${EGREP} . | sed -e
's;^;--define \";' -e 's;=; ;' -e 's;$;\";' | tr '\n' ' '`"
(builtin cd ${OPENPKG_WORK}/$S/${name} && openpkgT fetch
${name}.spec)
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 02-Aug-2005 20:29:10
Branch: HEAD Handle: 2005080219290900
Modified files:
openpkg-tools/cmd dev.sh
Log:
new feature for "openpkg dev build" now automatically sets release
header once a locally changed CVS file is detected
Summary:
RevisionChanges Path
1.42+90 -61 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.41 -r1.42 dev.sh
--- openpkg-tools/cmd/dev.sh 1 Aug 2005 19:23:29 - 1.41
+++ openpkg-tools/cmd/dev.sh 2 Aug 2005 18:29:09 - 1.42
@@ -580,6 +580,71 @@
HOME=${OPENPKG_WORK} command cvs ${1+"$@"} | $cvs_colorize
}
+# shared code between "build" and "release"
+_autorel () {
+echo "++ determine old version (if any)"
+tmpfile="${OPENPKG_TEMP}/${name}${GUID}"
+cvs_stat=`builtin cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} stat
$S/${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_RMOD}/${name}/${name}.spec" >${tmpfile} 2>/dev/null
+rpm_version_old=`rpmE -q --qf "%{VERSION}" --specfile ${tmpfile}
2>/dev/null`
+rpm_release_old=`rpmE -q --qf "%{RELEASE}" --specfile ${tmpfile}
2>/dev/null`
+command 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=`rpmE -q --qf "%{VERSION}" --specfile
${OPENPKG_WORK}/$S/${name}/${name}.spec`
+rpm_name=`rpmE -q --qf "%{NAME}" --specfile
${OPENPKG_WORK}/$S/${name}/${name}.spec`
+rpm_summary=`rpmE -q --qf "%{SUMMARY}" --specfile
${OPENPKG_WORK}/$S/${name}/${name}.spec`
+[ ".${rpm_version_new}" = . ] && die "cannot determine new version
number"
+
+echo "++ determine branch and related release number and upload suffix"
+rpm_release_new=`rpmE -q --qf "%{RELEASE}" --specfile
${OPENPKG_WORK}/$S/${name}/${name}.spec`
+[ ".${rpm_release_new}" = . ] && die "cannot determine new release
number"
+
+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
+rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
+upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
+fi
+}
+
setup () {
# honor optional parameters [[[spec]ctag]exec]; use "" to specify a
empty parameter and use it's default
[ ".$1" != . ] && OPENPKG_SPEC="$1"
@@ -1555,67 +1620,7 @@
[ -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_stat=`builtin cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO}
stat $S/${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
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 01-Aug-2005 21:23:30
Branch: HEAD Handle: 2005080120232900
Modified files:
openpkg-tools/cmd dev.sh
Log:
new feature for "openpkg dev build" now creating per-host build logs
in the spec directory. View log files with "openpkg dev logview" or
otherwise review the [EMAIL PROTECTED] files. Cleanup happens on
"install", "release" and "clean"
Summary:
RevisionChanges Path
1.41+35 -3 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.40 -r1.41 dev.sh
--- openpkg-tools/cmd/dev.sh 8 Jun 2005 14:12:37 - 1.40
+++ openpkg-tools/cmd/dev.sh 1 Aug 2005 19:23:29 - 1.41
@@ -1525,8 +1525,9 @@
template=`rpmE --eval '%{_rpmfilename}' | sed -e 's;\..*$;;'`
rpmfile=`rpmE -q --qf "${template}" --specfile
${OPENPKG_WORK}/$S/${name}/${name}.spec`
-echo "++ cleaning up sources"
+echo "++ cleaning up sources and logs"
rpmE --clean --nodeps ${OPENPKG_WORK}/$S/${name}/${name}.spec
>/dev/null 2>&1 || true
+rm ${OPENPKG_WORK}/$S/${name}/[EMAIL PROTECTED] >/dev/null 2>&1 ||
true
# developer section
if [ ".${OPENPKG_MODE}" = .developer ]; then
@@ -1820,6 +1821,8 @@
}
clean () {
+echo "++ cleaning up logs ${OPENPKG_WORK}/$S"
+rm ${OPENPKG_WORK}/$S/*/[EMAIL PROTECTED] >/dev/null 2>&1 || true
case ${OPENPKG_TEMP} in
/?* ) ;;
* ) die "temporary area ${OPENPKG_TEMP} seems to be strange" ;;
@@ -2014,8 +2017,9 @@
if [ $? -ne 0 ]; then
warn "failed to install $package"
fi
-echo "++ cleaning up sources"
+echo "++ cleaning up sources and logs"
rpmE --clean --nodeps ${OPENPKG_WORK}/$S/${name}/${name}.spec
>/dev/null 2>&1 || true
+rm ${OPENPKG_WORK}/$S/${name}/[EMAIL PROTECTED] >/dev/null 2>&1 ||
true
done
}
@@ -2069,7 +2073,7 @@
echo "++ building $package ($rpmfile)"
opt="`echo ${opt} | tr ' ' '\n' | ${EGREP} . | sed -e
's;^;--define \";' -e 's;=; ;' -e 's;$;\";' | tr '\n' ' '`"
(builtin cd ${OPENPKG_WORK}/$S/${name} && openpkgT fetch
${name}.spec)
-(builtin cd ${OPENPKG_WORK}/$S/${name} && eval "rpmE -ba ${opt}
${name}.spec")
+(builtin cd ${OPENPKG_WORK}/$S/${name} && eval "rpmE -ba ${opt}
${name}.spec" 2>&1 | tee [EMAIL PROTECTED])
if [ ! -f "$rpmdir/$rpmfile" ]; then
warn "failed to build $package ($rpmfile)"
continue
@@ -2078,6 +2082,32 @@
done
}
+logview () {
+packages=""
+while [ ".$1" != . ]; do
+case ".$1" in
+ * ) packages="${packages} $1"
+esac
+shift
+done
+if [ ".${packages}" = . ]; then
+if [ ".$P" = . ]; then
+die "package cannot be identified. Neither parameter given nor
\$P set."
+fi
+all="$P"
+else
+all="${packages}"
+fi
+for name in $all; do
+echo "++ logview ${name}"
+if [ -f "${OPENPKG_WORK}/$S/${name}/[EMAIL PROTECTED]" ]; then
+cat "${OPENPKG_WORK}/$S/${name}/[EMAIL PROTECTED]"
+else
+warn "log file for ${name} not found"
+fi
+done
+}
+
search_for () {
URL=`echo $2 | sed -e 's| *$||'`
PKG=`$E/lib/openpkg/curl -l -s $URL |\
@@ -2463,6 +2493,7 @@
\$ openpkg dev kill# kill the
environment
\$ openpkg dev lint# [spec|file|path]...] [-f] lint package
specification
\$ openpkg dev list# [[spec]...] list source
and binary packages
+\$ openpkg dev logview # [[spec]...] view build
logs
\$ openpkg dev new # spec... [-dry]create new
package from scratch
\$ openpkg dev package # [spec]switch to a
different package
\$ openpkg dev peek# [[spec]...] peek at file
list of binary package
@@ -2531,6 +2562,7 @@
kill ) cmd="kill";;
lint| li* ) cmd="lint";;
list| ls* ) cmd="list";;
+logview | lo* ) cmd="logview" ;;
new | ne* ) cmd="new" ;;
package | pa* ) cmd="package" ;;
peek
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 08-Jun-2005 16:12:38
Branch: HEAD Handle: 2005060815123700
Modified files:
openpkg-tools/cmd dev.sh
Log:
change special overrides for dev.de.cw.net domain to openpkg.net
domain
Summary:
RevisionChanges Path
1.40+6 -6 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.39 -r1.40 dev.sh
--- openpkg-tools/cmd/dev.sh 24 Mar 2005 12:09:16 - 1.39
+++ openpkg-tools/cmd/dev.sh 8 Jun 2005 14:12:37 - 1.40
@@ -53,9 +53,9 @@
OPENPKG_INST="/openpkg-dev /openpkg-22 /openpkg-21 /openpkg-20"
OPENPKG_WORK=${HOME}/work/openpkg
OPENPKG_TEMP=${TMPDIR-/tmp}/${LOGNAME}/openpkg
-# special override for dev.de.cw.net domain
+# special override for openpkg.net domain
case `hostname` in
-*.dev.de.cw.net )
+*.openpkg.net )
OPENPKG_MODE=developer
[EMAIL PROTECTED]:/v/openpkg/cvs
OPENPKG_RMOD=openpkg-src
@@ -664,9 +664,9 @@
EOF
echo "++ creating directory structure (${OPENPKG_REPO}/{dst,pkg})"
-# special override for dev.de.cw.net domain
+# special override for openpkg.net domain
case `hostname` in
-*.dev.de.cw.net )
+*.openpkg.net )
( echo ""
echo "# Overide settings for C&W IS Development Team
==="
echo ""
@@ -679,10 +679,10 @@
echo "%_srcrpmdir /e/openpkg/PKG/src"
) >>${OPENPKG_WORK}/.rpmmacros
if [ ! -d "${OPENPKG_WORK}/dst" ]; then
-ln -s /e/openpkg/DST "${OPENPKG_WORK}/dst" || die "failed to
link to ${OPENPKG_WORK}/dst directory"
+ln -s /v/openpkg/DST "${OPENPKG_WORK}/dst" || die "failed to
link to ${OPENPKG_WORK}/dst directory"
fi
if [ ! -d "${OPENPKG_WORK}/pkg" ]; then
-ln -s /e/openpkg/PKG "${OPENPKG_WORK}/pkg" || die "failed to
link to ${OPENPKG_WORK}/pkg directory"
+ln -s /v/openpkg/PKG "${OPENPKG_WORK}/pkg" || die "failed to
link to ${OPENPKG_WORK}/pkg directory"
fi
;;
* )
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 24-Mar-2005 13:09:16
Branch: HEAD Handle: 2005032412091600
Modified files:
openpkg-tools/cmd dev.sh
Log:
fix 'new' command
Summary:
RevisionChanges Path
1.39+1 -1 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.38 -r1.39 dev.sh
--- openpkg-tools/cmd/dev.sh 24 Mar 2005 11:21:11 - 1.38
+++ openpkg-tools/cmd/dev.sh 24 Mar 2005 12:09:16 - 1.39
@@ -1870,7 +1870,7 @@
year=`date '+%Y'`
if [ ${dry} -eq 0 ]; then
( echo "##"
- echo "## ${name}.spec -- OpenPKG RPM Specification"
+ echo "## ${name}.spec -- OpenPKG RPM Package Specification"
echo "## Copyright (c) 2000-${year} OpenPKG Foundation e.V.
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 24-Feb-2005 10:41:35
Branch: HEAD Handle: 2005022409413500
Modified files:
openpkg-tools/cmd dev.sh
Log:
some kinds of awk(1) do not like empty regex (happend on
ppc-darwin7.8.0)
Summary:
RevisionChanges Path
1.37+2 -2 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.36 -r1.37 dev.sh
--- openpkg-tools/cmd/dev.sh 23 Feb 2005 20:03:24 - 1.36
+++ openpkg-tools/cmd/dev.sh 24 Feb 2005 09:41:35 - 1.37
@@ -166,7 +166,7 @@
else
type $1 \
| ${AWK} -v cmd=$1 'BEGIN { f=0 }
- // { if (f==1) { print $0 } }
+ /.*/ { if (f==1) { print $0 } }
/^[a-zA-Z0-9_]+ is a function/ { print "unalias "cmd"
>/dev/null 2>&1"; f=1 }'
fi
}
@@ -2276,7 +2276,7 @@
BEGIN { flag=0 }
/^%prep$/ { flag=1 }
/^$/ { if (flag == 1) print ""execute" #"file; flag=0 }
-// { print $0 }'
+/.*/ { print $0 }'
if [ ${dry} -eq 0 ]; then
rpmE -bp ${tmpfile} --nodeps
rc=$?
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-toolsDate: 23-Feb-2005 21:03:25 Branch: HEAD Handle: 2005022320032400 Modified files: openpkg-tools/cmd dev.sh Log: automatic release lookup for "openpkg dev search" Summary: RevisionChanges Path 1.36+8 -20 openpkg-tools/cmd/dev.sh patch -p0 <<'@@ .' Index: openpkg-tools/cmd/dev.sh $ cvs diff -u -r1.35 -r1.36 dev.sh --- openpkg-tools/cmd/dev.sh 18 Feb 2005 13:10:40 - 1.35 +++ openpkg-tools/cmd/dev.sh 23 Feb 2005 20:03:24 - 1.36 @@ -2113,26 +2113,14 @@ 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.2/UPD/ -search_for $i ftp://ftp.openpkg.org/release/2.2/SRC/ -search_for $i ftp://ftp.openpkg.org/release/2.2/SRC/PLUS/ -search_for $i ftp://ftp.openpkg.org/release/2.1/UPD/ -search_for $i ftp://ftp.openpkg.org/release/2.1/SRC/ -search_for $i ftp://ftp.openpkg.org/release/2.1/SRC/PLUS/ -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/ -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/ +REL=`$E/lib/openpkg/curl -l -s ftp://ftp.openpkg.org/release/ |\ + sed -e 's; ;;' |\ + egrep '^[1-9][0-9]*\.[0-9]+$' | sort -rn` +for r in $REL; do +search_for $i ftp://ftp.openpkg.org/release/$r/UPD/ +search_for $i ftp://ftp.openpkg.org/release/$r/SRC/ +search_for $i ftp://ftp.openpkg.org/release/$r/SRC/PLUS/ +done done } @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 18-Feb-2005 14:10:41
Branch: HEAD Handle: 2005021813104000
Modified files:
openpkg-tools/cmd dev.sh
Log:
adjust 'openpkg dev' tool for new world order after latest environment
migration
Summary:
RevisionChanges Path
1.35+9 -9 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.34 -r1.35 dev.sh
--- openpkg-tools/cmd/dev.sh 4 Feb 2005 13:59:06 - 1.34
+++ openpkg-tools/cmd/dev.sh 18 Feb 2005 13:10:40 - 1.35
@@ -58,13 +58,13 @@
case `hostname` in
*.dev.de.cw.net )
OPENPKG_MODE=developer
-[EMAIL PROTECTED]:/e/openpkg/cvs
+[EMAIL PROTECTED]:/v/openpkg/cvs
OPENPKG_RMOD=openpkg-src
-OPENPKG_DIST=master.openpkg.org:/e/openpkg/ftp/
+[EMAIL PROTECTED]:/
;;
* )
OPENPKG_MODE=contributor
-OPENPKG_REPO=:pserver:[EMAIL PROTECTED]:/e/openpkg/cvs
+OPENPKG_REPO=:pserver:[EMAIL PROTECTED]:/v/openpkg/cvs
OPENPKG_RMOD=openpkg-src
OPENPKG_DIST=ftp://ftp.openpkg.org/contrib/00UPLOAD
;;
@@ -1617,7 +1617,7 @@
upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
fi
-if [ ".${OPENPKG_REPO}" = "[EMAIL PROTECTED]:/e/openpkg/cvs" ];
then
+if [ ".${OPENPKG_REPO}" = "[EMAIL PROTECTED]:/v/openpkg/cvs" ];
then
echo "++ checking release number"
if [ ".$rpm_release_req" = . ]; then
die "cannot predict required release number for branch
$B"
@@ -1668,7 +1668,7 @@
fi
fi
-area=`echo ${OPENPKG_DIST}/${upload} | sed -e
's;master.openpkg.org:/e/openpkg/ftp/;OpenPKG ;'`
+area=`echo ${OPENPKG_DIST}/${upload} | sed -e 's;[EMAIL
PROTECTED]:/;OpenPKG ;'`
echo "++ releasing ${rpmfile}.${ext} to distribution area
${area}"
if [ ${bundle} -eq 1 ]; then
bundle_srpms="${bundle_srpms}
${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}"
@@ -2411,7 +2411,7 @@
fi
for file in $files; do
TERM=${TERM}-color command vim "${file}"
-if [ ".${OPENPKG_MODE}" = .developer -a ".${B}" = .HEAD -a
".${OPENPKG_REPO}" = "[EMAIL PROTECTED]:/e/openpkg/cvs" -o $force -ne 0 ]; then
+if [ ".${OPENPKG_MODE}" = .developer -a ".${B}" = .HEAD -a
".${OPENPKG_REPO}" = "[EMAIL PROTECTED]:/v/openpkg/cvs" -o $force -ne 0 ]; then
openpkgT lint-spec ${file}
if [ $? -gt 0 ]; then
die "unacceptable specification: ${file}"
@@ -2627,8 +2627,8 @@
Specify access to the repository for uploading
modified package specifications. Contributors use
-"C<:pserver:[EMAIL PROTECTED]:/e/openpkg/cvs>" and developers
-use "C<[EMAIL PROTECTED]:/e/openpkg/cvs>". If omitted the
+"C<:pserver:[EMAIL PROTECTED]:/v/openpkg/cvs>" and developers
+use "C<[EMAIL PROTECTED]:/v/openpkg/cvs>". If omitted the
variable C is read from F<~/openpkg/dev.rc>, read from
environment or defaults to the contributor setting.
@@ -2636,7 +2636,7 @@
Specify access to the repository for uploading modified packages.
Contributors use "C" and
-developers use "C". If omitted the
+developers use "C<[EMAIL PROTECTED]:/>". If omitted the
variable C is read from F<~/openpkg/dev.rc>, read from
environment or defaults to the contributor setting.
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 04-Feb-2005 14:59:06
Branch: HEAD Handle: 2005020413590600
Modified files:
openpkg-tools/cmd dev.sh
Log:
search whole PATH for suitable egrep(1) and awk(1); avoid problem when
egrep is given an empty argument
Summary:
RevisionChanges Path
1.34+36 -27 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.33 -r1.34 dev.sh
--- openpkg-tools/cmd/dev.sh 1 Jan 2005 11:17:38 - 1.33
+++ openpkg-tools/cmd/dev.sh 4 Feb 2005 13:59:06 - 1.34
@@ -82,16 +82,22 @@
S="${S:-src}" # chicken-egg hack FIXME
# use appropriate tools
-if [ -x /usr/xpg4/bin/egrep ]; then
-EGREP="/usr/xpg4/bin/egrep"
-else
-EGREP="`type -f -p egrep`"
-fi
-if [ -x /usr/xpg4/bin/awk ]; then
-AWK="/usr/xpg4/bin/awk"
-else
-AWK="`type -f -p awk`"
-fi
+EGREP=""
+for i in `echo $PATH: | sed -e 's;:; ;g'` /usr/xpg4/bin; do
+i=${i}/egrep
+if [ -x $i -a .`echo foo | $i 2>/dev/null '^f[nop]+$'` = .foo ]; then
+EGREP=$i
+break;
+fi
+done
+AWK=""
+for i in `echo $PATH: | sed -e 's;:; ;g'` /usr/xpg4/bin; do
+i=${i}/awk
+if [ -x $i -a .`echo foo | $i 2>/dev/null -v foo=bar '/foo/ { print foo
}'` = .bar ]; then
+AWK=$i
+break;
+fi
+done
# a note about CVS HEAD
# CVS calls the latest version of a file "head". It also supports two
@@ -983,18 +989,21 @@
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
-initmpx ${INSTANCE}
-if [ ".${RPMCMD}" != . ]; then
-VERSION=`${RPMCMD} -q --qf "%{VERSION}" openpkg`
-echo ${VERSION} | ${EGREP} "$RE" >/dev/null
-if [ $? -eq 0 ]; then
-RV="${INSTANCE}"
-unset INSTANCE
-return
+if [ ".$RE" != . ]; then
+for INSTANCE in ${OPENPKG_INST}; do
+initmpx ${INSTANCE}
+if [ ".${RPMCMD}" != . ]; then
+VERSION=`${RPMCMD} -q --qf "%{VERSION}" openpkg`
+echo ${VERSION} | ${EGREP} "$RE" >/dev/null
+if [ $? -eq 0 ]; then
+RV="${INSTANCE}"
+unset INSTANCE
+return
+fi
fi
-fi
-done
+done
+fi
+
if [ ".$mode" = .any ]; then
OPENPKG_INST="${OPENPKG_INST} `uwhich openpkg | sed -e
's;/bin/openpkg$;;'`"
OPENPKG_INST="${OPENPKG_INST} `uwhich rpm | sed -e 's;/bin/rpm$;;'`"
@@ -2492,15 +2501,15 @@
set -- help
fi
-# check whether EGREP really supports regular expressions
-if [ ! .`echo foo | ${EGREP} '^f[nop]+$'` = .foo ]; then
-error "$0:ERROR: found ${EGREP} but it doesn't support regular
expressions"
+# check whether EGREP was found
+if [ ".${EGREP}" = . ]; then
+error "$0:ERROR: no egrep(1) found that really supports required regular
expressions"
exit 1
fi
-# check whether AWK supports -v var=val option
-if [ ! .`echo foo | ${AWK} -v foo=bar '/foo/ { print foo }'` = .bar ]; then
-error "$0:ERROR: found ${AWK} but it doesn't support -v var=val option"
+# check whether AWK was found
+if [ ".${AWK}" = . ]; then
+error "$0:ERROR: no awk(1) found that supports the required \"-v
var=val\" option"
exit 1
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 24-Nov-2004 16:07:58
Branch: HEAD Handle: 2004112415075700
Modified files:
openpkg-tools/cmd dev.sh
Log:
take over CVS_RSH settings and support brain-dead option parsing under
Solaris 9
Summary:
RevisionChanges Path
1.32+2 -2 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.31 -r1.32 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Oct 2004 13:50:03 - 1.31
+++ openpkg-tools/cmd/dev.sh 24 Nov 2004 15:07:57 - 1.32
@@ -1016,7 +1016,7 @@
[ -f ${HOME}/.bashrc ] && source ${HOME}/.bashrc
# use SSH for CVS
-CVS_RSH=ssh
+CVS_RSH=${CVS_RSH:-ssh}
export CVS_RSH
# import OpenPKG environment
@@ -2499,7 +2499,7 @@
fi
# check whether AWK supports -v var=val option
-if [ ! .`echo foo | ${AWK} -vfoo=bar '/foo/ { print foo }'` = .bar ]; then
+if [ ! .`echo foo | ${AWK} -v foo=bar '/foo/ { print foo }'` = .bar ]; then
error "$0:ERROR: found ${AWK} but it doesn't support -v var=val option"
exit 1
fi
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Oct-2004 15:50:03
Branch: HEAD Handle: 2004101214500300
Modified files:
openpkg-tools/cmd dev.sh
Log:
search for OpenPKG 2.2, too
Summary:
RevisionChanges Path
1.31+5 -2 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.30 -r1.31 dev.sh
--- openpkg-tools/cmd/dev.sh 12 Oct 2004 11:31:44 - 1.30
+++ openpkg-tools/cmd/dev.sh 12 Oct 2004 13:50:03 - 1.31
@@ -51,7 +51,7 @@
export OPENPKG_ARGS
# default configuration
-OPENPKG_INST="/openpkg-dev /openpkg-21 /openpkg-20 /openpkg-13"
+OPENPKG_INST="/openpkg-dev /openpkg-22 /openpkg-21 /openpkg-20"
OPENPKG_WORK=${HOME}/work/openpkg
OPENPKG_TEMP=${TMPDIR-/tmp}/${LOGNAME}/openpkg
# special override for dev.de.cw.net domain
@@ -2104,6 +2104,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.2/UPD/
+search_for $i ftp://ftp.openpkg.org/release/2.2/SRC/
+search_for $i ftp://ftp.openpkg.org/release/2.2/SRC/PLUS/
search_for $i ftp://ftp.openpkg.org/release/2.1/UPD/
search_for $i ftp://ftp.openpkg.org/release/2.1/SRC/
search_for $i ftp://ftp.openpkg.org/release/2.1/SRC/PLUS/
@@ -2587,7 +2590,7 @@
Specify white-space separated list of directories where OpenPKG
instances can be found. If omitted the variable C is
read from F<~/openpkg/dev.rc>, read from environment or defaults to
-"C".
+"C".
=item B<--work=>I
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 12-Oct-2004 13:31:44
Branch: HEAD Handle: 2004101212314400
Modified files:
openpkg-tools/cmd dev.sh
Log:
add functional safety check for egrep(1) and awk(1)
Summary:
RevisionChanges Path
1.30+12 -0 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.29 -r1.30 dev.sh
--- openpkg-tools/cmd/dev.sh 20 Sep 2004 18:07:40 - 1.29
+++ openpkg-tools/cmd/dev.sh 12 Oct 2004 11:31:44 - 1.30
@@ -2489,6 +2489,18 @@
set -- help
fi
+# check whether EGREP really supports regular expressions
+if [ ! .`echo foo | ${EGREP} '^f[nop]+$'` = .foo ]; then
+error "$0:ERROR: found ${EGREP} but it doesn't support regular expressions"
+exit 1
+fi
+
+# check whether AWK supports -v var=val option
+if [ ! .`echo foo | ${AWK} -vfoo=bar '/foo/ { print foo }'` = .bar ]; then
+error "$0:ERROR: found ${AWK} but it doesn't support -v var=val option"
+exit 1
+fi
+
# when invoked without any parameter, artifically inject "bash" command as default
if [ $# -eq 0 ]; then
set -- bash
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 20-Sep-2004 20:07:41
Branch: HEAD Handle: 2004092019074000
Modified files:
openpkg-tools/cmd dev.sh
Log:
not such a lot of convenience, please. It breaks releasing of packages
like x11-ssh-askpass (because thinks it is the x11 package)
Summary:
RevisionChanges Path
1.29+0 -1 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.28 -r1.29 dev.sh
--- openpkg-tools/cmd/dev.sh 9 Jul 2004 12:13:20 - 1.28
+++ openpkg-tools/cmd/dev.sh 20 Sep 2004 18:07:40 - 1.29
@@ -1510,7 +1510,6 @@
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
echo "++ processing package ${name}"
if [ ! -f "${OPENPKG_WORK}/$S/${name}/${name}.spec" ]; then
die "${OPENPKG_WORK}/$S/${name}/${name}.spec not found"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 09-Jul-2004 14:13:21
Branch: HEAD Handle: 2004070913132000
Modified files:
openpkg-tools/cmd dev.sh
Log:
extend "special override for dev.de.cw.net domain" for choosing
default contributor/developer mode; do not complain abount T/E MPX
choice if T=E; make sure "openpkg dev" alias does not end with space
to avoid triggering a bash feature/bug; replace nonexistent find_tool
with uwhich; override user alias for "ls" on places we want to control
Summary:
RevisionChanges Path
1.28+38 -30 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.27 -r1.28 dev.sh
--- openpkg-tools/cmd/dev.sh 7 Jul 2004 11:36:56 - 1.27
+++ openpkg-tools/cmd/dev.sh 9 Jul 2004 12:13:20 - 1.28
@@ -54,14 +54,21 @@
OPENPKG_INST="/openpkg-dev /openpkg-21 /openpkg-20 /openpkg-13"
OPENPKG_WORK=${HOME}/work/openpkg
OPENPKG_TEMP=${TMPDIR-/tmp}/${LOGNAME}/openpkg
-OPENPKG_MODE=contributor# contributor
-OPENPKG_REPO=:pserver:[EMAIL PROTECTED]:/e/openpkg/cvs # contributor
-OPENPKG_RMOD=openpkg-src# contributor
-OPENPKG_DIST=ftp://ftp.openpkg.org/contrib/00UPLOAD # contributor
-#OPENPKG_MODE=developer # developer
[EMAIL PROTECTED]:/e/openpkg/cvs# developer
-#OPENPKG_RMOD=openpkg-src # developer
-#OPENPKG_DIST=master.openpkg.org:/e/openpkg/ftp/# developer
+# special override for dev.de.cw.net domain
+case `hostname` in
+*.dev.de.cw.net )
+OPENPKG_MODE=developer
+[EMAIL PROTECTED]:/e/openpkg/cvs
+OPENPKG_RMOD=openpkg-src
+OPENPKG_DIST=master.openpkg.org:/e/openpkg/ftp/
+;;
+* )
+OPENPKG_MODE=contributor
+OPENPKG_REPO=:pserver:[EMAIL PROTECTED]:/e/openpkg/cvs
+OPENPKG_RMOD=openpkg-src
+OPENPKG_DIST=ftp://ftp.openpkg.org/contrib/00UPLOAD
+;;
+esac
export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO
OPENPKG_RMOD OPENPKG_DIST
# enforced and user controlled (through package/branch/execute) variables
@@ -122,18 +129,18 @@
esac
case ${opt} in
-h|--help) help=1 ;;
---inst=* ) OPENPKG_INST=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--inst=${arg} ";;
---work=* ) OPENPKG_WORK=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--work=${arg} ";;
---temp=* ) OPENPKG_TEMP=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--temp=${arg} ";;
---mode=* ) OPENPKG_MODE=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--mode=${arg} ";;
---repo=* ) OPENPKG_REPO=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--repo=${arg} ";;
---rmod=* ) OPENPKG_RMOD=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--rmod=${arg} ";;
---dist=* ) OPENPKG_DIST=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--dist=${arg} ";;
---spec=* ) OPENPKG_SPEC=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--spec=${arg} ";;
---ctag=* ) OPENPKG_CTAG=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--ctag=${arg} ";;
---exec=* ) OPENPKG_EXEC=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--exec=${arg} ";;
---trun=* ) OPENPKG_TRUN=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--trun=${arg} ";;
---sdir=* ) OPENPKG_SDIR=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--sdir=${arg} ";;
+--inst=* ) OPENPKG_INST=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--inst=${arg}";;
+--work=* ) OPENPKG_WORK=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--work=${arg}";;
+--temp=* ) OPENPKG_TEMP=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--temp=${arg}";;
+--mode=* ) OPENPKG_MODE=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--mode=${arg}";;
+--repo=* ) OPENPKG_REPO=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--repo=${arg}";;
+--rmod=* ) OPENPKG_RMOD=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--rmod=${arg}";;
+--dist=* ) OPENPKG_DIST=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--dist=${arg}";;
+--spec=* ) OPENPKG_SPEC=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--spec=${arg}";;
+--ctag=* ) OPENPKG_CTAG=${arg}
OPENPKG_ARGS="$OPENPKG_ARGS${OPENPKG_ARGS:+ }--ctag=${arg}";;
+--exec=* ) OPENPKG_EXEC=${
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 07-Jul-2004 13:36:57
Branch: HEAD Handle: 2004070712365600
Modified files:
openpkg-tools/cmd dev.sh
Log:
fix problem where openpkg shell function gets confused when options
being passed to commands requiring execution inside current shell.
This happend after 1.24 introduced "pass arguments into development
shell ..."
Summary:
RevisionChanges Path
1.27+23 -6 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.26 -r1.27 dev.sh
--- openpkg-tools/cmd/dev.sh 6 Jul 2004 07:30:22 - 1.26
+++ openpkg-tools/cmd/dev.sh 7 Jul 2004 11:36:56 - 1.27
@@ -271,12 +271,29 @@
shift
if [ ".$1" = .dev ]; then
shift
-case $1 in
-package | pa* ) shift; openpkg_dev_package "$@"; cd . ;;
-branch | br* ) shift; openpkg_dev_branch "$@"; cd . ;;
-execute | ex* ) shift; openpkg_dev_execute "$@"; cd . ;;
-tools | to* ) shift; openpkg_dev_tools "$@"; cd . ;;
-srcdir | sr* ) shift; openpkg_dev_srcdir "$@"; cd . ;;
+local cmd=""
+local arg=""
+local line=""
+local e;
+for e in "$@"; do
+if [ ".${cmd}" = . ]; then
+case $e in
+-*) ;;
+*) cmd="$e" ;;
+esac
+elif [ ".${arg}" = . ]; then
+case $e in
+-*) ;;
+*) arg="$e" ;;
+esac
+fi
+done
+case ${cmd} in
+package | pa* ) shift; openpkg_dev_package "${arg}"; cd . ;;
+branch | br* ) shift; openpkg_dev_branch "${arg}"; cd . ;;
+execute | ex* ) shift; openpkg_dev_execute "${arg}"; cd . ;;
+tools | to* ) shift; openpkg_dev_tools "${arg}"; cd . ;;
+srcdir | sr* ) shift; openpkg_dev_srcdir "${arg}"; cd . ;;
* ) command $T/bin/openpkg dev "$@"
esac
elif [ ".$1" = .rpm ]; then
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 06-Jul-2004 09:30:23
Branch: HEAD Handle: 2004070608302200
Modified files:
openpkg-tools/cmd dev.sh
Log:
search for OpenPKG 2.1, too
Summary:
RevisionChanges Path
1.26+5 -2 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.25 -r1.26 dev.sh
--- openpkg-tools/cmd/dev.sh 1 Jul 2004 14:53:40 - 1.25
+++ openpkg-tools/cmd/dev.sh 6 Jul 2004 07:30:22 - 1.26
@@ -51,7 +51,7 @@
export OPENPKG_ARGS
# default configuration
-OPENPKG_INST="/openpkg-dev /openpkg-20 /openpkg-13"
+OPENPKG_INST="/openpkg-dev /openpkg-21 /openpkg-20 /openpkg-13"
OPENPKG_WORK=${HOME}/work/openpkg
OPENPKG_TEMP=${TMPDIR-/tmp}/${LOGNAME}/openpkg
OPENPKG_MODE=contributor# contributor
@@ -2080,6 +2080,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.1/UPD/
+search_for $i ftp://ftp.openpkg.org/release/2.1/SRC/
+search_for $i ftp://ftp.openpkg.org/release/2.1/SRC/PLUS/
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/
@@ -2548,7 +2551,7 @@
Specify white-space separated list of directories where OpenPKG
instances can be found. If omitted the variable C is
read from F<~/openpkg/dev.rc>, read from environment or defaults to
-"C".
+"C".
=item B<--work=>I
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 01-Jul-2004 16:53:40
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-tools/cmd dev.sh
Log:
suck in latest variant of smart dealing with temporary root privileges
Summary:
RevisionChanges Path
1.25+170 -6 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.24 -r1.25 dev.sh
--- openpkg-tools/cmd/dev.sh 17 Jun 2004 10:40:26 - 1.24
+++ openpkg-tools/cmd/dev.sh 1 Jul 2004 14:53:40 - 1.25
@@ -354,18 +354,179 @@
openpkg rpm2cpio "$@"
}
+# generate shell script for re-evaluation of command arguments
+# input: foo 'bar baz' quux (3 args)
+# output: "foo \"bar baz\" quux" (1 arg)
+_arg2sh () {
+local opt_e=no
+local opt_t=no
+local opt
+OPTIND=1
+while getopts et opt; do
+case ${opt} in
+e ) opt_e=yes ;;
+t ) opt_t=yes ;;
+esac
+done
+shift $(($OPTIND - 1))
+local cmd=""
+local arg
+for arg in "$@"; do
+# NOTICE: there are three(!) escaping layers here:
+# - escape layer 1: backticks (`..xx..`)
+# - escape layer 2: quotes('..xx..')
+# - escape layer 3: sed regex (s;..xx..;..xx..;)
+local orig=$arg
+if [ ${opt_e} = yes ]; then
+arg=`echo "${arg}" | sed -e 's;;;g' -e
's;\\(["]\\);\\1;g'`
+elif [ ${opt_t} = yes ]; then
+arg=`echo "${arg}" | sed -e 's;;;g' -e
's;\\(["!\$\`]\\);\\1;g'`
+fi
+local quote=no
+if [ "${arg}" != "${orig}" ]; then
+quote=yes
+else
+quote=`echo "X${arg}" | sed -e 's;^X.*[ ].*\$;yes;' -e 's;^X.*;no;'`
+fi
+if [ ${quote} = yes ]; then
+arg="\"${arg}\""
+fi
+cmd="${cmd}${cmd:+ }${arg}"
+done
+printf "%s" "${cmd}" # intentionally not echo(1)
+}
+
+# generate shell script for re-evaluation of command arguments
+# input: foo 'bar baz' quux (3 args)
+# output: "foo \"bar baz\" quux" (1 arg)
+_arg2sh () {
+local opt_e=no
+local opt_t=no
+local opt
+OPTIND=1
+while getopts et opt; do
+case ${opt} in
+e ) opt_e=yes ;;
+t ) opt_t=yes ;;
+esac
+done
+shift $(($OPTIND - 1))
+local cmd=""
+local arg
+for arg in "$@"; do
+# NOTICE: there are three(!) escaping layers here:
+# - escape layer 1: backticks (`..xx..`)
+# - escape layer 2: quotes('..xx..')
+# - escape layer 3: sed regex (s;..xx..;..xx..;)
+local orig=$arg
+if [ ${opt_e} = yes ]; then
+arg=`echo "@${arg}" | sed -e 's;^@;;' -e 's;;;g' -e
's;\\(["]\\);\\1;g'`
+elif [ ${opt_t} = yes ]; then
+arg=`echo "@${arg}" | sed -e 's;^@;;' -e 's;;;g' -e
's;\\(["!\$\`]\\);\\1;g'`
+fi
+local quote=no
+if [ "${arg}" != "${orig}" ]; then
+quote=yes
+else
+quote=`echo "@${arg}" | sed -e 's;[EMAIL PROTECTED] ].*\$;yes;' -e
's;[EMAIL PROTECTED];no;'`
+fi
+if [ ${quote} = yes ]; then
+arg=`echo "@${arg}" |\
+ sed -e 's;[EMAIL PROTECTED]([A-Z][A-Z0-9_]*\)=\(.*\)$;\1="\2";' \
+ -e 's;[EMAIL PROTECTED](.*\)$;"\1";'`
+fi
+cmd="${cmd}${cmd:+ }${arg}"
+done
+printf "%s" "${cmd}" # intentionally not echo(1)
+}
+
+# generate shell script for re-evaluation of environment variables
+# input: PATH HOME (2 args)
+# output: "PATH=\"...\"; HOME=\"...\"" (1 arg)
+_env2sh () {
+local cmd=""
+local arg
+for arg in "$@"; do
+local val
+eval "val=\"\$${arg}\""
+# NOTICE: there are three(!) escaping layers here, too.
+val=`echo "@${val}" | sed -e 's;^@;;' -e 's;;;g' -e
's;\\(["!\$\`]\\);\\1;g'`
+cmd="${cmd}${cmd:+; }${arg}=\"${val}\""
+done
+printf "%s" "${cmd}" # intentionally not echo(1)
+}
+
# smart dealing with temporary root privileges
+_root () {
+# default operation
+if [ $# -eq 0 ]; then
+set -- -i
+fi
+
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 17-Jun-2004 12:40:27
Branch: HEAD Handle: -NONE-
Modified files:
openpkg-tools/cmd dev.sh
Log:
allow the repository module name to be specified by
--rmod/OPENPKG_RMOD; skip release number check and linting when
developing for a private repository; pass arguments into development
shell otherwise default/environment/rc/option precedence is broken
inside the shell
Summary:
RevisionChanges Path
1.24+0 -0 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.23 -r1.24 dev.sh
--- openpkg-tools/cmd/dev.sh 24 May 2004 15:37:00 - 1.23
+++ openpkg-tools/cmd/dev.sh 17 Jun 2004 10:40:26 - 1.24
@@ -37,6 +37,8 @@
unset OPENPKG_TOOLS_APIPATH
unset OPENPKG_TOOLS_CMDPATH
fi
+
+# export variables
export OPENPKG_TOOLS
export OPENPKG_TOOLS_APIPATH
export OPENPKG_TOOLS_CMDPATH
@@ -46,6 +48,7 @@
export OPENPKG_TOOLS_TRUN
export OPENPKG_TOOLS_APIPATH_TRUN
export OPENPKG_TOOLS_CMDPATH_TRUN
+export OPENPKG_ARGS
# default configuration
OPENPKG_INST="/openpkg-dev /openpkg-20 /openpkg-13"
@@ -53,11 +56,13 @@
OPENPKG_TEMP=${TMPDIR-/tmp}/${LOGNAME}/openpkg
OPENPKG_MODE=contributor# contributor
OPENPKG_REPO=:pserver:[EMAIL PROTECTED]:/e/openpkg/cvs # contributor
+OPENPKG_RMOD=openpkg-src# contributor
OPENPKG_DIST=ftp://ftp.openpkg.org/contrib/00UPLOAD # contributor
#OPENPKG_MODE=developer # developer
[EMAIL PROTECTED]:/e/openpkg/cvs# developer
+#OPENPKG_RMOD=openpkg-src # developer
#OPENPKG_DIST=master.openpkg.org:/e/openpkg/ftp/# developer
-export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO OPENPKG_DIST
+export OPENPKG_INST OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE OPENPKG_REPO
OPENPKG_RMOD OPENPKG_DIST
# enforced and user controlled (through package/branch/execute) variables
OPENPKG_SPEC="${OPENPKG_SPEC}"; P="$P" # package, spec file without .spec suffix
@@ -107,6 +112,7 @@
fi
# override configuration from command line
+OPENPKG_ARGS=""
help=0
while [ $# -gt 0 ]; do
opt=$1
@@ -116,17 +122,18 @@
esac
case ${opt} in
-h|--help) help=1 ;;
---inst=* ) OPENPKG_INST=${arg} ;;
---work=* ) OPENPKG_WORK=${arg} ;;
---temp=* ) OPENPKG_TEMP=${arg} ;;
---mode=* ) OPENPKG_MODE=${arg} ;;
---repo=* ) OPENPKG_REPO=${arg} ;;
---dist=* ) OPENPKG_DIST=${arg} ;;
---spec=* ) OPENPKG_SPEC=${arg} ;;
---ctag=* ) OPENPKG_CTAG=${arg} ;;
---exec=* ) OPENPKG_EXEC=${arg} ;;
---trun=* ) OPENPKG_TRUN=${arg} ;;
---sdir=* ) OPENPKG_SDIR=${arg} ;;
+--inst=* ) OPENPKG_INST=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--inst=${arg} ";;
+--work=* ) OPENPKG_WORK=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--work=${arg} ";;
+--temp=* ) OPENPKG_TEMP=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--temp=${arg} ";;
+--mode=* ) OPENPKG_MODE=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--mode=${arg} ";;
+--repo=* ) OPENPKG_REPO=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--repo=${arg} ";;
+--rmod=* ) OPENPKG_RMOD=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--rmod=${arg} ";;
+--dist=* ) OPENPKG_DIST=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--dist=${arg} ";;
+--spec=* ) OPENPKG_SPEC=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--spec=${arg} ";;
+--ctag=* ) OPENPKG_CTAG=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--ctag=${arg} ";;
+--exec=* ) OPENPKG_EXEC=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--exec=${arg} ";;
+--trun=* ) OPENPKG_TRUN=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--trun=${arg} ";;
+--sdir=* ) OPENPKG_SDIR=${arg} OPENPKG_ARGS="$OPENPKG_ARGS
--sdir=${arg} ";;
-* ) help="Invalid option \`${opt}'"; break ;;
*) break ;;
esac
@@ -510,9 +517,9 @@
cvs -q -d "${OPENPKG_REPO}" checkout -d web openpkg-web
cvs -q -d "${OPENPKG_REPO}" checkout -d tools openpkg-tools
if [ ".${B:-HEAD}" = .HEAD ]; then
- cvs -q -d "
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 24-May-2004 17:37:01
Branch: HEAD Handle: 200405241637
Modified files:
openpkg-tools/cmd dev.sh
Log:
enforce use of bash; add documentation, align code and do minor
cleanups
Summary:
RevisionChanges Path
1.23+129 -70openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.22 -r1.23 dev.sh
--- openpkg-tools/cmd/dev.sh 30 Apr 2004 06:26:20 - 1.22
+++ openpkg-tools/cmd/dev.sh 24 May 2004 15:37:00 - 1.23
@@ -22,12 +22,14 @@
## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
## SUCH DAMAGE.
##
+if [ ".$BASH" = . ]; then
+echo "openpkg:dev:ERROR: this tool must be run under bash" 1>&2
+exit 1
+fi
# decouple from the calling instance
unset OPENPKG_PREFIX
-# FIXME: rse: quick workaround to allow us to use "dev" now: T=$OPENPKG_TOOLS
-
# work around broken multiplexer in OpenPKG 2.0.0 and 2.0.1
# this inhibits the caller from controlling additional and replacement tools
through environment variables
if [ ".$OPENPKG_TOOLS_CMDSTACK" = . ]; then
@@ -46,7 +48,7 @@
export OPENPKG_TOOLS_CMDPATH_TRUN
# default configuration
-OPENPKG_INST="/openpkg-dev /openpkg-20 /openpkg-13 /cw13 /cw12 /cw11 /cw10"
+OPENPKG_INST="/openpkg-dev /openpkg-20 /openpkg-13"
OPENPKG_WORK=${HOME}/work/openpkg
OPENPKG_TEMP=${TMPDIR-/tmp}/${LOGNAME}/openpkg
OPENPKG_MODE=contributor# contributor
@@ -105,9 +107,6 @@
fi
# override configuration from command line
-verbose=0
-quiet=0
-version=0
help=0
while [ $# -gt 0 ]; do
opt=$1
@@ -116,10 +115,7 @@
*) arg='' ;;
esac
case ${opt} in
--v|--verbose ) verbose=1 ;;
--q|--quiet ) quiet=1 ;;
-h|--help) help=1 ;;
--V|--version ) version=1 ;;
--inst=* ) OPENPKG_INST=${arg} ;;
--work=* ) OPENPKG_WORK=${arg} ;;
--temp=* ) OPENPKG_TEMP=${arg} ;;
@@ -132,7 +128,7 @@
--trun=* ) OPENPKG_TRUN=${arg} ;;
--sdir=* ) OPENPKG_SDIR=${arg} ;;
-* ) help="Invalid option \`${opt}'"; break ;;
-*) break ;;
+*) break ;;
esac
shift
done
@@ -2233,8 +2229,28 @@
fi
sed -e 's;^ *;;' < is the Development Shell of the OpenPKG Tool Chain.
-It is used by OpenPKG developers to work conviniently with the
-OpenPKG packaging sources from the OpenPKG CVS Repository.
+B is the Development Shell of the OpenPKG Tool Chain. It
+is used by developers to work conveniently with the OpenPKG packaging
+sources from the OpenPKG CVS Repository.
=head1 GLOBAL OPTIONS
@@ -2345,68 +2365,107 @@
=over 4
-=item B<-v>, B<--verbose>
-
-Enable verbose processing.
-
-=item B<-q>, B<--quiet>
-
-Enable quiet processing.
-
=item B<-h>, B<--help>
Display brief usage message.
-=item B<-V>, B<--version>
-
-Display command version.
-
=item B<--inst=>I
Specify white-space separated list of directories where OpenPKG
-instances can be found. The current default is "C". This can be
-overridden in F<~/openpkg/dev.rc> with variable C.
-
-=item B<--work=>
-
-FIXME
-OPENPKG_WORK
-
-=item B<--temp=>
-
-FIXME
-OPENPKG_TEMP
-
-=item B<--mode=>
-
-FIXME
-OPENPKG_MODE=
-
-=item B<--repo=>
-
-FIXME
-OPENPKG_REPO
-
-=item B<--dist=>
-
-FIXME
-OPENPKG_DIST
-
-=item B<--spec=>
-
-FIXME
-OPENPKG_SPEC
-
-=item B<--ctag=>
-
-FIXME
-OPENPKG_CTAG
-
-=item B<--exec=>
-
-FIXME
-OPENPKG_EXEC
+instances can be found. If omitted the variable C is
+read from F<~/openpkg/dev.rc>, read from environment or defaults to
+"C".
+
+=item B<--work=>I
+
+Specify a directory where all the Development takes place. If omitted
+the variable C is read from F<~/openpkg/dev.rc>, read from
+environment or defaults to "C<${HOME}/work/openpkg>".
+
+=item B<--temp=>I
+
+Specify a directory used to place temporary files during the various
+build stages. If omitted the variable C is read
+from F<~/openpkg/dev.rc>, read from environment or defaults to
+"C<${TMPDIR-/tmp}/${LOGNAME}/openpkg>".
+
+=item B<--
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 30-Apr-2004 08:26:20
Branch: HEAD Handle: 2004043007262000
Modified files:
openpkg-tools/cmd dev.sh
Log:
When doing an "openpkg dev update" not all src.* directories are updates
if a simple "cvs update" is run in the top-level directory because the
src.* directories are usually created by _copying_ instead of _checking
out_. So they are not listed in the CVS/Entries file and hence they are
not picked up during "cvs update".
Summary:
RevisionChanges Path
1.22+6 -2 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.21 -r1.22 dev.sh
--- openpkg-tools/cmd/dev.sh 28 Apr 2004 09:22:19 - 1.21
+++ openpkg-tools/cmd/dev.sh 30 Apr 2004 06:26:20 - 1.22
@@ -552,11 +552,15 @@
}
update () {
-echo "++ updating ${OPENPKG_REPO}/{adm,doc,re,src,web,tools}"
+echo "++ updating ${OPENPKG_REPO}/{adm,doc,re,src*,web,tools}"
( builtin cd ${OPENPKG_WORK} || die "cannot cd to ${OPENPKG_WORK}"
HOME=${OPENPKG_WORK}
export HOME
- cvs -d ${OPENPKG_REPO} update
+ for subdir in adm doc re src src.* web tools; do
+ if [ -d $subdir ]; then
+ cvs -d ${OPENPKG_REPO} update $subdir
+ fi
+ done
)
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 28-Apr-2004 11:22:19
Branch: HEAD Handle: 2004042810221900
Modified files:
openpkg-tools/cmd dev.sh
Log:
change package command to "no param clears setting and reverts to
automatic detection" logic
Summary:
RevisionChanges Path
1.21+4 -7 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.20 -r1.21 dev.sh
--- openpkg-tools/cmd/dev.sh 28 Apr 2004 08:55:38 - 1.20
+++ openpkg-tools/cmd/dev.sh 28 Apr 2004 09:22:19 - 1.21
@@ -571,10 +571,7 @@
echo "${package}"
else
package="$1"
-if [ ".${package}" = . ]; then
-OPENPKG_SPEC=""
-cd "${OPENPKG_WORK}/$S"
-else
+if [ ".${package}" != . ]; then
if [ ! -d "${OPENPKG_WORK}/$S" ]; then
error "${OPENPKG_WORK}/$S directory not found"
return 1
@@ -585,10 +582,10 @@
error "${OPENPKG_WORK}/$S/${package} directory not found"
return 1
fi
-
-OPENPKG_SPEC="${package}"
-cd "${OPENPKG_WORK}/$S/${package}"
+builtin cd "${OPENPKG_WORK}/$S/${package}"
fi
+OPENPKG_SPEC="${package}"
+cd .
fi
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 28-Apr-2004 10:55:38
Branch: HEAD Handle: 2004042809553800
Modified files:
openpkg-tools/cmd dev.sh
Log:
remove vcheck compatiblity; update and sort help and abbreviated
commands
Summary:
RevisionChanges Path
1.20+6 -10 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.19 -r1.20 dev.sh
--- openpkg-tools/cmd/dev.sh 28 Apr 2004 08:47:39 - 1.19
+++ openpkg-tools/cmd/dev.sh 28 Apr 2004 08:55:38 - 1.20
@@ -2012,11 +2012,6 @@
die "testit not yet implemented. Developer: consider testit vs. test(1)"
}
-vcheck () {
-# compatiblity FIXME
-die "vcheck is deprecated. Use track."
-}
-
track () {
rpmT --help | grep -- --track >/dev/null || die "${RPMCMD:-rpm} does not
support --track"
if [ ".${packages}" = . ]; then
@@ -2255,13 +2250,15 @@
\$ openpkg dev new # spec... [-dry]create new package
from scratch
\$ openpkg dev package # [spec]switch to a
different package
\$ openpkg dev peek# [[spec]...] peek at file list of
binary package
+\$ openpkg dev query # matchinstance|canonifybranch query script
internals
\$ openpkg dev release # [[spec]...] [-dry] [-m "msg"] release package
changes to master server
\$ openpkg dev run # [[spec]...] [-dry] [-f] cmd append cmd to %prep
for spec and run rpm -bp
\$ openpkg dev search # [[spec]...] search a package on
master server
\$ openpkg dev setup # [[[spec]ctag]exec]initial setup of
openpkg dev working environment
+\$ openpkg dev srcdir # [dir] use a different
source directory
\$ openpkg dev test# [[spec]...] run functional test
(reserved for future use)
\$ openpkg dev tools # [path]tools to run
(default to instance internals)
-\$ openpkg dev track # [[spec]...] track version
(formerly called vcheck)
+\$ openpkg dev track # [[spec]...] track version
\$ openpkg dev update # update development
environment from master server
\$ openpkg dev vim # [[spec]...] [-f] spec edit and lint
(if HEAD or forced)
@@ -2291,8 +2288,8 @@
# handle command
case ${cmd} in
bash| ba* ) cmd="bash";;
-build | bu* ) cmd="build" ;;
branch | br* ) cmd="branch" ;;
+build | bu* ) cmd="build" ;;
clean | cl* ) cmd="clean" ;;
diff| di* ) cmd="diff";;
execute | ex* ) cmd="execute" ;;
@@ -2310,13 +2307,12 @@
run | ru* ) cmd="run" ;;
setup ) cmd="setup" ;;
search | se* ) cmd="search" ;;
+srcdir | sr* ) cmd="srcdir" ;;
test| te* ) cmd="test";;
-track | tr* ) cmd="track" ;;
tools | to* ) cmd="tools" ;;
+track | tr* ) cmd="track" ;;
update | up* ) cmd="update" ;;
-vcheck | vc* ) cmd="vcheck" ;;
vim | vi* ) cmd="vim" ;;
-srcdir | sr* ) cmd="srcdir" ;;
*) die "unknown command \"${cmd}\"" ;;
esac
${cmd} "$@"
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 28-Apr-2004 10:47:40
Branch: HEAD Handle: 2004042809473900
Modified files:
openpkg-tools/cmd dev.sh
Log:
introduce query to get script ingredients from outside; reanimate
canonifybranch for comfortable branching
Summary:
RevisionChanges Path
1.19+26 -9 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.18 -r1.19 dev.sh
--- openpkg-tools/cmd/dev.sh 28 Apr 2004 08:13:55 - 1.18
+++ openpkg-tools/cmd/dev.sh 28 Apr 2004 08:47:39 - 1.19
@@ -614,16 +614,19 @@
echo "${branch}"
else
branch="$1"
-if [ ".${branch}" = . ]; then
-return
-fi
-#FIXME canonifybranch "${1}"
-if [ ".${branch}" = .HEAD ]; then
-HOME=${OPENPKG_WORK} cvs update -A
-else
-HOME=${OPENPKG_WORK} cvs update -r ${branch}
+if [ ".${branch}" != . ]; then
+if [ ".${branch}" != .-A -a ".${OPENPKG_TOOLS_CMDPROG}" != . -a
".${OPENPKG_TOOLS_CMDNAME}" != . ]; then
+branch="`${OPENPKG_TOOLS_CMDPROG} ${OPENPKG_TOOLS_CMDNAME} query
canonifybranch \"${branch}\"`"
+fi
+if [ ".${branch}" = .HEAD ]; then
+HOME=${OPENPKG_WORK} cvs update -A
+elif [ ".${branch}" = .-A ]; then
+HOME=${OPENPKG_WORK} cvs update -A
+branch=""
+else
+HOME=${OPENPKG_WORK} cvs update -r ${branch}
+fi
fi
-
OPENPKG_CTAG=${branch}
cd .
fi
@@ -2213,6 +2216,19 @@
done
}
+query () {
+while [ ".$1" != . ]; do
+RV=""
+case ".$1" in
+ .ma* ) shift; matchinstance $1 ;;
+ .ca* ) shift; canonifybranch $1 ;;
+ * ) RV="ERROR: unknow query \"$1\"" ;;
+esac
+echo "$RV"
+shift
+done
+}
+
help () {
if [ -d ${OPENPKG_WORK} ]; then
out="tee ${OPENPKG_WORK}/00README"
@@ -2289,6 +2305,7 @@
new | ne* ) cmd="new" ;;
package | pa* ) cmd="package" ;;
peek| pe* ) cmd="peek";;
+query | qu* ) cmd="query" ;;
release | re* ) cmd="release" ;;
run | ru* ) cmd="run" ;;
setup ) cmd="setup" ;;
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Thomas Lotterer Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-toolsDate: 28-Apr-2004 10:13:55 Branch: HEAD Handle: 2004042809135500 Modified files: openpkg-tools/cmd dev.sh Log: reverse sorting so latest update is on top Summary: RevisionChanges Path 1.18+1 -1 openpkg-tools/cmd/dev.sh patch -p0 <<'@@ .' Index: openpkg-tools/cmd/dev.sh $ cvs diff -u -r1.17 -r1.18 dev.sh --- openpkg-tools/cmd/dev.sh 22 Apr 2004 21:34:42 - 1.17 +++ openpkg-tools/cmd/dev.sh 28 Apr 2004 08:13:55 - 1.18 @@ -1877,7 +1877,7 @@ URL=`echo $2 | sed -e 's| *$||'` PKG=`$E/lib/openpkg/curl -l -s $URL |\ sed -e 's|[^-a-zA-Z0-9_\.]||g' |\ - grep "^$1" | sort` + grep "^$1" | sort -r` if [ ".$PKG" != . ]; then for pkg in $PKG; do NAME=`echo "$pkg" | sed -e 's;\.src\.rpm$;;' -e 's;\.src\.sh$;;'` @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-tools/cmd/ dev.sh
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-toolsDate: 22-Apr-2004 11:00:04
Branch: HEAD Handle: 200404221000
Modified files:
openpkg-tools/cmd dev.sh
Log:
add rpm2cpio functionality similar to rpm
Summary:
RevisionChanges Path
1.16+25 -0 openpkg-tools/cmd/dev.sh
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
$ cvs diff -u -r1.15 -r1.16 dev.sh
--- openpkg-tools/cmd/dev.sh 21 Apr 2004 11:59:23 - 1.15
+++ openpkg-tools/cmd/dev.sh 22 Apr 2004 09:00:00 - 1.16
@@ -305,6 +305,8 @@
openpkgi -t "$@"
elif [ ".$1" = .rpm ]; then
openpkgi -e "$@"
+elif [ ".$1" = .rpm2cpio ]; then
+openpkgi -e "$@"
else
echo "$0:ERROR: don't know which openpkg multiplexer to call (unknown
command $1)" 1>&2
return 1
@@ -330,6 +332,25 @@
openpkg rpm "$@"
}
+rpm2cpioi () {
+local mode
+mode=$1
+shift
+openpkgi $mode rpm2cpio "$@"
+}
+
+rpm2cpioE () {
+rpm2cpioi -e "$@"
+}
+
+rpm2cpioT () {
+rpm2cpioi -t "$@"
+}
+
+rpm2cpio () {
+openpkg rpm2cpio "$@"
+}
+
# smart dealing with temporary root privileges
root () {
if [ ".$1" = . ]; then
@@ -1128,6 +1149,10 @@
dumpfuncrpmE>>.bashrc
dumpfuncrpmT>>.bashrc
dumpfuncrpm >>.bashrc
+dumpfuncrpm2cpioi >>.bashrc
+dumpfuncrpm2cpioE >>.bashrc
+dumpfuncrpm2cpioT >>.bashrc
+dumpfuncrpm2cpio>>.bashrc
dumpfuncopenpkg_dev_package >>.bashrc
dumpfuncopenpkg_dev_branch >>.bashrc
dumpfuncopenpkg_dev_execute >>.bashrc
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
