hrev54449 adds 1 changeset to branch 'master'
old head: a704a197f547ce3149b6ab5414836061e7150ff0
new head: 5b80a2fa0dfb726ec1b9488fb7ef5ac075d0062f
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=5b80a2fa0dfb+%5Ea704a197f547
----------------------------------------------------------------------------
5b80a2fa0dfb: build_haiku_image: don't recreate indices when updating
mkinex fails when the indices already exist.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54449
Commit: 5b80a2fa0dfb726ec1b9488fb7ef5ac075d0062f
URL: https://git.haiku-os.org/haiku/commit/?id=5b80a2fa0dfb
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Tue Jul 21 16:36:18 2020 UTC
----------------------------------------------------------------------------
1 file changed, 40 insertions(+), 38 deletions(-)
build/scripts/build_haiku_image | 78 +++++++++++++++++++------------------
----------------------------------------------------------------------------
diff --git a/build/scripts/build_haiku_image b/build/scripts/build_haiku_image
index 2fbae691e2..cb058a7462 100755
--- a/build/scripts/build_haiku_image
+++ b/build/scripts/build_haiku_image
@@ -292,45 +292,47 @@ if [ -n "$updateAllPackages" ]; then
$mkdir -p "${tPrefix}system/packages"
fi
+if [ ! $updateOnly ]; then
echo "Creating filesystem indices..."
-$mkindex -t string Audio:Album
-$mkindex -t string Audio:Artist
-$mkindex -t string Media:Genre
-$mkindex -t string Media:Title
-$mkindex -t string MAIL:account
-$mkindex -t string MAIL:cc
-$mkindex -t string MAIL:chain
-$mkindex -t string MAIL:draft
-$mkindex -t string MAIL:flags
-$mkindex -t string MAIL:from
-$mkindex -t string MAIL:name
-$mkindex -t string MAIL:pending_chain
-$mkindex -t string MAIL:priority
-$mkindex -t string MAIL:reply
-$mkindex -t string MAIL:status
-$mkindex -t string MAIL:subject
-$mkindex -t string MAIL:thread
-$mkindex -t string MAIL:to
-$mkindex -t string META:address
-$mkindex -t string META:city
-$mkindex -t string META:company
-$mkindex -t string META:county
-$mkindex -t string META:email
-$mkindex -t string META:fax
-$mkindex -t string META:group
-$mkindex -t string META:hphone
-$mkindex -t string META:name
-$mkindex -t string META:nickname
-$mkindex -t string META:state
-$mkindex -t string META:url
-$mkindex -t string META:wphone
-$mkindex -t string META:zip
-
-$mkindex -t int32 Media:Rating
-$mkindex -t int32 Media:Year
-$mkindex -t int32 MAIL:account_id
-$mkindex -t int32 MAIL:read
-$mkindex -t int32 MAIL:when
+ $mkindex -t string Audio:Album
+ $mkindex -t string Audio:Artist
+ $mkindex -t string Media:Genre
+ $mkindex -t string Media:Title
+ $mkindex -t string MAIL:account
+ $mkindex -t string MAIL:cc
+ $mkindex -t string MAIL:chain
+ $mkindex -t string MAIL:draft
+ $mkindex -t string MAIL:flags
+ $mkindex -t string MAIL:from
+ $mkindex -t string MAIL:name
+ $mkindex -t string MAIL:pending_chain
+ $mkindex -t string MAIL:priority
+ $mkindex -t string MAIL:reply
+ $mkindex -t string MAIL:status
+ $mkindex -t string MAIL:subject
+ $mkindex -t string MAIL:thread
+ $mkindex -t string MAIL:to
+ $mkindex -t string META:address
+ $mkindex -t string META:city
+ $mkindex -t string META:company
+ $mkindex -t string META:county
+ $mkindex -t string META:email
+ $mkindex -t string META:fax
+ $mkindex -t string META:group
+ $mkindex -t string META:hphone
+ $mkindex -t string META:name
+ $mkindex -t string META:nickname
+ $mkindex -t string META:state
+ $mkindex -t string META:url
+ $mkindex -t string META:wphone
+ $mkindex -t string META:zip
+
+ $mkindex -t int32 Media:Rating
+ $mkindex -t int32 Media:Year
+ $mkindex -t int32 MAIL:account_id
+ $mkindex -t int32 MAIL:read
+ $mkindex -t int32 MAIL:when
+fi
echo "Populating image ..."
while [ $# -gt 0 ]; do
