Merge pull request #149 from chef/dp_fix_lzo_xc

Merged change 5b45093e-9d7e-45f7-a12a-998ca7a9700e From review branch dp_fix_lzo_xc into master Signed-off-by: adam <[email protected]>
habitat-sh · Jan 14, 2016 · 5d94094 · 5d94094
2 parents d362bde + 7d765ab
commit 5d94094
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/plans/Makefile b/plans/Makefile
@@ -1,4 +1,4 @@
-BLDR_PKGS := glibc libgcc patchelf zlib bzip2 cacerts busybox libgpg-error libassuan gnupg gpgme openssl libarchive runit bldr
+BLDR_PKGS := glibc libgcc patchelf zlib xz bzip2 cacerts busybox libgpg-error libassuan gnupg gpgme openssl libarchive runit bldr
 PKGS := $(BLDR_PKGS) redis ncurses libedit pcre nginx haproxy libaio libltdl libxml2 numactl perl erlang libyaml libiconv libtool libffi ruby
 REPO := http://159.203.235.47
 
@@ -38,6 +38,7 @@ baseimage_root:
 		/opt/bldr/pkgs/chef/glibc \
 		/opt/bldr/pkgs/chef/libgcc \
 		/opt/bldr/pkgs/chef/zlib \
+		/opt/bldr/pkgs/chef/xz \
 		/opt/bldr/pkgs/chef/cacerts \
 		/opt/bldr/pkgs/chef/busybox \
 		/opt/bldr/pkgs/chef/gnupg \

diff --git a/plans/libarchive/plan.sh b/plans/libarchive/plan.sh
@@ -6,7 +6,7 @@ pkg_source=https://github.com/${pkg_name}/${pkg_name}/archive/v${pkg_version}.ta
 pkg_filename=${pkg_name}-${pkg_version}.tar.gz
 pkg_shasum=9543ed21ac18fecc238dec4a6fae6abf1cc449dbad5940ca0d80202e0a7237a4
 pkg_gpg_key=3853DA6B
-pkg_deps=(chef/bzip2 chef/lzo chef/openssl chef/xz chef/zlib)
+pkg_deps=(chef/bzip2 chef/openssl chef/xz chef/zlib)
 pkg_lib_dirs=(lib)
 pkg_include_dirs=(include)