Skip to content

Commit

Permalink
[lxd] Update LXD build deps and build script
Browse files Browse the repository at this point in the history
(cherry picked from commit b87206b)
(cherry picked from commit 97d899b)
  • Loading branch information
drybjed committed Jun 29, 2021
1 parent ca45f8e commit 84ca97c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ Fixed
``kmod`` package wasn't installed and the :command:`lsmod` command was not
available.

:ref:`debops.lxd` role
''''''''''''''''''''''

- The LXD build dependencies and build script have been updated to reflect
changes in upstream.

:ref:`debops.netbase` role
''''''''''''''''''''''''''

Expand Down
5 changes: 3 additions & 2 deletions ansible/roles/lxd/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,8 @@ lxd__golang__dependent_packages:
apt_dev_packages: [ 'autoconf', 'automake', 'tcl', 'libacl1-dev', 'libcap-dev',
'liblxc1', 'lxc-dev', 'libtool', 'libuv1-dev', 'make',
'pkg-config', 'libapparmor-dev', 'libseccomp-dev',
'libcap-dev', 'libudev-dev', 'libsqlite3-dev' ]
'libcap-dev', 'libudev-dev', 'libsqlite3-dev',
'liblz4-dev' ]
gpg: '{{ lxd__upstream_gpg_key }}'
git:
- repo: '{{ lxd__upstream_git_repository }}'
Expand All @@ -238,7 +239,7 @@ lxd__golang__dependent_packages:
export CGO_CFLAGS="-I${HOME}/go/deps/sqlite/ -I${HOME}/go/deps/libco/ -I${HOME}/go/deps/raft/include/ -I${HOME}/go/deps/dqlite/include/"
export CGO_LDFLAGS="-L${HOME}/go/deps/sqlite/.libs/ -L${HOME}/go/deps/libco/ -L${HOME}/go/deps/raft/.libs -L${HOME}/go/deps/dqlite/.libs/"
export LD_LIBRARY_PATH="${HOME}/go/deps/sqlite/.libs/:${HOME}/go/deps/libco/:${HOME}/go/deps/raft/.libs/:${HOME}/go/deps/dqlite/.libs/"
export CGO_LDFLAGS_ALLOW="-Wl,-wrap,pthread_create"
export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
make
git_binaries:

Expand Down

0 comments on commit 84ca97c

Please sign in to comment.