Dan's cmake completely overwrites src/libntirpc *IN PLACE* the next time you make ganesha.
If you have any changes pending, save/push your commits somewhere before your next compile after updating. On 10/3/15 8:32 AM, Matt W. Benjamin wrote: > ----- "William Allen Simpson" <[email protected]> wrote: >> Frank, could you please change nfs-ganesha/ntirpc to default >> branch duplex-12? Matt forgot, and I've reminded him twice. > > Ok, fine, I've done this. I don't think this was a blocker. > No submodule to checkout a specific commit, so defaulted to duplex-11. duplex-11 has missing/moved SVCXPRT symbols, etc. Complete showstopper. Glad it's fixed now. >> Dan, you forgot to push your dang/ntirpc external to both >> linuxbox2/ntirpc > > Not assured by us to be kept at parity with the upstream repo, it's a > 3rd-party repo, wrt nfs-ganesha. > > and nfs-ganesha/ntirpc duplex-12 > I've been treating it as the official ntirpc development site. Should it be abandoned, then? > I merged Dan's PR Thursday AM eastern. What exactly is not merged? > commit f9ec4b8e37ac59f81b5feaac9f4151686acd61ac Author: Daniel Gryniewicz <[email protected]> Date: Thu Oct 1 11:32:51 2015 -0400 Fix RDMA build Signed-off-by: Daniel Gryniewicz <[email protected]> commit 93fc447716624bd6c92b3b11b4c6b574d9b2aaa7 Merge: c4e264a 669383d Author: Matt Benjamin <[email protected]> Date: Thu Oct 1 08:35:45 2015 -0400 Merge pull request #4 from dang/external Allow ntirpc to be used as a CMake external > -- RDMA >> cmake and compile fail. > > Um... Will revisit next week, I guess. > Goody. ------------------------------------------------------------------------------ _______________________________________________ Nfs-ganesha-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nfs-ganesha-devel
