Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix xz dep, remove lzo #149

Merged
merged 1 commit into from
Jan 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion plans/Makefile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion plans/libarchive/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down