arm-habitat.diff

diff --git a/components/core/Cargo.toml b/components/core/Cargo.toml
index bb7444f15..4dea66b4b 100644
--- a/components/core/Cargo.toml
+++ b/components/core/Cargo.toml
@@ -52,7 +52,7 @@ windows-acl = "*"
 num_cpus = "*" # For doc tests
 
 [features]
-default = ["supported_targets"]
+default = ["supported_targets", "armhf-linux"]
 functional = []
 supported_targets = ["x86_64-darwin", "x86_64-linux", "x86_64-linux-kernel2", "x86_64-windows"]
 x86_64-darwin = []
@@ -60,3 +60,4 @@ x86_64-linux = []
 x86_64-linux-kernel2 = []
 x86_64-windows = []
 aarch64-linux = []
+armhf-linux = []
diff --git a/components/core/src/package/target.rs b/components/core/src/package/target.rs
index 60a9d6a7f..22911fbe6 100644
--- a/components/core/src/package/target.rs
+++ b/components/core/src/package/target.rs
@@ -313,6 +313,8 @@ package_targets! {
     /// [Linux kernel]: https://en.wikipedia.org/wiki/Linux_kernel
     /// [arm-arch]: https://en.wikipedia.org/wiki/ARM_architecture
     ("aarch64-linux", AARCH64_Linux, AARCH64_LINUX, "aarch64", "linux");
+
+    ("armhf-linux", ARMHF_Linux, ARMHF_LINUX, "armhf", "linux");
 }
 
 lazy_static::lazy_static! {
diff --git a/components/hab/Cargo.toml b/components/hab/Cargo.toml
index 20484175c..78dfad6f0 100644
--- a/components/hab/Cargo.toml
+++ b/components/hab/Cargo.toml
@@ -66,7 +66,8 @@ winreg = "*"
 tempfile = "*"
 
 [features]
-default = ["supported_targets"]
+default = ["supported_targets", "armhf-linux"]
 functional = []
 supported_targets = ["habitat_core/supported_targets"]
 aarch64-linux = ["habitat_core/aarch64-linux"]
+armhf-linux = ["habitat_core/armhf-linux"]
diff --git a/components/hab/src/command/studio/docker.rs b/components/hab/src/command/studio/docker.rs
index 8dbd15fbf..c5bd11435 100644
--- a/components/hab/src/command/studio/docker.rs
+++ b/components/hab/src/command/studio/docker.rs
@@ -354,6 +354,8 @@ fn studio_target(windows: bool, target: target::PackageTarget) -> target::Packag
         target::X86_64_WINDOWS => target::X86_64_LINUX,
         #[cfg(feature = "aarch64-linux")]
         target::AARCH64_LINUX => panic!("{} studios are not supported", target::AARCH64_LINUX),
+        #[cfg(feature = "armhf-linux")]
+        target::ARMHF_LINUX => target::X86_64_LINUX,
         // This is only needed for the case that we have no target enabled. In that case, we get a
         // non-exhaustive patterns error because the match statement is empty.
         #[cfg(not(any(feature = "supported_targets", feature = "aarch64-linux")))]