On 10-04-17 22:13, Nathan Cutler wrote: >>>> There is not that many updates to RocksDB, And my PR-commit is the >>>> current HEAD: 04abb2b2ddc308ab03f55ea9a1e08b62667d6e39 >>>> >>>> So how do I forward the submodule to this SHA? >>> >>> Yeah, that makes sense! >> >> Right, >> >> But that did hot answer the penultimate question: >> How to do it? > > According to .gitmodules, the src/rocksdb submodule is taken from > https://github.com/ceph/rocksdb so the first thing is to get the commit > into that repo. That is what I done thusfar, but in the wrong repo. Mine is in Facebook/rocksdb ;-) > Once it is there, you set the submodule to that commit and then open a > PR (against ceph/ceph.git) changing the SHA1 that the src/rocksdb points > to. IIRC the trick is that when the submodule is populated you can just > "git add src/rocksdb" and git "does the right thing". Now this starts making sense. > I've done this before, so it can't be too difficult ;-) I think I read > this: https://git-scm.com/book/en/v2/Git-Tools-Submodules Git and 'not difficult' are three words I do not dare to use in the same sentence. . But I'll work it out now that I know that I was barking up the wrong repo. Thanx, --WjW > Here's what a commit changing the src/rocksdb submodule looks like: > > smithfarm@wilbur:~/src/ceph/smithfarm/ceph> git show > f4fb59896ccb0d8ac01434cd4cf6ad67776fb0a0 > commit f4fb59896ccb0d8ac01434cd4cf6ad67776fb0a0 > Author: Nathan Cutler <ncutler@xxxxxxxx> > Date: Mon Aug 22 20:56:38 2016 +0200 > > build/ops: bump rocksdb submodule > > Fixes a FTBFS on ppc64le > > Fixes: http://tracker.ceph.com/issues/17092 > Signed-off-by: Nathan Cutler <ncutler@xxxxxxxx> > > diff --git a/src/rocksdb b/src/rocksdb > index fa98456..92749e8 160000 > --- a/src/rocksdb > +++ b/src/rocksdb > @@ -1 +1 @@ > -Subproject commit fa98456ccbd860120127ac2e91a2088fb222606e > +Subproject commit 92749e88f5d9c8dc6e6aba1ff297f21f1e7ea811 > > HTH, > Nathan -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
