Would it be possible to build a swap partition first and have the builder software be able to key off that? I would think that the partitions themselves can be built easily by the builder code, it is just the new filesystem generation that seems to be locking up.

It would probably require a rebuild of the builder software in order to get it to use swap, though...

A thought...