Merge pull request #21456 from kambala-decapitator/macos-force-sign

[macOS] improve signing app bundle and dmg creation
xbmc · May 25, 2022 · 6e1f254 · 6e1f254
2 parents 5f2a5e3 + 984f0a0
commit 6e1f254
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/tools/darwin/packaging/osx/dmgmaker.pl b/tools/darwin/packaging/osx/dmgmaker.pl
@@ -57,6 +57,7 @@ sub make_dmg {
     `xcrun SetFile -a V "/Volumes/$pkgname/background"`;
     `xcrun SetFile -a C "/Volumes/$pkgname/"`;
     `cp VolumeDSStoreApp "/Volumes/$pkgname/.DS_Store"`;
+    `diskutil unmountDisk $dev_handle`;
     `hdiutil detach $dev_handle`;
     `hdiutil convert "$volname.dmg" -format UDZO -imagekey zlib-level=9 -o "$volname.udzo.dmg"`;
     `rm -f "$volname.dmg"`;

diff --git a/tools/darwin/packaging/osx/mkdmg-osx.sh.in b/tools/darwin/packaging/osx/mkdmg-osx.sh.in
@@ -40,9 +40,9 @@ if [ "$EXPANDED_CODE_SIGN_IDENTITY_NAME" ]; then
   # execute codesign script
   "$DIRNAME/Codesign.command"
   # sign helper tool
-  codesign --verbose=4 --sign "$EXPANDED_CODE_SIGN_IDENTITY_NAME" --options runtime --timestamp --entitlements Kodi.entitlements "$APP/Contents/Resources/Kodi/tools/darwin/runtime/XBMCHelper"
+  codesign --verbose=4 --sign "$EXPANDED_CODE_SIGN_IDENTITY_NAME" --force --options runtime --timestamp --entitlements Kodi.entitlements "$APP/Contents/Resources/Kodi/tools/darwin/runtime/XBMCHelper"
   # perform top-level signing (Xcode does it automatically when signing settings are configured)
-  codesign --verbose=4 --sign "$EXPANDED_CODE_SIGN_IDENTITY_NAME" --options runtime --timestamp --entitlements Kodi.entitlements "$APP"
+  codesign --verbose=4 --sign "$EXPANDED_CODE_SIGN_IDENTITY_NAME" --force --options runtime --timestamp --entitlements Kodi.entitlements "$APP"
 fi
 
 PACKAGE=org.xbmc.@APP_NAME_LC@-osx