RepositoryRules: RepositoryConfig does not need/use URL now.

This commit is contained in:
Augustin Cavalier
2017-12-02 18:29:13 -05:00
parent 764c402a69
commit a992fe6af8
+4 -5
View File
@@ -209,7 +209,7 @@ rule RemotePackageRepository repository : architecture : repositoryUrl
# build repository config file # build repository config file
RepositoryConfig $(repositoryConfig) : $(repositoryInfo) RepositoryConfig $(repositoryConfig) : $(repositoryInfo)
: $(repositoryUrl)/$version : $(packagesChecksumFile) ; : $(packagesChecksumFile) ;
HAIKU_REPOSITORY_CACHE_FILE on $(repository) = $(repositoryFile) ; HAIKU_REPOSITORY_CACHE_FILE on $(repository) = $(repositoryFile) ;
HAIKU_REPOSITORY_CONFIG_FILE on $(repository) = $(repositoryConfig) ; HAIKU_REPOSITORY_CONFIG_FILE on $(repository) = $(repositoryConfig) ;
@@ -246,13 +246,12 @@ actions GeneratedRepositoryPackageList1
} }
rule RepositoryConfig repoConfig : repoInfo : url : versionFile rule RepositoryConfig repoConfig : repoInfo : checksumFile
{ {
HAIKU_REPOSITORY_URL on $(repoConfig) = $(url) ;
Depends $(repoConfig) Depends $(repoConfig)
: <build>create_repository_config $(repoInfo) $(versionFile) ; : <build>create_repository_config $(repoInfo) $(checksumFile) ;
RepositoryConfig1 $(repoConfig) RepositoryConfig1 $(repoConfig)
: <build>create_repository_config $(repoInfo) $(versionFile) ; : <build>create_repository_config $(repoInfo) $(checksumFile) ;
} }