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: 10-Oct-2003 20:42:50
Branch: HEAD Handle: 2003101019425000
Modified files:
openpkg-src/openpkg HISTORY rpm.patch.bugfix rpm.patch.feature
rpm.patch.porting rpm.patch.regen rpmpopt
Log:
provide %{_rpmdb_private} macro and --db-private for operating the RPM
DB in DB_PRIVATE mode
Summary:
Revision Changes Path
1.68 +1 -0 openpkg-src/openpkg/HISTORY
1.27 +1 -1 openpkg-src/openpkg/rpm.patch.bugfix
1.28 +17 -2 openpkg-src/openpkg/rpm.patch.feature
1.31 +1 -1 openpkg-src/openpkg/rpm.patch.porting
1.26 +1 -1 openpkg-src/openpkg/rpm.patch.regen
1.8 +4 -0 openpkg-src/openpkg/rpmpopt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.67 -r1.68 HISTORY
--- openpkg-src/openpkg/HISTORY 10 Oct 2003 13:53:37 -0000 1.67
+++ openpkg-src/openpkg/HISTORY 10 Oct 2003 18:42:50 -0000 1.68
@@ -2,6 +2,7 @@
2003
====
+20031010 provide %{_rpmdb_private} macro and --db-private for operating the RPM DB
in DB_PRIVATE mode.
20031010 working off the aux.prereq.sh script for adjusted platform checks and
additional disk space checks
20031008 make sure RPM does not pick up headers of a vendor BeeCrypt package under
RedHat Linux
20031008 fix --makeproxy command after recent OpenPKG branding in "rpm --version"
output
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.26 -r1.27 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 8 Oct 2003 18:10:00 -0000 1.26
+++ openpkg-src/openpkg/rpm.patch.bugfix 10 Oct 2003 18:42:50 -0000 1.27
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 08-Oct-2003
+## Created on: 10-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.27 -r1.28 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 8 Oct 2003 18:10:00 -0000 1.27
+++ openpkg-src/openpkg/rpm.patch.feature 10 Oct 2003 18:42:50 -0000 1.28
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 08-Oct-2003
+## Created on: 10-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -873,6 +873,12 @@
| Disable "check-files" feature, because it is useless in OpenPKG
| (we consistently use BuildRoot and our %files lists are fully
| autogenerated) and just makes problems on bootstrapping.
+| Provide the possibility to optionally re-enable the old
+| RPM 4.0.2 way of RPM database operation by defining the
+| macro %{_rpmdb_private}. This is important for easily fixing
+| corrupted/hanging RPM database (on upgrades, etc) or if you
+| permanently have to operate RPM on a NFS filesystem where no
+| rpc.lockd(8) support is available.
| Additionally, do not override the "_host_xx" macros because their
| value (derived from <prefix>/etc/openpkg/platform) is already
| correctly set internally.
@@ -883,7 +889,7 @@
+---------------------------------------------------------------------------
Index: macros.in
--- macros.in 2 Jul 2003 19:20:52 -0000 1.1.1.14
-+++ macros.in 18 Sep 2003 11:15:49 -0000
++++ macros.in 10 Oct 2003 18:10:14 -0000
@@ -305,7 +305,7 @@
# Returns list of unpackaged files, i.e. files in $RPM_BUILD_ROOT not packaged.
#
@@ -893,6 +899,15 @@
#
# Should unpackaged files in a build root terminate a build?
+@@ -449,7 +449,7 @@
+
+ # Use a CDB database model for concurrent access.
+ # XXX Add "private" here for legacy interoperation transiting to glibc+nptl.
+-%__dbi_cdb create cdb mpool mp_mmapsize=16Mb mp_size=1Mb
++%__dbi_cdb create cdb mpool mp_mmapsize=16Mb mp_size=1Mb
%{?_rpmdb_private:private}
+
+ %__dbi_other %{?_tmppath:tmpdir=%{_tmppath}} %{?__dbi_cdb}
+
@@ -618,6 +618,10 @@
# If non-zero, all erasures will be automagically repackaged.
%_repackage_all_erasures 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.30 -r1.31 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 8 Oct 2003 18:10:00 -0000 1.30
+++ openpkg-src/openpkg/rpm.patch.porting 10 Oct 2003 18:42:50 -0000 1.31
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 08-Oct-2003
+## Created on: 10-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.25 -r1.26 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 8 Oct 2003 18:10:00 -0000 1.25
+++ openpkg-src/openpkg/rpm.patch.regen 10 Oct 2003 18:42:50 -0000 1.26
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 08-Oct-2003
+## Created on: 10-Oct-2003
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmpopt
============================================================================
$ cvs diff -u -r1.7 -r1.8 rpmpopt
--- openpkg-src/openpkg/rpmpopt 18 Sep 2003 11:45:08 -0000 1.7
+++ openpkg-src/openpkg/rpmpopt 10 Oct 2003 18:42:50 -0000 1.8
@@ -67,6 +67,10 @@
rpm exec --db-fixate rpmdb --fixate \
--POPTdesc=$"RPM database administration: fixate existing database (harmless
operation; for fixating files only)"
+# RPM extension: "rpm --db-private ..."
+rpm alias --db-private --define "_rpmdb_private yes" \
+ --POPTdesc=$"operate RPM database in in Berkeley-DB DB_PRIVATE mode"
+
# RPM adjustment: improved and cleaned up "rpm -i/--info"
rpmq alias --info --qf '\
Name: %-25{NAME} Source RPM: %{SOURCERPM}\n\
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
