Revert "repo rework: Re-add compatibility url field"
Revert "repo rework: Remove stubs; Breaks repo compat." Revert "repo rework: Remove need for repos to be self-aware" This reverts commita2b2f4d642. This reverts commit602076ef82. This reverts commit5ffaf72c8a. These changes break the build on Haiku and the ability to create repo mirrors, for the lack of a replacement for the URL (an UUID was evoked on the mailing lists, but not implemented). We are due for a release soon, please don't break the build.
This commit is contained in:
@@ -761,10 +761,10 @@ actions BuildRemoteHaikuPortsRepository1
|
||||
}
|
||||
|
||||
|
||||
rule HaikuRepository repository : repoInfoTemplate : packages : url
|
||||
rule HaikuRepository repository : repoInfoTemplate : packages
|
||||
{
|
||||
# HaikuRepository <repository> : <repoInfoTemplate> : <packages> : <url>
|
||||
# [ : <versionFile> ] ;
|
||||
# HaikuRepository <repository> : <repoInfoTemplate> : <packages>
|
||||
# [ : <url> [ : <versionFile> ] ] ;
|
||||
# Builds the Haiku repository from the given packages and repository info
|
||||
# template. <repository> must already be located.
|
||||
#
|
||||
@@ -773,7 +773,6 @@ rule HaikuRepository repository : repoInfoTemplate : packages : url
|
||||
# meta data files.
|
||||
# <repoInfoTemplate> - The repository info template file to be used.
|
||||
# <packages> - The packages to be added to the repository.
|
||||
# <url> - The remote location of the initial update repository
|
||||
|
||||
local architecture = $(HAIKU_PACKAGING_ARCH) ;
|
||||
local secondaryArchitecture ;
|
||||
@@ -792,7 +791,7 @@ rule HaikuRepository repository : repoInfoTemplate : packages : url
|
||||
# build the respository config
|
||||
local repositoryConfig = $(repository:G=repository-config)-config ;
|
||||
MakeLocate $(repositoryConfig) : $(repositoriesDir) ;
|
||||
RepositoryConfig $(repositoryConfig) : $(repositoryInfo) : $(url) ;
|
||||
RepositoryConfig $(repositoryConfig) : $(repositoryInfo) ;
|
||||
HAIKU_REPOSITORY_CONFIG_FILE on $(repository) = $(repositoryConfig) ;
|
||||
|
||||
# setup the repository cache file
|
||||
|
||||
Reference in New Issue
Block a user