summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-07-17 12:55:51 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-07-17 16:28:00 +0200
commite13029a1ea9e3b5bd67e7f0e670e8813ee6bbcbc (patch)
tree20fc1e21781cc78689fc9cc319d99349b6b39daa /solenv
parent1c2ea35b983c1159fe4633e449f8302ac9a7a024 (diff)
Increase hidutil -megabytes at least for --enable-dbgutil
...where my --with-package-format=dmg build routinely fails with > : ********************************************************************* > : ERROR: The following errors occurred in packaging process: > : > : ERROR: Could not execute "cd /Users/stephan/Software/lo/core/workdir/installation/LibreOffice/dmg/install/en-US_inprogress_temp.19857 && hdiutil create -megabytes 1500 -srcfolder LibreOffice_6.4.0.0.alpha0_MacOS_x86-64 /Users/stephan/Software/lo/core/workdir/installation/LibreOffice/dmg/install/en-US_inprogress/LibreOffice_6.4.0.0.alpha0_MacOS_x86-64.dmg -ov -fs HFS+ -volname "LibreOffice" -format UDBZ": 256 > : ********************************************************************* No idea whether -megabytes 1500 was chosen for a specific reason, so leave it alone for --disable-dbgutil builds for now. Change-Id: Ie89d1043e47ed3c84167cbb22325513305013f86 Reviewed-on: https://gerrit.libreoffice.org/75775 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/modules/installer/simplepackage.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 489f2127688e..78a09e78e5e5 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -426,7 +426,9 @@ sub create_package
}
}
- $systemcall = "cd $localtempdir && hdiutil create -megabytes 1500 -srcfolder $folder $archive -ov -fs HFS+ -volname \"$volume_name\" -format UDBZ";
+ my $megabytes = 1500;
+ $megabytes = 2000 if $ENV{'ENABLE_DBGUTIL'};
+ $systemcall = "cd $localtempdir && hdiutil create -megabytes $megabytes -srcfolder $folder $archive -ov -fs HFS+ -volname \"$volume_name\" -format UDBZ";
if (( $ref ne "" ) && ( $$ref ne "" )) {
$systemcall .= " && hdiutil unflatten $archive && Rez -a $$ref -o $archive && hdiutil flatten $archive &&";
}