diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2021-01-22 13:59:39 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-01-26 12:39:16 +0100 |
| commit | 242ff50f23bf0db6a6e4f9be292dad987115ca19 (patch) | |
| tree | a891586ff5936ef5854c0880d6fa00fc99394669 /solenv | |
| parent | 5ccf4f22c98553fc6530b38f235e31f168fa7fef (diff) | |
fix packaging of mac builds targeting apple silicone
the scpactions are what assemble the dmg (add the license & readme
folders, the background image and the .DS_Store for alignment/the
layout).
Adding the AARCH64 statement is necessary to add the architecture to the
filename.
Change-Id: I0095b8d631cdaa7ce4333fde15dd17d4faf44e8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109818
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit cc46ce1b78fe71eb66fc0a09e44f01428a9e4069)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109877
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/download.pm | 6 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/parameter.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 63103816e89f..466bb4433205 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -390,6 +390,10 @@ sub get_download_architecture { $arch = "x86-64"; } + elsif ( $installer::globals::cpuname eq 'AARCH64' ) + { + $arch = "aarch64"; + } return $arch; } @@ -565,7 +569,7 @@ sub resolve_variables_in_downloadname elsif ( $installer::globals::issolarissparcbuild ) { $os = "solsparc"; } elsif ( $installer::globals::issolarisx86build ) { $os = "solia"; } elsif ( $installer::globals::islinuxbuild ) { $os = "linux"; } - elsif ( $installer::globals::platformid eq 'macosx_x86_64' ) { $os = "macosxx"; } + elsif ( $installer::globals::ismacbuild ) { $os = "macosxx"; } else { $os = ""; } $downloadname =~ s/\{os\}/$os/; diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index f16259bd9023..8c63a341d34d 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -269,7 +269,7 @@ sub setglobalvariables } } - if ( $installer::globals::platformid eq 'macosx_x86_64') + if ( $installer::globals::os eq 'MACOSX' ) { $installer::globals::ismacbuild = 1; diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 01a594a5e72c..d289c18c185f 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -701,7 +701,7 @@ sub create_simple_package my $extensionfolder = get_extensions_dir($subfolderdir); installer::systemactions::remove_empty_dirs_in_folder($extensionfolder); - if ( $installer::globals::platformid eq 'macosx_x86_64' ) + if ( $installer::globals::ismacbuild ) { installer::worker::put_scpactions_into_installset("$installdir/$packagename"); } |