[haiku-commits] haiku: hrev46523 - build/jam/images
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 10 Dec 2013 23:18:30 +0100 (CET)
hrev46523 adds 2 changesets to branch 'master'
old head: 96c5f7eda4aac78b5787a89666d4d4fa5190dd66
new head: 781671ad5ba04baf1c1a9a6365ae3f6ea7a9ab95
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=781671a+%5E96c5f7e
----------------------------------------------------------------------------
523b866: HaikuImage*: Create missing writable dirs in ~/config
Also reduce code duplication by moving the respective code to
HaikuImageCommon.
781671a: dump_mapping_info(): Remove problematic initializer
Fixes gcc 2 build.
[ Ingo Weinhold <ingo_weinhold@xxxxxx> ]
----------------------------------------------------------------------------
4 files changed, 27 insertions(+), 44 deletions(-)
build/jam/images/HaikuImage | 22 ----------------------
build/jam/images/HaikuImageBootstrap | 21 ---------------------
build/jam/images/HaikuImageCommon | 26 ++++++++++++++++++++++++++
src/system/kernel/vm/vm.cpp | 2 +-
############################################################################
Commit: 523b866f8967fe32571fd0e94783646a2ed6fc54
URL: http://cgit.haiku-os.org/haiku/commit/?id=523b866
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Tue Dec 10 18:38:55 2013 UTC
HaikuImage*: Create missing writable dirs in ~/config
Also reduce code duplication by moving the respective code to
HaikuImageCommon.
----------------------------------------------------------------------------
diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage
index c1ff565..a41f939 100644
--- a/build/jam/images/HaikuImage
+++ b/build/jam/images/HaikuImage
@@ -301,28 +301,6 @@ AddFilesToHaikuImage system settings :
<post-install>fresh_install ;
AddDirectoryToHaikuImage home config non-packaged 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
AddDirectoryToHaikuImage home config settings printers Preview
: home-config-settings-printers-preview.rdef ;
diff --git a/build/jam/images/HaikuImageBootstrap
b/build/jam/images/HaikuImageBootstrap
index 8bb57e9..2cde493 100644
--- a/build/jam/images/HaikuImageBootstrap
+++ b/build/jam/images/HaikuImageBootstrap
@@ -240,26 +240,5 @@ SEARCH on <post-install>fresh_install
= [ FDirName $(HAIKU_TOP) data system settings ] ;
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 ] ;
diff --git a/build/jam/images/HaikuImageCommon
b/build/jam/images/HaikuImageCommon
index 27e14a7..3c62d35 100644
--- a/build/jam/images/HaikuImageCommon
+++ b/build/jam/images/HaikuImageCommon
@@ -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
############################################################################
Revision: hrev46523
Commit: 781671ad5ba04baf1c1a9a6365ae3f6ea7a9ab95
URL: http://cgit.haiku-os.org/haiku/commit/?id=781671a
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Tue Dec 10 22:17:10 2013 UTC
dump_mapping_info(): Remove problematic initializer
Fixes gcc 2 build.
----------------------------------------------------------------------------
diff --git a/src/system/kernel/vm/vm.cpp b/src/system/kernel/vm/vm.cpp
index d4a01cc..1d6de03 100644
--- a/src/system/kernel/vm/vm.cpp
+++ b/src/system/kernel/vm/vm.cpp
@@ -3443,7 +3443,7 @@ dump_mapping_info(int argc, char** argv)
Team* team = NULL;
if (argi < argc) {
- uint64 threadID = -1;
+ uint64 threadID;
if (!evaluate_debug_expression(argv[argi++], &threadID, false))
return 0;
Other related posts:
- » [haiku-commits] haiku: hrev46523 - build/jam/images - ingo_weinhold
