RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 24-Mar-2011 22:25:50
Branch: HEAD Handle: 2011032421254901
Modified files:
rpm CHANGES rpmpopt.in
rpm/macros macros.in
Log:
- add a --nofsync popt alias (caveat: experimental & risky).
Summary:
Revision Changes Path
1.3575 +1 -0 rpm/CHANGES
1.44 +3 -2 rpm/macros/macros.in
2.94 +4 -16 rpm/rpmpopt.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3574 -r1.3575 CHANGES
--- rpm/CHANGES 24 Mar 2011 13:34:23 -0000 1.3574
+++ rpm/CHANGES 24 Mar 2011 21:25:49 -0000 1.3575
@@ -1,4 +1,5 @@
5.4.0 -> 5.4.1:
+ - jbj: add a --nofsync popt alias (caveat: experimental & risky).
- devzero2000: drop borken test on change a directory with a symlink
- proyvind: always run %clean so it won't be required in .spec file.
- devzero2000: permit in configure phase to enable the
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
============================================================================
$ cvs diff -u -r1.43 -r1.44 macros.in
--- rpm/macros/macros.in 10 Feb 2011 21:13:06 -0000 1.43
+++ rpm/macros/macros.in 24 Mar 2011 21:25:50 -0000 1.44
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.43 2011/02/10 21:13:06 pkarlsen Exp $
+# $Id: macros.in,v 1.44 2011/03/24 21:25:50 jbj Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -298,7 +298,8 @@
#==================================================
# Use Berkeley DB transaction logging for rpmdb ACID behavior.
-%__dbi_txn create lock log mpool txn auto_commit thread thread_count=64
+# XXX the %{?__nofsync} is passed from the --nofsync popt alias on the rpm
cli.
+%__dbi_txn create %{?__nofsync:nofsync} lock log mpool txn auto_commit
thread thread_count=64
%__dbi_other %{?_tmppath:tmpdir=%{_tmppath}} %{?__dbi_txn}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmpopt.in
============================================================================
$ cvs diff -u -r2.93 -r2.94 rpmpopt.in
--- rpm/rpmpopt.in 24 Feb 2011 19:31:23 -0000 2.93
+++ rpm/rpmpopt.in 24 Mar 2011 21:25:49 -0000 2.94
@@ -2,7 +2,7 @@
# \verbatim
#
# @USRLIBRPM@/@configure_input@
-# $Id: rpmpopt.in,v 2.93 2011/02/24 19:31:23 pkarlsen Exp $
+# $Id: rpmpopt.in,v 2.94 2011/03/24 21:25:49 jbj Exp $
#
# This file *should not be modified*. Local customizations
# belong in /etc/popt, not here. This file will be replaced
@@ -387,6 +387,9 @@
rpm alias --rebuilddbapi --define '_dbapi_rebuild !#:+'
rpm alias --rebuilddbpath --define '_dbpath_rebuild !#:+'
+# permit fsync disabling of Berkeley DB (caveat: experimental & risky)
+rpm alias --nofsync --define '__nofsync nofsync'
+
#==============================================================================
# [--dbpath DIRECTORY" "use database in DIRECTORY"
rpm alias --dbpath --define '_dbpath !#:+'
@@ -426,21 +429,6 @@
rpm alias --arch --qf '%-34{=NAME}\t%{ARCH}\n' \
--POPTdesc=$"list package architecture"
#==============================================================================
-rpmb alias --dbpath --define '_dbpath !#:+' \
- --POPTdesc=$"use database in DIRECTORY" \
- --POPTargs=$"DIRECTORY"
-rpmb alias --ftpport --define '_ftpport !#:+'
-rpmb alias --ftpproxy --define '_ftpproxy !#:+'
-rpmb alias --httpport --define '_httpport !#:+'
-rpmb alias --httpproxy --define '_httpproxy !#:+'
-rpmb alias --timecheck --define '_timecheck !#:+'
-rpmb alias --with --define "_with_!#:+ --with-!#:+" \
- --POPTdesc=$"enable configure <option> for build" \
- --POPTargs=$"<option>"
-rpmb alias --without --define "_without_!#:+ --without-!#:+" \
- --POPTdesc=$"disable configure <option> for build" \
- --POPTargs=$"<option>"
-#==============================================================================
rpmbuild alias --dbpath --define '_dbpath !#:+' \
--POPTdesc=$"use database in DIRECTORY" \
--POPTargs=$"DIRECTORY"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
