On Thu, Sep 12, 2013 at 9:57 AM, Ingo Weinhold <ingo_weinhold@xxxxxx> wrote: > On 09/12/2013 04:07 AM, Joseph Prostko wrote: >> >> On Sat, Sep 7, 2013 at 8:43 PM, Ingo Weinhold <ingo_weinhold@xxxxxx> >> wrote: >>> >>> This seems >>> to be a good time to merge this rather long-running branch back into the >>> master and thus expose it to a wider audience. >>> >>> Our plan is to wait a few more days, give everyone time to raise >>> objections, >>> and then do the deed. >> >> >> Are you and Oliver still on target to get the merge done before BG? I >> only ask since I would ideally like to have my Haiku machines imaged >> with the merged code in time for the Ohio Linuxfest. > > I was hoping to do the merge later today, but there are still a few open > issues. There's the CD boot issue (currently looking into it), a few missing > details wrt. package activation (handling of settings files, running post > installation scripts), and Pe not working on x86-64 (Oliver is looking into > that). Not sure, if we'll be able to address all issues today. So maybe the > merge will be done on the train to BeGeistert. :-) Well, at least you'll have something to do on the train in that case. :) > I last merged the master into the PM branch 2 months ago, so we aren't too > much out of sync. I can probably at least do another merge today, so even if > I didn't manage to merge the other way before BeGeistert you could just > build an up-to-date Haiku with package management from the PM branch. Sure, if you get around to that, that would be great. If not, I'll figure out something satisfactory. :) Thanks! - joe