I'd like to see multiple people merging the tree, with best case scenario being that it happens more than once a day. worst case status quo. I'm willing to write the scripts and teach anyone how to do it. I just ask that you can read an ebuild (to some degree) and have good judgement, or at least not too embarrassed to ask. Most ebuild merges are IUSE, KEYWORDS, and cvs line. the rest is really almost automated, merge (del package.mask) merge (fix ebuilds), repoman manifest, gen_metadata, commit, push. This will allow me to focus on other things hopefully, and make the distro better quality.
email the dev list if you're interested.
Showing posts with label tree. Show all posts
Showing posts with label tree. Show all posts
Apr 21, 2009
Mar 12, 2009
Tree hasn't been updated - why
So 2 days ago, when I went to sync to gentoo I didn't get any updates. I'm not really sure why as the process seemed to go alright. It could have something to do with the next bit.
My System appeared to have been compromised. Syslog-ng was disabled and all logs post dec 30 2008 were removed. So i've spent the better part of yesterday/today reinstalling my system. Tree should be synced and merged tonight.
My System appeared to have been compromised. Syslog-ng was disabled and all logs post dec 30 2008 were removed. So i've spent the better part of yesterday/today reinstalling my system. Tree should be synced and merged tonight.
Feb 22, 2009
regen2 maintaining it's own openrc
So openrc was updated recently, and I noticed it, I decided it was time to find out why drobbins had created his own version. so I viewed them, ultimately I decided that drobbins had made too many changes but the gentoo ebuild had its own issues. So I modified the Gentoo ebuild to use EAPI 2, removed all of the live ebuild code that shouldn't be in it, updated the branding, and we're ready to rock.
Feb 21, 2009
split package.mask
There's been a problem with ${PORTDIR}/profiles/package.mask since I added sunrise, I didn't realize at the time the problem wouldn't be adding atoms, it would be keeping track of when they should be removed. I've decided that the best way to do it is to use portages 'directory concatenation' feature, I turned package.mask into a directory, it now contains a file for each overlay that has a package.mask, and one for gentoo.org and regen2.org. This will make it much easier to keep track of removals. They originals are being merged in from a package.mask 'overlay' on regen2's github account. Let me know if anything is now masked that shouldn't be or unmasked that shouldn't be.
Feb 11, 2009
open letter to Dan Robbins - merge regen2
I had an interesting conversation with thewtex on #funtoo yesterday. My conclusion is, this divergence of tree's is stupid. We should be working on a common base, at least common enough that users could relatively easily merge our tree's. My tree is currently ahead of yours in content by 3 sunrise merges, 1 mpd, and the 2 merges of the python overlay. Your users can't easily get these updates.
Due to the fact that we have irreconcilable views on what patches we allow, the fork must remain. However, users don't have to suffer for it. The solution is to base funtoo.org on regen2.org. I can't base regen2.org on funtoo.org because I have stricter QA policies, however those policies shouldn't negatively affect funtoo, I can continue to cherry-pick patches that you wish to put into funtoo, so they end up in regen2 as well.
This will require that you, trust me enough to merge the tree. I will be handling the gentoo and overlay merges. You will simply merge my tree daily.
In order to resolve the differences of the tree as they stand I suggest creating a funtoo.org2 branch that's based on regen2.org and discontinuing the maintenance of funtoo.org. cherry-pick any patches I haven't applied to regen2 (I can point out which ones) and apply any other changes you need to. The other option is to merge my tree, this will be painful and arduous for you, but require no work on the part of your users.
This resolves many problems. 1 you won't have to deal with the main tree or overlays, 2 you won't have to run your patches by me and can do what you want, 3 users get the best of both worlds, 4 developers can choose to email you inline patches, or send me pull requests. Everyone should go home happy from this.
what say you?
P.S. I will not have it said that I want a rift in the community, I want whats best for all kinds of users and the status quo is not.
EDIT: in short the answer is no. drobbins doesn't want to merge my tree, as it's supposedly untrusted, he also doesn't want to cherry-pick patches out of my tree. I don't want to spend time merging the overlays just for Funtoo, on top of merging them for Regen2. Apparently my bug fixes, and version bumps aren't good enough for Funtoo.
Due to the fact that we have irreconcilable views on what patches we allow, the fork must remain. However, users don't have to suffer for it. The solution is to base funtoo.org on regen2.org. I can't base regen2.org on funtoo.org because I have stricter QA policies, however those policies shouldn't negatively affect funtoo, I can continue to cherry-pick patches that you wish to put into funtoo, so they end up in regen2 as well.
This will require that you, trust me enough to merge the tree. I will be handling the gentoo and overlay merges. You will simply merge my tree daily.
In order to resolve the differences of the tree as they stand I suggest creating a funtoo.org2 branch that's based on regen2.org and discontinuing the maintenance of funtoo.org. cherry-pick any patches I haven't applied to regen2 (I can point out which ones) and apply any other changes you need to. The other option is to merge my tree, this will be painful and arduous for you, but require no work on the part of your users.
This resolves many problems. 1 you won't have to deal with the main tree or overlays, 2 you won't have to run your patches by me and can do what you want, 3 users get the best of both worlds, 4 developers can choose to email you inline patches, or send me pull requests. Everyone should go home happy from this.
what say you?
P.S. I will not have it said that I want a rift in the community, I want whats best for all kinds of users and the status quo is not.
EDIT: in short the answer is no. drobbins doesn't want to merge my tree, as it's supposedly untrusted, he also doesn't want to cherry-pick patches out of my tree. I don't want to spend time merging the overlays just for Funtoo, on top of merging them for Regen2. Apparently my bug fixes, and version bumps aren't good enough for Funtoo.
Jan 18, 2009
mpd overlay
I'm adding the MPD overlay courtesy of Rullzer who's kind enough to merge and maintain it in tree. Nothing big here, just some more up to date ebuilds, and more clients for MPD.
Subscribe to:
Posts (Atom)