Update repo-make.conf and fix some dependency problems