solenv/bin/modules/installer/simplepackage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 53bfb08c0a8457bd010439f3575eccd5bb92da88 Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Fri Oct 22 21:47:31 2021 +0200 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Sat Oct 23 08:13:56 2021 +0200 hdiutil flatten/unflatten was removed in macOS 11 Change-Id: If5a1a70f8a7428d81668704f93fa7a1f45058b68 diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index e3682bafe736..15cd195d8622 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -461,7 +461,7 @@ sub create_package 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 "" )) { + if (( $ref ne "" ) && ( $$ref ne "" ) && system("hdiutil 2>&1 | grep unflatten") == 0) { $systemcall .= " && hdiutil unflatten $archive && Rez -a $$ref -o $archive && hdiutil flatten $archive"; } }