Experimental Physics and
Industrial Control System

"Johnson, Andrew N. via Core-talk" <[email protected]> · Fri, 26 Oct 2018 22:18:19 +0000

Merge pushed, I will handle any fallout from it on Monday (and start
looking at merge requests for 7.0 (and Marty's caProvider PR).

- Andrew

On 10/25/2018 06:04 PM, Johnson, Andrew N. via Core-talk wrote:
> Hi Michael (and others),
> 
> I am working on resolving the conflicts from merging 3.16.2-rc1 into the
> 7.0 branch. Please do not push any commits to the 7.0 branch until I'm
> finished. This looks like a tricky merge which may take me most of
> tomorrow to complete. I hope I will also have time then to announce the
> 3.16.2-rc1 release.
> 
> The Travis RTEMS and QEMU configurations for the 3.16 and 7.0 branches
> appear to be significantly different. If you have time could you look at
> the travis files and scripts and email me (do NOT commit) the files as
> you think they should appear on the merged 7.0 branch.
> 
> There are also some things I don't understand in the configuration, why
> are we pulling in bison, flex, texinfo and install-info? Should the
> BRCORE=... build environment go away? Do we want to add the static
> builds to 7.0 that we have apparently only been doing in 3.16?
> 
> Thanks,
> 
> - Andrew
> 

-- 
Arguing for surveillance because you have nothing to hide is no
different than making the claim, "I don't care about freedom of
speech because I have nothing to say." -- Edward Snowdon

Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System