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 commit a2b2f4d642.
This reverts commit 602076ef82.
This reverts commit 5ffaf72c8a.

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.

build/jam/ImageRules

@@ -901,7 +901,7 @@ rule AddPackagesAndRepositoryVariablesToContainerScript script : container
 	local repositoryFiles ;
 	for repository in $(HAIKU_REPOSITORIES) {
 		repositoryFiles
-			+= [ on $(repository) return $(HAIKU_REPOSITORY_CONFIG_FILE) ] ;
+			+= [ on $(repository) return $(HAIKU_REPOSITORY_CACHE_FILE) ] ;
 	}
 
 	AddTargetVariableToScript $(script) : $(repositoryFiles) : repositories ;

build/jam/RepositoryRules

@@ -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

build/jam/repositories/Haiku

@@ -52,8 +52,4 @@ if $(webPositiveIsAvailable) {
 	packages += webpositive ;
 }
 
-local version = current ;
-#local version = $(HAIKU_VERSION) ;
-local remoteURL = http://packages.haiku-os.org/haiku/master/$(HAIKU_PACKAGING_ARCH)/$(version) ;
-
-HaikuRepository $(haikuRepository) : $(repoInfo) : $(packages:S=.hpkg) : $(remoteURL) ;
+HaikuRepository $(haikuRepository) : $(repoInfo) : $(packages:S=.hpkg) ;

build/scripts/build_haiku_image

@@ -7,7 +7,7 @@ set -o errexit
 # tmpDir
 # addBuildCompatibilityLibDir
 # systemPackages - lists of the hpkg packages copied/updated
-# repositories - all repository configuration files
+# repositories - all repository files
 # downloadDir
 # The following are only for image types:
 # installDir