summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock22
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/dsl/architecture.rb6
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--chef-utils/spec/unit/dsl/architecture_spec.rb11
-rw-r--r--lib/chef/version.rb2
9 files changed, 34 insertions, 22 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d93688ea3..e8016fbb33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.1.4 -->
-## [v16.1.4](https://github.com/chef/chef/tree/v16.1.4) (2020-05-19)
+<!-- latest_release 16.1.5 -->
+## [v16.1.5](https://github.com/chef/chef/tree/v16.1.5) (2020-05-20)
#### Merged Pull Requests
-- Add spellcheck config and fix a bunch of violations [#9826](https://github.com/chef/chef/pull/9826) ([phiggins](https://github.com/phiggins))
+- Added armv6l and armv7l to arm? and armhf? helpers [#9887](https://github.com/chef/chef/pull/9887) ([mattray](https://github.com/mattray))
<!-- latest_release -->
<!-- release_rollup since=16.1.0 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Added armv6l and armv7l to arm? and armhf? helpers [#9887](https://github.com/chef/chef/pull/9887) ([mattray](https://github.com/mattray)) <!-- 16.1.5 -->
- Add spellcheck config and fix a bunch of violations [#9826](https://github.com/chef/chef/pull/9826) ([phiggins](https://github.com/phiggins)) <!-- 16.1.4 -->
- Fix ruby 2.7 keyword argument warning. [#9883](https://github.com/chef/chef/pull/9883) ([phiggins](https://github.com/phiggins)) <!-- 16.1.3 -->
- Fix failures inspecting a single cookbook [#9882](https://github.com/chef/chef/pull/9882) ([tas50](https://github.com/tas50)) <!-- 16.1.2 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 9d4914d0b9..c3055560e2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,12 +28,12 @@ GIT
PATH
remote: .
specs:
- chef (16.1.4)
+ chef (16.1.5)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.1.4)
- chef-utils (= 16.1.4)
+ chef-config (= 16.1.5)
+ chef-utils (= 16.1.5)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -62,12 +62,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (16.1.4-universal-mingw32)
+ chef (16.1.5-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.1.4)
- chef-utils (= 16.1.4)
+ chef-config (= 16.1.5)
+ chef-utils (= 16.1.5)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -112,15 +112,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.1.4)
- chef (= 16.1.4)
+ chef-bin (16.1.5)
+ chef (= 16.1.5)
PATH
remote: chef-config
specs:
- chef-config (16.1.4)
+ chef-config (16.1.5)
addressable
- chef-utils (= 16.1.4)
+ chef-utils (= 16.1.5)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -129,7 +129,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.1.4)
+ chef-utils (16.1.5)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 40a5614b0a..d4f38ed58a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.1.4 \ No newline at end of file
+16.1.5 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index e186cc46dd..729614c1d6 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "16.1.4".freeze
+ VERSION = "16.1.5".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index d70ff9739e..7bdb5dcfc1 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "16.1.4".freeze
+ VERSION = "16.1.5".freeze
end
diff --git a/chef-utils/lib/chef-utils/dsl/architecture.rb b/chef-utils/lib/chef-utils/dsl/architecture.rb
index e78e80f416..1d1cd643b7 100644
--- a/chef-utils/lib/chef-utils/dsl/architecture.rb
+++ b/chef-utils/lib/chef-utils/dsl/architecture.rb
@@ -110,17 +110,17 @@ module ChefUtils
# @return [Boolean]
#
def arm?(node = __getnode)
- %w{armhf aarch64 arm64 arch64}.include?(node["kernel"]["machine"])
+ %w{armv6l armv7l armhf aarch64 arm64 arch64}.include?(node["kernel"]["machine"])
end
- # Determine if the current architecture is 32-bit ARM.
+ # Determine if the current architecture is 32-bit ARM hard float.
#
# @since 15.5
#
# @return [Boolean]
#
def armhf?(node = __getnode)
- %w{armhf}.include?(node["kernel"]["machine"])
+ %w{armv6l armv7l armhf}.include?(node["kernel"]["machine"])
end
# Determine if the current architecture is s390x.
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 383a893d2d..6506d65391 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "16.1.4".freeze
+ VERSION = "16.1.5".freeze
end
diff --git a/chef-utils/spec/unit/dsl/architecture_spec.rb b/chef-utils/spec/unit/dsl/architecture_spec.rb
index 18045935a1..0334b08835 100644
--- a/chef-utils/spec/unit/dsl/architecture_spec.rb
+++ b/chef-utils/spec/unit/dsl/architecture_spec.rb
@@ -131,6 +131,17 @@ RSpec.describe ChefUtils::DSL::Architecture do
arch_reports_true_for(:armhf?, :_32_bit?, :arm?)
end
+ context "on armv6l" do
+ let(:arch) { "armhf" }
+
+ arch_reports_true_for(:armhf?, :_32_bit?, :arm?)
+ end
+ context "on armv7l" do
+ let(:arch) { "armhf" }
+
+ arch_reports_true_for(:armhf?, :_32_bit?, :arm?)
+ end
+
context "on s390" do
let(:arch) { "s390" }
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0f0226fc5c..88de37c365 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("16.1.4")
+ VERSION = Chef::VersionString.new("16.1.5")
end
#
View Lorry Controller Status