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: 12-Sep-2003 14:33:47
Branch: HEAD Handle: 2003091213334700
Modified files:
openpkg-src/openpkg HISTORY rpm.patch.feature
Log:
Allow "-bb --short-circuit" for continuing building a binary package
after the %install step (usually previously fixed and repeated with
"-bi --short-circuit".
Summary:
Revision Changes Path
1.47 +1 -0 openpkg-src/openpkg/HISTORY
1.18 +20 -0 openpkg-src/openpkg/rpm.patch.feature
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.46 -r1.47 HISTORY
--- openpkg-src/openpkg/HISTORY 12 Sep 2003 11:54:41 -0000 1.46
+++ openpkg-src/openpkg/HISTORY 12 Sep 2003 12:33:47 -0000 1.47
@@ -2,6 +2,7 @@
2003
====
+20030912 allow "-bb --short-circuit" for continuing building a binary package
20030912 unconditionally remove temporary files of generated/executed scripts
20030912 do not remove the builded sources in %clean to be consistent with other
OpenPKG packages
20030912 include all essential RPM C API headers in <prefix>/include/rpm/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.17 -r1.18 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 12 Sep 2003 11:54:41 -0000 1.17
+++ openpkg-src/openpkg/rpm.patch.feature 12 Sep 2003 12:33:47 -0000 1.18
@@ -1148,3 +1148,23 @@
rpm exec --initdb rpmd --initdb
rpm exec --rebuilddb rpmd --rebuilddb
+
++---------------------------------------------------------------------------
+| Allow "-bb --short-circuit" for continuing building a binary package
+| after the %install step (usually previously fixed and repeated with
+| "-bi --short-circuit".
++---------------------------------------------------------------------------
+Index: rpmqv.c
+--- rpmqv.c 4 Mar 2003 15:32:57 -0000 1.1.1.8
++++ rpmqv.c 12 Sep 2003 11:58:25 -0000
+@@ -682,6 +682,10 @@
+ case 'b':
+ ba->buildAmount |= RPMBUILD_PACKAGEBINARY;
+ ba->buildAmount |= RPMBUILD_CLEAN;
++#ifdef OPENPKG
++ if ((ba->buildChar == 'b') && ba->shortCircuit)
++ /[EMAIL PROTECTED]@*/ break;
++#endif
+ /[EMAIL PROTECTED]@*/
+ case 'i':
+ ba->buildAmount |= RPMBUILD_INSTALL;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
