Preparations to enable building of a Sledgehammer (discovery) RPM

This is work in progress.