cave resume doesn't like PV with dashes
Work around scm-git double-require bugs
Use PN to generate component name
Re-format
Build in ccan and socket_wrapper