From 08104497098050f8262c246edbc7bb0d246c7f5c Mon Sep 17 00:00:00 2001 From: John Scipione Date: Sun, 23 Feb 2014 12:10:13 -0500 Subject: [PATCH] HaikuImage: Add empty system non-packaged directories ... mirroring home/config/non-packaged/ Also, sort the list lexographically and move the creation of the non-packaged decorators directory from HaikuImage to HaikuImageCommon along with the rest. --- build/jam/images/HaikuImage | 3 +-- build/jam/images/HaikuImageCommon | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage index 45c0a4d220..03744f9f27 100644 --- a/build/jam/images/HaikuImage +++ b/build/jam/images/HaikuImage @@ -170,6 +170,7 @@ SYSTEM_ADD_ONS_SCREENSAVERS = [ FFilterByBuildFeatures GLife@mesa $(HAIKU_INCLUDE_TRADEMARKS)Haiku Icons IFS Leaves Message Spider Gravity@mesa ] ; + SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ice1712 sis7018 ; SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia usb_audio ; SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = [ FFilterByBuildFeatures @@ -299,8 +300,6 @@ SEARCH on fresh_install AddFilesToHaikuImage system settings : fresh_install ; # decorators -AddDirectoryToHaikuImage system non-packaged add-ons decorators ; -AddDirectoryToHaikuImage home config non-packaged add-ons decorators ; #AddFilesToHaikuImage system non-packaged add-ons decorators # : BeDecorator MacDecorator WinDecorator ; diff --git a/build/jam/images/HaikuImageCommon b/build/jam/images/HaikuImageCommon index 3c62d35073..a3c2ce34e1 100644 --- a/build/jam/images/HaikuImageCommon +++ b/build/jam/images/HaikuImageCommon @@ -1,8 +1,4 @@ # 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 ; @@ -12,6 +8,7 @@ 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 decorators ; 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 ; @@ -22,6 +19,23 @@ 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 ; +AddDirectoryToHaikuImage system cache tmp ; +AddDirectoryToHaikuImage system non-packaged bin ; +AddDirectoryToHaikuImage system non-packaged data fonts ; +AddDirectoryToHaikuImage system non-packaged lib ; +AddDirectoryToHaikuImage system non-packaged add-ons decorators ; +AddDirectoryToHaikuImage system non-packaged add-ons kernel drivers bin ; +AddDirectoryToHaikuImage system non-packaged add-ons kernel drivers dev ; +AddDirectoryToHaikuImage system non-packaged add-ons input_server devices ; +AddDirectoryToHaikuImage system non-packaged add-ons input_server filters ; +AddDirectoryToHaikuImage system non-packaged add-ons input_server methods ; +AddDirectoryToHaikuImage system non-packaged add-ons media plugins ; +AddDirectoryToHaikuImage system non-packaged add-ons Tracker ; +AddDirectoryToHaikuImage system non-packaged add-ons Print ; +AddDirectoryToHaikuImage system non-packaged add-ons Screen\ Savers ; +AddDirectoryToHaikuImage system non-packaged add-ons Translators ; +AddDirectoryToHaikuImage system var empty ; +AddDirectoryToHaikuImage system var log ; #pragma mark - Optional Packages