From cb434e1a2b1c963d5fdcc4d7e65a034313a05f6d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 5 Oct 2013 22:49:25 +0200 Subject: [PATCH] Also add repository cache files to image This makes package management operations that require a repository cache immediately usable (even offline). Also makes sense for the update-{all,packages} build profile actions, since those update the repository config which would otherwise no longer match a potentially existing cache. --- build/jam/images/HaikuImage | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage index 1f1ed3aa68..930247e6c5 100644 --- a/build/jam/images/HaikuImage +++ b/build/jam/images/HaikuImage @@ -329,15 +329,18 @@ CopyDirectoryToHaikuImage home config settings Media : [ FDirName $(HAIKU_TOP) data settings media dvb ] : dvb : -x Jamfile ; -# repository config files +# repository config and cache files local repository ; for repository in $(HAIKU_REPOSITORIES) { - local target = [ on $(repository) return $(HAIKU_REPOSITORY_CONFIG_FILE) ] ; + 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 $(target) = 1 ; + HAIKU_INCLUDE_IN_IMAGE on $(config) $(cache) = 1 ; } AddFilesToHaikuImage system settings package-repositories - : $(target) : $(repository:G=) ; + : $(config) : $(repository:G=) ; + AddFilesToHaikuImage system cache package-repositories + : $(cache) : $(repository:G=) ; }