Please note that "continuous integration" means
You break something, you fix it (or I will be forced to revert the
change).
I'm almost (but not quite) at "continuous integration" for rpm-5.3.6.
I _WILL_ be there in rpm-5.3.7 in December.
Infrastructure deployment is the rate limiting step.
73 de Jeff
On Oct 31, 2010, at 12:16 PM, Per Øyvind Karlsen wrote:
> RPM Package Manager, CVS Repository
> http://rpm5.org/cvs/
> ____________________________________________________________________________
>
> Server: rpm5.org Name: Per Øyvind Karlsen
> Root: /v/rpm/cvs Email: pkarl...@rpm5.org
> Module: rpm Date: 31-Oct-2010 17:16:21
> Branch: rpm-5_3 Handle: 2010103116162001
>
> Modified files: (Branch: rpm-5_3)
> rpm CHANGES
> rpm/build parsePreamble.c
>
> Log:
> make sure to expand %buildroot from main package.
>
> Summary:
> Revision Changes Path
> 1.3296.2.108+1 -0 rpm/CHANGES
> 2.192.2.2 +11 -0 rpm/build/parsePreamble.c
> ____________________________________________________________________________
>
> patch -p0 <<'@@ .'
> Index: rpm/CHANGES
> ============================================================================
> $ cvs diff -u -r1.3296.2.107 -r1.3296.2.108 CHANGES
> --- rpm/CHANGES 28 Oct 2010 02:03:05 -0000 1.3296.2.107
> +++ rpm/CHANGES 31 Oct 2010 16:16:20 -0000 1.3296.2.108
> @@ -1,4 +1,5 @@
> 5.3.5 -> 5.3.6:
> + - proyvind: make sure to expand %buildroot from main package.
> - jbj: devtool: don't distribute internal pcre.
> - proyvind: filetriggers: don't bother w unneeded chroot.
> - devzero2000: add an --setfscontext popt alias (lp#660406)
> @@ .
> patch -p0 <<'@@ .'
> Index: rpm/build/parsePreamble.c
> ============================================================================
> $ cvs diff -u -r2.192.2.1 -r2.192.2.2 parsePreamble.c
> --- rpm/build/parsePreamble.c 18 Oct 2010 07:01:52 -0000
> 2.192.2.1
> +++ rpm/build/parsePreamble.c 31 Oct 2010 16:16:21 -0000
> 2.192.2.2
> @@ -1173,6 +1173,17 @@
>
> /* Do some final processing on the header */
>
> + /*
> + * Expand buildroot one more time to get %{version} and the like
> + * from the main package.
> + */
> + if (initialPackage) {
> + const char *s = rpmExpand("%{?buildroot}", NULL);
> + if (s && *s)
> + (void) addMacro(NULL, "buildroot", NULL, s, -1);
> + s = _free(s);
> + }
> +
> /* XXX Skip valid arch check if not building binary package */
> if (!spec->anyarch && checkForValidArchitectures(spec))
> return RPMRC_FAIL;
> @@ .
> ______________________________________________________________________
> RPM Package Manager http://rpm5.org
> CVS Sources Repository rpm-...@rpm5.org
______________________________________________________________________
RPM Package Manager http://rpm5.org
Developer Communication List rpm-devel@rpm5.org
