[PATCH 0/2] Allow rpkg to use custom source metadata file and format