On Wed, 4 Mar 2020 at 08:55, Sebastian Huber <sebastian.hu...@embedded-brains.de> wrote: > > On 25/02/2020 12:54, Sebastian Huber wrote: > > On 25/02/2020 11:00, Hesham Almatary wrote: > >> On Mon, 24 Feb 2020 at 22:50, Chris Johns<chr...@rtems.org> wrote: > >>> On 21/2/20 11:11 pm, Sebastian Huber wrote: > >>>> On 21/02/2020 12:26, Hesham Almatary wrote: > >>>>> On Fri, 21 Feb 2020 at 11:07, Sebastian Huber > >>>>> <sebastian.hu...@embedded-brains.de> wrote: > >>>>>> Hello Hesham, > >>>>>> > >>>>>> On 20/02/2020 16:40, Hesham Almatary wrote: > >>>>>>> Hello, > >>>>>>> > >>>>>>> Are there any progress updates to the Waf build system > >>>>>>> integration in RTEMS? > >>>>>>> > >>>>>>> I have pulled [1] and it seems like it hasn't got many updates since > >>>>>>> December. I wonder what's still remaining/blocking to merge it, > >>>>>>> or at > >>>>>>> least push it as a development branch (without re-writing history) > >>>>>>> that others, including me, can use it and submit patches against. > >>>>>>> > >>>>>>> [1] git://git.rtems.org/sebh/rtems.git > >>>>>> technically, the new build system is ready for integration into the > >>>>>> master branch. I would need about one day to rebase and test it > >>>>>> before > >>>>>> the push. The integration is currently blocked since Chris and > >>>>>> Joel had > >>>>>> no time to look at it. > >>>>>> > >>>>> Thanks for your input, Sebastian. Is there a recommended branch I > >>>>> should be based on? I noticed there's "build" and "build-next". > >>>> The "build" branch contains the state of the first review. I updated > >>>> "build-next" a couple of times to integrate the changes on the RTEMS > >>>> master. > >>>> > >>>>> Do you intend to re-write git history in either? > >>>> Yes, when I started with the build system work I didn't expect a > >>>> more than two > >>>> months review period. > >>> I have discussed this merge with Joel. We have decided to release > >>> RTEMS 5 before > >>> we merge a new build system. A release with parallel build systems is > >>> confusing > >>> and distracting. > >>> > >> That makes sense to me. I think we should both try to push for an > >> RTEMS release soon, and make the waf/build > >> branch more stable and/or in the view (e.g., push as an experimental > >> branch) for developer to use until a release comes out. I understand > >> another branch would incur more maintaibility efforts, but it will > >> also help make the the new build system more usable. > > > > I can do a forced update of the "build" branch with my latest version > > based on rebase of the current master by the end of the week. > > Afterwards, I can do merges from the master instead of forced pushes. > > This should enable you to base your work on this branch. You can also > > send me patches. > > > > Before the new build system is integrated in the master, I will do a > > final rebase to the master and squash commits. > > I did a forced push to the build branch today. It is based on the master > branch commit: > > https://git.rtems.org/rtems/commit/?id=fa3005f6c1ddb99347acb70cbaecd155ed0356ed > > I will not do another forced push to the build branch in the future and > instead do merges from the master to the build branch. I hope this helps > to use it for experimental work. After the RTEMS 5 release when the new > build system is ready to get integrated I will do a rebase and squash > the commits before I push them to the master. > That will definitely make my life easier. Thanks, Sebastian!
> -- > Sebastian Huber, embedded brains GmbH > > Address : Dornierstr. 4, D-82178 Puchheim, Germany > Phone : +49 89 189 47 41-16 > Fax : +49 89 189 47 41-09 > E-Mail : sebastian.hu...@embedded-brains.de > PGP : Public key available on request. > > Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG. -- Hesham _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel