hrev51650 adds 2 changesets to branch 'master'
old head: 764c402a696d2bb8d72e1c716b7aab062b142a64
new head: 8dcb910a2019518f8c3ec0e31e42d8647514de86
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=8dcb910a2019+%5E764c402a696d
----------------------------------------------------------------------------
a992fe6af821: RepositoryRules: RepositoryConfig does not need/use URL now.
8dcb910a2019: RepositoryRules: Do not use the downloaded repo.info.
Instead build the one in-tree from src/data/package_infos/. Fixes the
"HaikuPorts repos have wrong URL" problem that has occured since the
switch to buildmaster repos.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
1 file changed, 11 insertions(+), 18 deletions(-)
build/jam/RepositoryRules | 29 +++++++++++------------------
############################################################################
Commit: a992fe6af821d990f96717cca96482c9f66e2781
URL: http://cgit.haiku-os.org/haiku/commit/?id=a992fe6af821
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sat Dec 2 23:29:13 2017 UTC
RepositoryRules: RepositoryConfig does not need/use URL now.
----------------------------------------------------------------------------
diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index 867dda1..ac3ad99 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -209,7 +209,7 @@ rule RemotePackageRepository repository : architecture :
repositoryUrl
# build repository config file
RepositoryConfig $(repositoryConfig) : $(repositoryInfo)
- : $(repositoryUrl)/$version : $(packagesChecksumFile) ;
+ : $(packagesChecksumFile) ;
HAIKU_REPOSITORY_CACHE_FILE on $(repository) = $(repositoryFile) ;
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)
- : <build>create_repository_config $(repoInfo) $(versionFile) ;
+ : <build>create_repository_config $(repoInfo) $(checksumFile) ;
RepositoryConfig1 $(repoConfig)
- : <build>create_repository_config $(repoInfo) $(versionFile) ;
+ : <build>create_repository_config $(repoInfo) $(checksumFile) ;
}
############################################################################
Revision: hrev51650
Commit: 8dcb910a2019518f8c3ec0e31e42d8647514de86
URL: http://cgit.haiku-os.org/haiku/commit/?id=8dcb910a2019
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sat Dec 2 23:36:26 2017 UTC
RepositoryRules: Do not use the downloaded repo.info.
Instead build the one in-tree from src/data/package_infos/. Fixes the
"HaikuPorts repos have wrong URL" problem that has occured since the
switch to buildmaster repos.
----------------------------------------------------------------------------
diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index ac3ad99..571d6a4 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -175,13 +175,6 @@ rule RemotePackageRepository repository : architecture :
repositoryUrl
# Use a locally created dummy repository if downloads have been
disabled.
# This is useful when trying to build everything locally from source.
if $(HAIKU_NO_DOWNLOADS) = 1 {
- # build the dummy repository info file
- local repositoryInfoTemplate =
<repository-info-template>haikuports ;
- SEARCH on $(repositoryInfoTemplate)
- = $(HAIKU_TOP)/src/data/repository_infos ;
- PreprocessPackageOrRepositoryInfo $(repositoryInfo)
- : $(repositoryInfoTemplate) : $(architecture) ;
-
# build repository file
local packageFileNames = [
on $(packageListFile) return
$(HAIKU_REPOSITORY_PACKAGE_FILE_NAMES)
@@ -195,18 +188,19 @@ rule RemotePackageRepository repository : architecture :
repositoryUrl
RepositoryCache $(repositoryFile) : $(repositoryInfo)
: $(packageFiles) ;
} else {
- # download repository info file
- local repoUrl = [ on $(repository) return
$(HAIKU_REPOSITORY_URL) ] ;
- DownloadLocatedFile $(repositoryInfo)
- : "$(repoUrl)/`cat $source`/repo.info"
- : $(packagesChecksumFile) ;
-
# download repository file
DownloadLocatedFile $(repositoryFile)
: "$(repoUrl)/`cat $source`/repo"
: $(packagesChecksumFile) ;
}
+ # build the repository info file
+ local repositoryInfoTemplate = <repository-info-template>haikuports ;
+ SEARCH on $(repositoryInfoTemplate)
+ = $(HAIKU_TOP)/src/data/repository_infos ;
+ PreprocessPackageOrRepositoryInfo $(repositoryInfo)
+ : $(repositoryInfoTemplate) : $(architecture) ;
+
# build repository config file
RepositoryConfig $(repositoryConfig) : $(repositoryInfo)
: $(packagesChecksumFile) ;
