OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Aug-2003 15:52:13
Branch: OPENPKG_UPGRADE_RPM42 Handle: 2003082614521300
Modified files: (Branch: OPENPKG_UPGRADE_RPM42)
openpkg-src/openpkg openpkg.boot
Log:
fix three nasty bugs: --rcfile has to be first option; there is also
rpm[iq]; fix cp operation
Summary:
Revision Changes Path
1.28.2.5 +7 -7 openpkg-src/openpkg/openpkg.boot
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.28.2.4 -r1.28.2.5 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 25 Aug 2003 18:55:22 -0000 1.28.2.4
+++ openpkg-src/openpkg/openpkg.boot 26 Aug 2003 13:52:13 -0000 1.28.2.5
@@ -411,12 +411,12 @@
echo "$0:ERROR: file $tmpdir/rpm exists, cannot override"
exit 1
fi
-echo "#!/bin/sh" >$tmpdir/rpm
-( echo "exec $RPM_BUILD_ROOT$prefix/bin/rpm \\"
+( echo "#!/bin/sh"
+ echo "exec $RPM_BUILD_ROOT$prefix/bin/rpm \\"
+ echo " --rcfile \"$tmpdir/rpm.1\" \\"
echo " --define \"__platform $RPM_BUILD_ROOT$prefix/etc/openpkg/platform\" \\"
- echo " --rcfile $tmpdir/rpm.1 \\"
- echo "\"[EMAIL PROTECTED]""
-) >>$tmpdir/rpm
+ echo " \"[EMAIL PROTECTED]""
+) >$tmpdir/rpm
chmod a+x $tmpdir/rpm
# direct our own "rpm" tool to adjusted macro sets
@@ -453,7 +453,7 @@
# tool is able to execute its sub-tools "rpm<x>".
V_rpm=`grep V_rpm $spec | head -1 | awk '{ printf("%s", $3); }'`
sed <$RPM_BUILD_ROOT$prefix/lib/openpkg/rpmpopt >$tmpdir/.popt \
- -e
"s;^\\(rpm.*exec.*\\)\\(rpm[bdeukv]*\\);\\1$RPM_BUILD_ROOT$prefix/lib/openpkg/\\2;"
+ -e
"s;^\\(rpm.*exec.*\\)\\(rpm[bdieukvq]*\\);\\1$RPM_BUILD_ROOT$prefix/lib/openpkg/\\2;"
# activate the .popt file
HOME=$tmpdir
@@ -572,7 +572,7 @@
Triggername Dirnames Requireversion Provideversion Installtid \
Sigmd5 Sha1header Filemd5s Depends Pubkeys; do
if [ ! -f $RPM_BUILD_ROOT$prefix/RPM/DB/$dbfile ]; then
- cp $RPM_BUILD_ROOT$prefix/RPM/DB/Empty
+ cp $RPM_BUILD_ROOT$prefix/RPM/DB/Empty \
$RPM_BUILD_ROOT$prefix/RPM/DB/$dbfile
fi
files="$files RPM/DB/$dbfile"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
