Prepare for P4 secondary build system