This repository has been archived by the owner on Jul 14, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 170
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This changes makes the neccessary changes to enable the pkg to pass apples notarization requirements.
1. Update omnibus and omnibus-software to versions that support deep signing
2. Drop 'Developer ID Installer:' from signing key. This lets sigining pick up the correct key for what is being signed.
3. Add bin_dirs and lib_dirs to chefdk and git-custom-bindir software definitions so siging can find their binaries and libraries.
4. Add software definition for rb-fsevent-gem so we build the gem. This resolves an issue where the shipped binary is build on to old an sdk.
5. Patch rb-fsevent-gem build to work in our environment. Set minimum target to current os and discover the sdk version.
Signed-off-by: Jon Morrow <jmorrow@chef.io>- Loading branch information
Jon Morrow
committed
Jan 23, 2020
1 parent
b5a615c
commit c96c4bb
Showing
7 changed files
with
112 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| diff --git a/bin/fsevent_watch b/bin/fsevent_watch | ||
| index 889204f..17b894b 100755 | ||
| Binary files a/bin/fsevent_watch and b/bin/fsevent_watch differ | ||
| diff --git a/ext/rakefile.rb b/ext/rakefile.rb | ||
| index d7789bd..fd8ec36 100644 | ||
| --- a/ext/rakefile.rb | ||
| +++ b/ext/rakefile.rb | ||
| @@ -48,13 +48,13 @@ CLOBBER.include $final_exe.to_s | ||
| task :sw_vers do | ||
| $mac_product_version = `sw_vers -productVersion`.strip | ||
| $mac_build_version = `sw_vers -buildVersion`.strip | ||
| - $MACOSX_DEPLOYMENT_TARGET = ENV["MACOSX_DEPLOYMENT_TARGET"] || $mac_product_version.sub(/\.\d*$/, '') | ||
| - $CFLAGS = "#{$CFLAGS} -mmacosx-version-min=#{$MACOSX_DEPLOYMENT_TARGET}" | ||
| + $MACOSX_MIN_TARGET = $mac_product_version.sub(/\.\d*$/, '') | ||
| + $CFLAGS = "#{$CFLAGS} -mmacosx-version-min=#{$MACOSX_MIN_TARGET}" | ||
| end | ||
|
|
||
| task :get_sdk_info => :sw_vers do | ||
| $SDK_INFO = {} | ||
| - version_info = `xcodebuild -version -sdk macosx#{$MACOSX_DEPLOYMENT_TARGET}` | ||
| + version_info = `xcodebuild -version -sdk macosx` | ||
| raise "invalid SDK" unless !!$?.exitstatus | ||
| version_info.strip.each_line do |line| | ||
| next if line.strip.empty? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| # | ||
| # Copyright 2012-2014 Chef Software, Inc. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| name "rb-fsevent-gem" | ||
| default_version "master" | ||
|
|
||
| source git: "https://github.com/thibaudgg/rb-fsevent.git" | ||
|
|
||
| license "Apache-2.0" | ||
| license_file "https://raw.githubusercontent.com/thibaudgg/rb-fsevent/master/LICENSE.txt" | ||
|
|
||
| dependency "ruby" | ||
|
|
||
| build do | ||
| env = with_standard_compiler_flags(with_embedded_path) | ||
| # Look up active sdk version. | ||
| sdk_ver = `xcrun --sdk macosx --show-sdk-version`.strip | ||
| env["MACOSX_DEPLOYMENT_TARGET"] = sdk_ver | ||
|
|
||
| bundle "install", env: env | ||
| bundle "exec rake replace_exe", env: env, cwd: "#{project_dir}/ext" | ||
| bundle "exec rake install:local", env: env | ||
| end |