cleanup mkdisk code
fix font library build