i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Move repository config and cache files to the minimum image.

Browse Source 
Most of the time, one just winds up adding them manually anyway.
This commit is contained in:
Augustin Cavalier
2019-01-08 19:45:36 -05:00
parent 5d200bd39c
commit 9a0d08a701
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/images/definitions/minimum
+14
View File
@@ -284,3 +284,17 @@ AddFilesToHaikuImage system settings network : $(networkSettingsFiles) ;
SEARCH on <post-install>fresh_install SEARCH on <post-install>fresh_install
= [ FDirName $(HAIKU_TOP) data system settings ] ; = [ FDirName $(HAIKU_TOP) data system settings ] ;
AddFilesToHaikuImage system settings : <post-install>fresh_install ; AddFilesToHaikuImage system settings : <post-install>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=) ;
}
build/jam/images/definitions/regular
-14
View File
@@ -262,17 +262,3 @@ AddDirectoryToHaikuImage home config settings printers Preview
: home-config-settings-printers-preview.rdef ; : home-config-settings-printers-preview.rdef ;
AddDirectoryToHaikuImage home config settings printers "Save as PDF" AddDirectoryToHaikuImage home config settings printers "Save as PDF"
: home-config-settings-printers-save-as-pdf.rdef ; : 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=) ;
}