Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Commit

Permalink
Merge pull request #2691 from chef/jm/deep_sign
Browse files Browse the repository at this point in the history
Fixes all notarization issues
  • Loading branch information
tas50 authored Jan 28, 2020
2 parents 6a227ef + efd4bb1 commit beddda6
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 2 deletions.
2 changes: 1 addition & 1 deletion omnibus/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: 1b2dfe467cbc22e0e2e232e2648af3482830bfd7
revision: ad7ed679f1b34c20f8be34365d38cb1c21e737cd
branch: master
specs:
omnibus-software (4.0.0)
Expand Down
24 changes: 24 additions & 0 deletions omnibus/config/patches/rb-fsevent-gem.patch
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?
2 changes: 1 addition & 1 deletion omnibus/config/projects/chefdk.rb
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@

package :pkg do
identifier "com.getchef.pkg.chefdk"
signing_identity "Developer ID Installer: Chef Software, Inc. (EU3VF8YLX2)"
signing_identity "Chef Software, Inc. (EU3VF8YLX2)"
end

package :msi do
Expand Down
5 changes: 5 additions & 0 deletions omnibus/config/software/chef-dk.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@
# for train
dependency "google-protobuf"

# This is a transative dep but we need to build from source so binaries are built on current sdk.
# Only matters on mac.
# TODO: Contact gem mainter about getting new release.
dependency "rb-fsevent-gem" if mac_os_x?

build do
env = with_standard_compiler_flags(with_embedded_path)

Expand Down
2 changes: 2 additions & 0 deletions omnibus/config/software/git-custom-bindir.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@

source url: "https://www.kernel.org/pub/software/scm/git/git-#{version}.tar.gz"

bin_dirs ["#{install_dir}/gitbin", "#{install_dir}/embedded/libexec/git-core"]

build do
env = with_standard_compiler_flags(with_embedded_path)

Expand Down
36 changes: 36 additions & 0 deletions omnibus/config/software/rb-fsevent-gem.rb
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

0 comments on commit beddda6

Please sign in to comment.