2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 <2018> 2019 2020 2021 2022 2023 2024 | Index | 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 <2018> 2019 2020 2021 2022 2023 2024 |
<== Date ==> | <== Thread ==> |
---|
Subject: | Re: RTEMS-5 integration |
From: | Ralph Lange <[email protected]> |
To: | Benjamin Franksen <[email protected]> |
Cc: | EPICS Core Talk <[email protected]> |
Date: | Tue, 26 Jun 2018 17:34:14 +0200 |
On 06/26/2018 01:40 PM, Ralph Lange wrote:
> Merge Proposals are at
> https://code.launchpad.net/epics-base/+activereviews
Thanks.
> Heinz' RTEMS branch needs some clean-up and minimization - there are
> comments in the merge proposals that name some places.
Okay, I have read Michael's comments.
> Note that the two MPs are actually one (again), as we recently
> dropped the split-up of repo-branches for the modules formerly known
> as EPICS V3.
Nice. It looks as if the rtems5 branch is a bit behind, though, it still
has submodules for these parts.
> I was volunteering to help him do this, but it would actually be
> great if you could jump in. My arguments (same language and time
> zone) cover you in the same way, and you have a much better
> justification (as ITER does not intend to use RTEMS).
The first thing to do would be to bring the rtems5 branch up to date
with core/master. I tried to merge hj/rtems5 which succeeded but of
course that gave me only a few changes in configure. I then tried to
merge hj/rtems5libcom but that failed horribly with thousands of
rename/delete conflicts. My git-fu is rather weak so I guess my naive
attempts were doomed from the beginning...
Cheers
Ben
--
"Make it so they have to reboot after every typo." ― Scott Adams