sync up with rootmaster branch

[davidlange6]

we no longer need the CXX modules specific patches in root, so we can use the same branch/commit of root in the modules branch as in the root master branch. At the same time I've cleaned up some unnecessary differences between these branches in root.spec.

We can use this for the next modules IB (Monday night I think) - I've tested it via a full build locally.

@vgvassilev @mrodozov @oshadura @smuzaffar

[cmsbuild]

A new Pull Request was created by @davidlange6 (David Lange) for branch IB/CMSSW_11_1_X/rootmodule.

@cmsbuild, @smuzaffar, @mrodozov, @tulamor can you please review it and eventually sign? Thanks.
cms-bot commands are listed here

[mrodozov]

so we wait for the IB to build, since it has to pick the latest changes for DD4hep fix, and when it's built we test this against it. In short - tomorrow morning ?
Or merge it since it builds, so the IB will include it ?

[davidlange6]

We can do at the same time. It’s already tested... Cheers, David On 2 Mar 2020, at 04:30, Mircho Rodozov <notifications@github.com> wrote:  so we wait for the IB to build, since it has to pick the latest changes for DD4hep fix, and when it's built we test this against it. In short - tomorrow morning ? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#5617?email_source=notifications&email_token=ABGPFQ4LTAC4NE4PEK4JTGDRFN4A7A5CNFSM4K7JWCRKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOENOSLLY#issuecomment-593307055>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/ABGPFQ4CUAC4ZCT6LHCTKSLRFN4A7ANCNFSM4K7JWCRA>.

[mrodozov]

+externals

[cmsbuild]

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-run-pr-tests/4952/console Started: 2020/03/02 14:12

[cmsbuild]

This pull request is fully signed and it will be integrated in one of the next IB/CMSSW_11_1_X/rootmodule IBs after it passes the integration tests. This pull request will now be reviewed by the release team before it's merged. @davidlange6, @silviodonato, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

[mrodozov]

abort
@silviodonato if we test this it will fail because the last modules IB doesn't include a change for DD4Hep, so no point of testing it. The code includes it now (both cmssw and cmsdist) but the IB did not have one part (the cmsdist one)

[cmsbuild]

Jenkins tests are aborted.

[mrodozov]

get this in the next modules IB