> -----Original Message----- > From: Joe MacDonald [mailto:[email protected]] > Sent: Friday, March 04, 2016 4:49 AM > To: Huang, Jie (Jackie) > Cc: Martin Jansa; [email protected] > Subject: Re: [oe] Still many meta-networking changes waiting in > patchwork/master-next > > [RE: [oe] Still many meta-networking changes waiting in > patchwork/master-next] On 16.03.03 (Thu > 02:51) Huang, Jie (Jackie) wrote: > > > > > > > > -----Original Message----- > > > From: [email protected] > > > [mailto:openembedded-devel- > > > [email protected]] On Behalf Of Joe MacDonald > > > Sent: Wednesday, March 02, 2016 9:27 PM > > > To: Martin Jansa > > > Cc: [email protected] > > > Subject: Re: [oe] Still many meta-networking changes waiting in > > > patchwork/master-next > > > > > > [Re: [oe] Still many meta-networking changes waiting in > > > patchwork/master-next] On 16.03.02 > (Wed > > > 11:33) Martin Jansa wrote: > > > > > > > On Fri, Feb 26, 2016 at 08:39:45PM -0500, Joe MacDonald wrote: > > > > > Hi Martin, > > > > > > > > > > [Re: [oe] Still many meta-networking changes waiting in > > > > > patchwork/master-next] On 16.02.26 > (Fri > > > 20:56) Martin Jansa wrote: > > > > > > > > > > > On Fri, Feb 26, 2016 at 01:13:17PM -0500, Joe MacDonald wrote: > > > > > > > Hey Martin, > > > > > > > > > > > > > > [[oe] Still many meta-networking changes waiting in > > > > > > > patchwork/master-next] On 16.02.25 > (Thu > > > 18:19) Martin Jansa wrote: > > > > > > > > > > > > > > > Hi Joe. > > > > > > > > > > > > > > > > there are still 18 meta-networking commits in master-next: > > > > > > > > > > > > > > I thought I'd follow up to this and let you know I'll do > > > > > > > something with > > > > > > > these before the end of the month. Almost all of them (waf-samba > > > > > > > aside) > > > > > > > obviously got missed because I'm watching patchwork based on > > > > > > > 'meta-networking' and none of these had it in the subject line. > > > > > > > > > > > > > > I think I've asked before, but are you curating all of those > > > > > > > bundles by > > > > > > > hand or have you got some machinery that filters patches into > > > > > > > bundles > > > > > > > based on path names in the patches? Because that would be kind > > > > > > > of neat > > > > > > > to have. > > > > > > > > > > > > I think I've answered before, but I'm filtering them manually based > > > > > > on > > > > > > subject and also actual paths inside the patch. I also need to mark > > > > > > them > > > > > > "Accepted", "Superseded", .. manually, there is git hooks which is > > > > > > supposed > > > > > > to mark at least accepted one, but it finds 1 from 1000 if any. > > > > > > > > > > Yeah, I've seen the hooks trying to find something when I push > > > > > commits and > > > > > just spewing a slew of errors. I generally do my best to stay on top > > > > > of > > > > > the status in patchwork, doing it all at one time, though. > > > > > > > > > > > This is of course a bit error prone, especially when there are > > > > > > multiple > > > > > > versions of the same patch already in master-next - I usually end up > > > > > > marking all versions merged patch as Accepted (unless I've marked > > > > > > older > > > > > > versions already as Superseded when filtering incoming queue). > > > > > > > > > > I took a bit of time this afternoon to try to come up with a way to > > > > > automate at least part of the process for me and I'm sure there's a > > > > > better > > > > > way to do it (hence why I asked again) but since it sounds like you're > > > > > doing it by hand for a much larger space than I am, maybe there's not. > > > > > > > > > > Anyway, for what it's worth, here's what I came up with: > > > > > > > > > > git log --cherry-pick --format="'%s'" \ > > > > > oe/master-next...oe/master meta-networking | \ > > > > > xargs -r -n1 pwclient search -f "%{id} %{name}" -s New > > > > > > > > > > Which does pretty well, though it obviously goes a little insane if > > > > > someone puts a ' in the short log, but it didn't seem worth trying to > > > > > work > > > > > around that pretty rare (I hope) corner case. As an aside, the first > > > > > time > > > > > I did this I was using --format="\"%s\"" and the *very* top commit > > > > > ('recipes: Replace "cp ...) showed me what kind of pain I'm in for > > > > > when > > > > > there are colliding characters in the short log. It's ugly but > > > > > nothing > > > > > catastrophic. > > > > > > > > > > So that gave me 14 of the patches you asked about. The others were > > > > > easy > > > > > to find: > > > > > > > > > > git log --cherry-pick --format="'%s'" \ > > > > > oe/master-next...oe/master meta-networking | \ > > > > > xargs -r -n1 pwclient search -f "%{id} %{name}" -s Accepted > > > > > > > > > > But obviously they haven't been accepted into 'master' next, obviously > > > > > just a typo or a mis-click at some point. So that's not bad. > > > > > > > > > > Once I had that sanity check done, it's easy to harvest them all: > > > > > > > > > > > > > > > git log --cherry-pick --format="'%s'" \ > > > > > oe/master-next...oe/master meta-networking | \ > > > > > xargs -r -n1 pwclient search -f "%{name}" -s new | \ > > > > > sed 's=\[.*\] *==;s="=.=g;s=\(.*\)="\1"=' | \ > > > > > xargs -r -n1 git log --format="%h" --grep | \ > > > > > xargs -r -n1 git cherry-pick -s > > > > > > > > > > The hideous sed in the middle is just to throw out stuff from the > > > > > pwclient > > > > > output that doesn't appear in the git logs (eg. "[v2]") and to skip > > > > > over > > > > > the craziness that happens on the 'git log grep' if you have a " in > > > > > the > > > > > subject. > > > > > > > > > > Run it a second time to grab the three 'accepted' patches and we're > > > > > nearly > > > > > done. > > > > > > > > > > Setting aside all of the inspection steps that follow that nobody > > > > > would > > > > > want to automate, the same machinery applies equally well to keeping > > > > > patchwork up to date: > > > > > > > > > > git log --cherry-pick --format="'%s'" \ > > > > > master...oe/master meta-networking | \ > > > > > xargs -r -n1 pwclient search -f "%{id}" -s new | \ > > > > > xargs -r -n1 pwclient update -s "accepted" > > > > > > > > > > There's not really any point in running this one a second time for the > > > > > patches already marked 'accepted'. > > > > > > > > > > I've been using a version of this last one for a while now because > > > > > the git > > > > > hooks are non-functional. > > > > > > > > > > The end result is that my semi-automated process above gets 17 of the > > > > > 18 > > > > > patches you cited and the 18th (waf-samba.bbclass) is a special case > > > > > that > > > > > I don't think could ever be caught except by manual intervention. > > > > > > > > > > Mostly just throwing this out there so that maybe it'll help you or > > > > > someone else with similar tasks and maybe someone can look at what I'm > > > > > doing and point out obvious flaws / shortcomings / bear-traps / > > > > > improvements. And also since I haven't bothered to put this into a > > > > > shell > > > > > function or git alias yet, at least my process is archived in the > > > > > mailing > > > > > list and I can find it again if I need it. > > > > > > > > Thanks for trying to improve patchwork experience with bunch of scripts. > > > > Personally I would prefer to just use gerrit (that's why I gave up > > > > trying to work around patchwork issues with scripts and rather sort & > > > > apply the patches manually with just small help from pwclient). > > > > > > I've never been a fan of gerrit, but I've only used it on a couple of > > > projects, so I don't really have a lot of experience with it. Probably > > > obviously, so long as the CLI experience isn't terrible and I can easily > > > script around things that don't work well for me, I can work with almost > > > anything. > > > > > > > After bigger merge yesterday I have only the waf-samba change in > > > > master-next (and few new changes), > > > > > > Yeah, the waf-samba change has been deliberately left to the end since > > > Jackie's waf-samba commits are now considerably out of date and touch > > > > When I made those patches, samba and related recipes were in meta-oe, > > then they were moved to meta-networking and I rebased them twice after > > that, but the patch for waf-samba.bbclass is still applied for meta-oe. Do > > you think we need to move it to meta-networking as well? > > I wouldn't object to such a move. I don't think it'll impact anyone > outside of meta-networking.
Ok, so I will move it to meta-networking, rebase my patch and re-send as follow-up. Thanks, Jackie > > -J. > > > > > Thanks, > > Jackie > > > > > more than just meta-networking, so I'm trying to be extra careful with > > > them. > > > > > > > can you please update status of few pending changes in meta-networking > > > > bundle? > > > > http://patchwork.openembedded.org/bundle/jama/meta-networking/?archive=both > > > > > > Sure thing. > > > > > > > There is 22 changes and most of them were probably already merged or > > > > rejected. > > > > > > > > > > > > > > -J. > > > > > > > > > > > > > > > > > > > > > > > > > -J. > > > > > > > > > > > > > > > pick 959b908 postfix: premission of /var/spool/mail seems > > > > > > > > incorrect > > > > > > > > pick 21ccb84 wireshark: update SRC_URI link to sources > > > > > > > > pick 204683a nbd: use BPN in Files > > > > > > > > pick ed0b197 cim-schema-exper: fix host-user-contaminated > > > > > > > > pick 1dd195e ctdb: add PACKAGECONFIG for libtdb > > > > > > > > pick 3c95127 netkit-ftp: fixed invalid symlink > > > > > > > > pick 56c4f31 iscsitarget: split the kernel module into separate > > > > > > > > package > > > > > > > > pick 38fd81c iscsitarget: skip the arch test for kernel modules > > > > > > > > pick 84bfeae ncftp: fix build failures with ccdv > > > > > > > > pick 46b1e93 postfix: fix clean broken issue > > > > > > > > pick ba57020 lowpan-tools: add missing flex/bison deps > > > > > > > > pick dd64a6b samba: Fix typo in PACKAGECONFIG for "acl" and > > > > > > > > "aio" > > > > > > > > pick c3c6106 waf-samba.bbclass: add cross-answers option and > > > > > > > > files > > > > > > > > pick ef42784 ebtables: enable KERNEL_64_USERSPACE_32 for powerpc > > > > > > > > pick 87edda7 samba: update systemd service files > > > > > > > > pick 8b320f4 lldpd: use bash-completion.bbclass > > > > > > > > pick 32b5c6f ntp: remove empty libexecdir to prevent potential > > > > > > > > QA issues > > > > > > > > pick 93c8a3c inetutils: Fix build when static libs disabled > > > > > > > > > > > > > > > > Not all of them are still "open" on patchwork, maybe they are > > > > > > > > no longer valid. > > > > > > > > > > > > > > > > + there are few meta-networking patches on patchwork which > > > > > > > > didn't make it to master- > next > > > > > > > > here is complete list: > > > > > > > > > > > > > > > > http://patchwork.openembedded.org/bundle/jama/master-next/?archive=both > > > > > > > > postfix: premission of /var/spool/mail seems incorrect > > > > > > > > 2015-10-27 Zhenbo Gao > > > New > > > > > > > > [meta-oe] lldpd: configure the systemd unit file dir > > > > > > > > 2015-10-30 > > > [email protected] New > > > > > > > > [meta-oe] samba: systemv-init script must be executable > > > > > > > > 2015-11-04 Jens > > > Rehsack New > > > > > > > > [meta-oe,v2,1/3] samba: fix dependencies and QA issues > > > > > > > > 2015-11-12 Jens > > > Rehsack New > > > > > > > > [2/7] nbd: use BPN in Files 2015-11-20 Robert > > > > > > > > Yang New > > > > > > > > [4/7] cim-schema-exper: fix host-user-contaminated > > > > > > > > 2015-11-20 Robert Yang > > > New > > > > > > > > [6/7] ctdb: add PACKAGECONFIG for libtdb > > > > > > > > 2015-11-20 Robert Yang > > > New > > > > > > > > [7/7] netkit-ftp: fixed invalid symlink 2015-11-20 > > > > > > > > Robert Yang New > > > > > > > > [1/2] iscsitarget: split the kernel module into > > > > > > > > separate package 2015-11-25 jackie > > > huang New > > > > > > > > [2/2] iscsitarget: skip the arch test for kernel > > > > > > > > modules 2015-11-25 jackie huang > > > New > > > > > > > > ncftp: fix build failures with ccdv 2015-11-30 > > > > > > > > jackie huang New > > > > > > > > samba: Fix typo in PACKAGECONFIG for "acl" and "aio" > > > > > > > > 2015-12-22 > > > [email protected] New > > > > > > > > [meta-networking,0/7,v3] waf-samba: fix build failure > > > > > > > > on targets unsupported by > > > qemu 2016-01-06 jackie huang New > > > > > > > > [meta-oe,7/7,v3] waf-samba.bbclass: add cross-answers > > > > > > > > option and files 2016- > > > 01-06 jackie huang New > > > > > > > > ebtables: enable KERNEL_64_USERSPACE_32 for powerpc > > > > > > > > 2016-01-20 > > > [email protected] New > > > > > > > > [RFC,3/4] lldpd: use bash-completion.bbclass > > > > > > > > 2016-01-14 George McCollister > > > New > > > > > > > > [07/12] inetutils: Fix build when static libs disabled > > > > > > > > 2016-02-22 Richard Purdie > > > New > > > > > > > > > > > > > > > > If they are still there next month, I'll drop them from > > > > > > > > master-next branch > > > > > > > > and master-next bundle on patchwork. > > > > > > > > > > > > > > > > Thanks > > > > > > > > > > > > > > > > -- > > > > > > > > Martin 'JaMa' Jansa jabber: [email protected] > > > > > > > > > > > > > > > > > > > > > > > > > > > > -- > > > > > > > -Joe MacDonald. > > > > > > > :wq > > > > > > > > > > > > > > > > > > > > > > > -- > > > > > -Joe MacDonald. > > > > > :wq > > > > > > > > > > > > > > > -- > > > -Joe MacDonald. > > > :wq > > -- > -Joe MacDonald. > :wq -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
