diff options
author | Lamont Granquist <lamont@chef.io> | 2019-05-15 09:25:20 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-15 09:25:20 -0700 |
commit | 0e47d657beba91974cb070208255add75b0219cf (patch) | |
tree | dfec6750c8610d6a07bd81285d99a0de8a246516 | |
parent | cdcbe629ef44b8206e74db00148b04803a333892 (diff) | |
parent | 7b62c63167ebb935396a998e95255b9f44dc7d3e (diff) | |
download | chef-0e47d657beba91974cb070208255add75b0219cf.tar.gz |
Merge pull request #8552 from smacfarlane/sm/update-habitat-builds
Update habitat/plan.sh to allow building of Chef Infra Client 15
-rw-r--r-- | habitat/plan.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/habitat/plan.sh b/habitat/plan.sh index 26fcd5dad6..5569999a12 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -7,7 +7,7 @@ pkg_license=('Apache-2.0') pkg_filename=${pkg_dirname}.tar.gz pkg_bin_dirs=(bin) pkg_build_deps=(core/make core/gcc core/git) -pkg_deps=(core/glibc core/ruby core/libxml2 core/libxslt core/libiconv core/xz core/zlib core/bundler core/openssl core/cacerts core/libffi core/coreutils core/libarchive) +pkg_deps=(core/glibc core/ruby26 core/libxml2 core/libxslt core/libiconv core/xz core/zlib core/bundler core/openssl core/cacerts core/libffi core/coreutils core/libarchive) pkg_svc_user=root do_before() { @@ -65,7 +65,7 @@ do_build() { do_install() { mkdir -p "${pkg_prefix}/chef" - for dir in bin chef-config lib chef.gemspec Gemfile Gemfile.lock; do + for dir in bin chef-bin chef-config lib chef.gemspec Gemfile Gemfile.lock; do cp -rv "${PLAN_CONTEXT}/../${dir}" "${pkg_prefix}/chef/" done @@ -80,7 +80,7 @@ do_install() { popd > /dev/null fix_interpreter "${pkg_prefix}/bin/*" core/coreutils bin/env - fix_interpreter "${pkg_prefix}/bin/*" core/ruby bin/ruby + fix_interpreter "${pkg_prefix}/bin/*" core/ruby26 bin/ruby } do_end() { @@ -104,7 +104,7 @@ _bundle_install() { --jobs "$(nproc)" \ --without development:test \ --path "$path" \ - --shebang="$(pkg_path_for "core/ruby")/bin/ruby" \ + --shebang="$(pkg_path_for "core/ruby26")/bin/ruby" \ --no-clean \ --retry 5 \ --standalone |