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

HaikuImage*: Create missing writable dirs in ~/config

Browse Source 
Also reduce code duplication by moving the respective code to
HaikuImageCommon.
This commit is contained in:
Ingo Weinhold
2013-12-10 23:17:43 +01:00
parent 96c5f7eda4
commit 523b866f89
3 changed files with 26 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/images/HaikuImage
-22
View File
@@ -301,28 +301,6 @@ AddFilesToHaikuImage system settings : <post-install>fresh_install ;
AddDirectoryToHaikuImage home config non-packaged add-ons decorators ; AddDirectoryToHaikuImage home config non-packaged add-ons decorators ;
#AddFilesToHaikuImage home config add-ons decorators : ; #AddFilesToHaikuImage home config add-ons decorators : ;
# create directories that will remain empty
AddDirectoryToHaikuImage system cache tmp ;
AddDirectoryToHaikuImage system non-packaged ;
AddDirectoryToHaikuImage system var empty ;
AddDirectoryToHaikuImage system var log ;
AddDirectoryToHaikuImage home Desktop ;
AddDirectoryToHaikuImage home mail ;
AddDirectoryToHaikuImage home config packages ;
AddDirectoryToHaikuImage home config non-packaged bin ;
AddDirectoryToHaikuImage home config non-packaged data fonts ;
AddDirectoryToHaikuImage home config non-packaged lib ;
AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers bin ;
AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers dev ;
AddDirectoryToHaikuImage home config non-packaged add-ons input_server devices ;
AddDirectoryToHaikuImage home config non-packaged add-ons input_server filters ;
AddDirectoryToHaikuImage home config non-packaged add-ons input_server methods ;
AddDirectoryToHaikuImage home config non-packaged add-ons media plugins ;
AddDirectoryToHaikuImage home config non-packaged add-ons Tracker ;
AddDirectoryToHaikuImage home config non-packaged add-ons Print ;
AddDirectoryToHaikuImage home config non-packaged add-ons Screen\ Savers ;
AddDirectoryToHaikuImage home config non-packaged add-ons Translators ;
# printers # printers
AddDirectoryToHaikuImage home config settings printers Preview AddDirectoryToHaikuImage home config settings printers Preview
: home-config-settings-printers-preview.rdef ; : home-config-settings-printers-preview.rdef ;
build/jam/images/HaikuImageBootstrap
-21
View File
@@ -240,26 +240,5 @@ 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 ;
# create directories that will remain empty
AddDirectoryToHaikuImage system cache tmp ;
AddDirectoryToHaikuImage system non-packaged ;
AddDirectoryToHaikuImage system var empty ;
AddDirectoryToHaikuImage system var log ;
AddDirectoryToHaikuImage home Desktop ;
AddDirectoryToHaikuImage home mail ;
AddDirectoryToHaikuImage home config packages ;
AddDirectoryToHaikuImage home config non-packaged bin ;
AddDirectoryToHaikuImage home config non-packaged lib ;
AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers bin ;
AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers dev ;
AddDirectoryToHaikuImage home config non-packaged add-ons input_server devices ;
AddDirectoryToHaikuImage home config non-packaged add-ons input_server filters ;
AddDirectoryToHaikuImage home config non-packaged add-ons input_server methods ;
AddDirectoryToHaikuImage home config non-packaged add-ons media plugins ;
AddDirectoryToHaikuImage home config non-packaged add-ons Tracker ;
AddDirectoryToHaikuImage home config non-packaged add-ons Print ;
AddDirectoryToHaikuImage home config non-packaged add-ons Screen\ Savers ;
AddDirectoryToHaikuImage home config non-packaged add-ons Translators ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) images HaikuImageCommon ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) images HaikuImageCommon ] ;
build/jam/images/HaikuImageCommon
+26
View File
@@ -1,3 +1,29 @@
# create directories that may remain empty
AddDirectoryToHaikuImage system cache tmp ;
AddDirectoryToHaikuImage system non-packaged ;
AddDirectoryToHaikuImage system var empty ;
AddDirectoryToHaikuImage system var log ;
AddDirectoryToHaikuImage home Desktop ;
AddDirectoryToHaikuImage home mail ;
AddDirectoryToHaikuImage home config cache ;
AddDirectoryToHaikuImage home config packages ;
AddDirectoryToHaikuImage home config settings ;
AddDirectoryToHaikuImage home config var ;
AddDirectoryToHaikuImage home config non-packaged bin ;
AddDirectoryToHaikuImage home config non-packaged data fonts ;
AddDirectoryToHaikuImage home config non-packaged lib ;
AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers bin ;
AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers dev ;
AddDirectoryToHaikuImage home config non-packaged add-ons input_server devices ;
AddDirectoryToHaikuImage home config non-packaged add-ons input_server filters ;
AddDirectoryToHaikuImage home config non-packaged add-ons input_server methods ;
AddDirectoryToHaikuImage home config non-packaged add-ons media plugins ;
AddDirectoryToHaikuImage home config non-packaged add-ons Tracker ;
AddDirectoryToHaikuImage home config non-packaged add-ons Print ;
AddDirectoryToHaikuImage home config non-packaged add-ons Screen\ Savers ;
AddDirectoryToHaikuImage home config non-packaged add-ons Translators ;
#pragma mark - Optional Packages #pragma mark - Optional Packages