summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2021-10-22 21:47:31 +0200
committerAndras Timar <andras.timar@collabora.com>2021-10-23 08:15:37 +0200
commit05564e909413bfc384e95a1d62aba7823b8b2777 (patch)
tree8544ac5750d9b774a5614fe9871b4207fd09eb50
parentBuild with newer macOS SDK (diff)
downloadcore-05564e909413bfc384e95a1d62aba7823b8b2777.tar.gz
core-05564e909413bfc384e95a1d62aba7823b8b2777.zip
hdiutil flatten/unflatten was removed in macOS 11
Change-Id: If5a1a70f8a7428d81668704f93fa7a1f45058b68
-rw-r--r--solenv/bin/modules/installer/simplepackage.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index b407a4ff668f..9a2d28a764d3 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -436,7 +436,7 @@ sub create_package
}
$systemcall = "cd $localtempdir && hdiutil create -megabytes 1500 -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";
}
}