diff options
author | echohack <echohack@users.noreply.github.com> | 2019-06-20 09:57:56 -0700 |
---|---|---|
committer | echohack <echohack@users.noreply.github.com> | 2019-06-20 10:44:38 -0700 |
commit | c3ec98159edb0a1b008f7442c2123ee16e064c5d (patch) | |
tree | bf54a5421ad8a5405701c6d770b63c3cff22bb07 | |
parent | c8168aece5d38dd83cf88055d2e936cb3173e856 (diff) | |
download | chef-c3ec98159edb0a1b008f7442c2123ee16e064c5d.tar.gz |
add new build configuration for scaffolding-chef
Signed-off-by: echohack <echohack@users.noreply.github.com>
-rw-r--r-- | .bldr.toml | 25 | ||||
-rw-r--r-- | habitat-packages/chef-client/plan.sh | 5 |
2 files changed, 29 insertions, 1 deletions
diff --git a/.bldr.toml b/.bldr.toml index 190969c79d..f86b5e682d 100644 --- a/.bldr.toml +++ b/.bldr.toml @@ -4,6 +4,19 @@ build_targets = [ "x86_64-linux", "x86_64-linux-kernel2" ] +paths = [ + "bin", + "chef-bin", + "chef-config", + "ci", + "distro", + "ext", + "habitat-packages", + "lib", + "omnibus", # TODO: Evaluate if we really need this in the future + "tasks", +] + [scaffolding-chef] plan_path = "habitat-packages/scaffolding-chef" build_targets = [ @@ -11,3 +24,15 @@ build_targets = [ "x86_64-linux-kernel2" # "x86_64-windows" --- TODO: Expeditor does not currently support Windows, but will in the coming weeks. Uncomment me soon! ] +paths = [ + "bin", + "chef-bin", + "chef-config", + "ci", + "distro", + "ext", + "habitat-packages", + "lib", + "omnibus", # TODO: Evaluate if we really need this in the future + "tasks", +] diff --git a/habitat-packages/chef-client/plan.sh b/habitat-packages/chef-client/plan.sh index 5569999a12..8d5f811d0d 100644 --- a/habitat-packages/chef-client/plan.sh +++ b/habitat-packages/chef-client/plan.sh @@ -2,7 +2,6 @@ pkg_name=chef-client pkg_origin=chef pkg_maintainer="The Chef Maintainers <humans@chef.io>" pkg_description="The Chef Client" -pkg_version=$(cat ../VERSION) pkg_license=('Apache-2.0') pkg_filename=${pkg_dirname}.tar.gz pkg_bin_dirs=(bin) @@ -10,6 +9,10 @@ pkg_build_deps=(core/make core/gcc core/git) 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 +pkg_version() { + cat "$SRC_PATH/VERSION" +} + do_before() { do_default_before update_pkg_version |