diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum index 386354fdc9..1e4fef17dc 100644 --- a/build/jam/images/definitions/minimum +++ b/build/jam/images/definitions/minimum @@ -284,3 +284,17 @@ AddFilesToHaikuImage system settings network : $(networkSettingsFiles) ; SEARCH on fresh_install = [ FDirName $(HAIKU_TOP) data system settings ] ; AddFilesToHaikuImage system settings : fresh_install ; + +# repository config and cache files +local repository ; +for repository in $(HAIKU_REPOSITORIES) { + local config = [ on $(repository) return $(HAIKU_REPOSITORY_CONFIG_FILE) ] ; + local cache = [ on $(repository) return $(HAIKU_REPOSITORY_CACHE_FILE) ] ; + if $(HAIKU_UPDATE_ALL_PACKAGES) { + HAIKU_INCLUDE_IN_IMAGE on $(config) $(cache) = 1 ; + } + AddFilesToHaikuImage system settings package-repositories + : $(config) : $(repository:G=) ; + AddFilesToHaikuImage system cache package-repositories + : $(cache) : $(repository:G=) ; +} diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular index 64a916fc1a..bf5d1a2d9f 100644 --- a/build/jam/images/definitions/regular +++ b/build/jam/images/definitions/regular @@ -262,17 +262,3 @@ AddDirectoryToHaikuImage home config settings printers Preview : home-config-settings-printers-preview.rdef ; AddDirectoryToHaikuImage home config settings printers "Save as PDF" : home-config-settings-printers-save-as-pdf.rdef ; - -# repository config and cache files -local repository ; -for repository in $(HAIKU_REPOSITORIES) { - local config = [ on $(repository) return $(HAIKU_REPOSITORY_CONFIG_FILE) ] ; - local cache = [ on $(repository) return $(HAIKU_REPOSITORY_CACHE_FILE) ] ; - if $(HAIKU_UPDATE_ALL_PACKAGES) { - HAIKU_INCLUDE_IN_IMAGE on $(config) $(cache) = 1 ; - } - AddFilesToHaikuImage system settings package-repositories - : $(config) : $(repository:G=) ; - AddFilesToHaikuImage system cache package-repositories - : $(cache) : $(repository:G=) ; -}