solenv/bin/modules/installer/simplepackage.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f61ea9d2d8d61fe190aa43a57b2316def6c12b8d
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Aug 17 09:07:40 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Aug 17 10:53:40 2022 +0200
Raise hdiutil -megabytes even further for debug builds
My macOS build had started to fail with
workdir/installation/LibreOffice/dmg/logging/en-US/log_750_en-US.log stating
> Systemcall: cd
/Users/stephan/lo/core/workdir/installation/LibreOffice/dmg/install/en-US_inprogress_temp.14524
&& hdiutil create -megabytes 2000 -srcfolder
LibreOffice_7.5.0.0.alpha0_MacOS_aarch64
/Users/stephan/lo/core/workdir/installation/LibreOffice/dmg/install/en-US_inprogress/LibreOffice_7.5.0.0.alpha0_MacOS_aarch64.dmg
-ov -fs HFS+ -volname "LibreOffice" -format UDBZ
> ERROR: Could not execute "cd
/Users/stephan/lo/core/workdir/installation/LibreOffice/dmg/install/en-US_inprogress_temp.14524
&& hdiutil create -megabytes 2000 -srcfolder
LibreOffice_7.5.0.0.alpha0_MacOS_aarch64
/Users/stephan/lo/core/workdir/installation/LibreOffice/dmg/install/en-US_inprogress/LibreOffice_7.5.0.0.alpha0_MacOS_aarch64.dmg
-ov -fs HFS+ -volname "LibreOffice" -format UDBZ": 256
and which went away again with the increased $megabytes value.
Change-Id: I483a8cb06df0720eeb42e6260276e6b52ea2a423
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138406
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index 5ab12978362d..b1811a804aea 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -455,7 +455,7 @@ sub create_package
}
}
my $megabytes = 1500;
- $megabytes = 2000 if $ENV{'ENABLE_DEBUG'};
+ $megabytes = 3000 if $ENV{'ENABLE_DEBUG'};
$systemcall = "cd $localtempdir && hdiutil create -megabytes
$megabytes -srcfolder $folder $archive -ov -fs HFS+ -volname \"$volume_name\"
-format UDBZ";
if (( $ref ne "" ) && ( $$ref ne "" ) && system("hdiutil 2>&1 | grep
unflatten") == 0) {
$systemcall .= " && hdiutil unflatten $archive && Rez -a $$ref -o
$archive && hdiutil flatten $archive &&";
