diff options
| author | Gerald Combs <gerald@wireshark.org> | 2021-11-30 09:09:57 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2021-11-30 09:24:02 -0800 |
| commit | 54ef97cc0145c590ff5f8ab3d3b6451e2bcd0c7c (patch) | |
| tree | d2a933be54f03a0313a399b67bf22ff4f5d06335 /packaging/macosx/path_helper | |
| parent | 3953ddcf579d079a4f7919826dc56e4136624d9a (diff) | |
Packaging: Specify host architectures in our macOS Extras packages.
Add 'hostArchitectures="arm64,x86_64"' to the ChmodBPF and path_helper
distribution XML files. "arm64" isn't specified in
https://developer.apple.com/library/archive/documentation/DeveloperTools/Reference/DistributionDefinitionRef/Chapters/Distribution_XML_Ref.html
but seems to be correct:
https://developer.apple.com/forums/thread/667672
https://stackoverflow.com/questions/11487596/making-macos-installer-packages-which-are-developer-id-ready
Blind attempt at fixing #17757.
Diffstat (limited to 'packaging/macosx/path_helper')
| -rw-r--r-- | packaging/macosx/path_helper/install-distribution.xml | 2 | ||||
| -rw-r--r-- | packaging/macosx/path_helper/uninstall-distribution.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/macosx/path_helper/install-distribution.xml b/packaging/macosx/path_helper/install-distribution.xml index 103d271efc..be7cbcdf14 100644 --- a/packaging/macosx/path_helper/install-distribution.xml +++ b/packaging/macosx/path_helper/install-distribution.xml @@ -10,7 +10,7 @@ https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/I <welcome language="en" mime-type="text/html"><![CDATA[<html><body><br /> <p style="margin: 0px; font: 13px 'Lucida Grande'">This package will add Wireshark and its associated utilities to the system PATH and MANPATH. Wireshark must be installed in /Applications.</p></body></html>]]></welcome> <pkg-ref id="org.wireshark.path_helper.pkg"/> - <options customize="never" require-scripts="false"/> + <options customize="never" require-scripts="false" hostArchitectures="arm64,x86_64"/> <choices-outline> <line choice="default"> <line choice="org.wireshark.path_helper.pkg"/> diff --git a/packaging/macosx/path_helper/uninstall-distribution.xml b/packaging/macosx/path_helper/uninstall-distribution.xml index ca08e6124e..7949475ece 100644 --- a/packaging/macosx/path_helper/uninstall-distribution.xml +++ b/packaging/macosx/path_helper/uninstall-distribution.xml @@ -10,7 +10,7 @@ https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/I <welcome language="en" mime-type="text/html"><![CDATA[<html><body><br /> <p style="margin: 0px; font: 13px 'Lucida Grande'">This package will remove Wireshark and its associated utilities from the system PATH and MANPATH.</p></body></html>]]></welcome> <pkg-ref id="org.wireshark.uninstall.path_helper.pkg"/> - <options customize="never" require-scripts="false"/> + <options customize="never" require-scripts="false" hostArchitectures="arm64,x86_64"/> <choices-outline> <line choice="default"> <line choice="org.wireshark.uninstall.path_helper.pkg"/> |