RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 23-Dec-2007 21:08:26
Branch: HEAD Handle: 2007122320082501
Modified files:
rpm VENDOR rpmqv.c
rpm/build poptBT.c rpmbuild.h
Log:
Sorry, one more OpenPKG-specifc feature required: Provide build-time
option "-bt" for just fetching the missing source and patch files.
The background is that in OpenPKG we want to have an CLI option for
explicitly fetching the missing source and patch files only as we want
to fetch at a particular controlled step in the packaging life-cycle
(between "rpm -bt" and "rpm -bp"). With this RPM 5 now finally supports
a *complete* packaging life-cycle -- which makes me very happy with the
latest status quo of RPM 5 HEAD.
Summary:
Revision Changes Path
2.16 +11 -0 rpm/VENDOR
2.19 +11 -0 rpm/build/poptBT.c
2.91 +3 -0 rpm/build/rpmbuild.h
1.134 +6 -0 rpm/rpmqv.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/VENDOR
============================================================================
$ cvs diff -u -r2.15 -r2.16 VENDOR
--- rpm/VENDOR 23 Dec 2007 19:41:28 -0000 2.15
+++ rpm/VENDOR 23 Dec 2007 20:08:25 -0000 2.16
@@ -308,3 +308,14 @@
want that RPM is able to download from the original
location, too.
+ ________________________________________________________________________
+
+ Change: explicit-source-fetch-cli-option
+ Purpose: Provide build-time option "-bt" for just fetching
+ the missing source and patch files.
+ Reason: In OpenPKG we want to have an CLI option for explicitly
+ fetching the missing source and patch files only as
+ we want to fetch at a particular controlled step
+ in the packaging life-cycle (between "rpm -bt" and
+ "rpm -bp").
+
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/poptBT.c
============================================================================
$ cvs diff -u -r2.18 -r2.19 poptBT.c
--- rpm/build/poptBT.c 16 Dec 2007 23:46:34 -0000 2.18
+++ rpm/build/poptBT.c 23 Dec 2007 20:08:26 -0000 2.19
@@ -36,6 +36,9 @@
#define POPT_BP 0x6270
#define POPT_BS 0x6273
#define POPT_BT 0x6274 /* support "%track"
script/section */
+#if defined(RPM_VENDOR_OPENPKG) /* explicit-source-fetch-cli-option */
+#define POPT_BF 0x6275
+#endif
#define POPT_TA 0x7461
#define POPT_TB 0x7462
#define POPT_TC 0x7463
@@ -81,6 +84,9 @@
case POPT_BP:
case POPT_BS:
case POPT_BT: /* support "%track" script/section */
+#if defined(RPM_VENDOR_OPENPKG) /* explicit-source-fetch-cli-option */
+ case POPT_BF:
+#endif
case POPT_TA:
case POPT_TB:
case POPT_TC:
@@ -157,6 +163,11 @@
{ "bt", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BT,
N_("track versions of sources from <specfile>"),
N_("<specfile>") },
+#if defined(RPM_VENDOR_OPENPKG) /* explicit-source-fetch-cli-option */
+ { "bf", 0, POPT_ARGFLAG_ONEDASH, 0, POPT_BF,
+ N_("fetch missing source and patch files"),
+ N_("<specfile>") },
+#endif
{ "tp", 0, POPT_ARGFLAG_ONEDASH, NULL, POPT_TP,
N_("build through %prep (unpack sources and apply patches) from
<tarball>"),
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/rpmbuild.h
============================================================================
$ cvs diff -u -r2.90 -r2.91 rpmbuild.h
--- rpm/build/rpmbuild.h 18 Dec 2007 19:40:52 -0000 2.90
+++ rpm/build/rpmbuild.h 23 Dec 2007 20:08:26 -0000 2.91
@@ -36,6 +36,9 @@
RPMBUILD_STRINGBUF = (1 << 10), /*!< only for doScript() */
RPMBUILD_TRACK = (1 << 11), /*!< Execute %%track. */
RPMBUILD_RMSPEC = (1 << 12) /*!< Remove spec file. */
+#if defined(RPM_VENDOR_OPENPKG) /* explicit-source-fetch-cli-option */
+ ,RPMBUILD_FETCHSOURCE= (1 << 13) /*!< Fetch source(s) and patch(s). */
+#endif
} rpmBuildFlags;
/[EMAIL PROTECTED]@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmqv.c
============================================================================
$ cvs diff -u -r1.133 -r1.134 rpmqv.c
--- rpm/rpmqv.c 22 Dec 2007 11:15:43 -0000 1.133
+++ rpm/rpmqv.c 23 Dec 2007 20:08:25 -0000 1.134
@@ -656,6 +656,12 @@
rpmDefineMacro(NULL, "patch #", RMIL_CMDLINE);
rpmDefineMacro(NULL, "prep %%prep", RMIL_CMDLINE);
/[EMAIL PROTECTED]@*/ break;
+#if defined(RPM_VENDOR_OPENPKG) /* explicit-source-fetch-cli-option */
+ case 'f':
+ ba->buildAmount |= RPMBUILD_FETCHSOURCE;
+ ba->noDeps = 1;
+ /[EMAIL PROTECTED]@*/ break;
+#endif
}
if (!poptPeekArg(optCon)) {
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
