diff --git a/manifest.toml b/manifest.toml index 5eca6c4..411902b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "LXD" description.en = "Offers a user experience similar to virtual machines but using Linux containers instead." description.fr = "Offre une expérience utilisateur similaire aux machines virtuelles mais en utilisant des conteneurs Linux à la place." -version = "5.21.1~ynh1" +version = "6.1~ynh1" maintainers = ["kay0u"] diff --git a/scripts/install b/scripts/install index ced3fae..d07fc41 100755 --- a/scripts/install +++ b/scripts/install @@ -32,16 +32,16 @@ pushd "$install_dir/lxd" export HOME=${HOME:-"/root/"} ynh_exec_warn_less make deps - export CGO_CFLAGS="-I${GOPATH}/raft/include/ -I${GOPATH}/dqlite/include/" - export CGO_LDFLAGS="-L${GOPATH}/raft/.libs -L${GOPATH}/dqlite/.libs/" - export LD_LIBRARY_PATH="${GOPATH}/raft/.libs/:${GOPATH}/dqlite/.libs/" + export CGO_CFLAGS="-I${GOPATH}dqlite/include/" + export CGO_LDFLAGS="-L${GOPATH}dqlite/.libs/" + export LD_LIBRARY_PATH="${GOPATH}dqlite/.libs/" export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" ynh_exec_warn_less make mkdir -p /usr/local/lib/$app mkdir -p /var/log/$app - cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/ + cp -a ${GOPATH}/dqlite/.libs/lib*.so* /usr/local/lib/$app/ cp ${GOPATH}/bin/{fuidshift,lxc,lxc-to-lxd,lxd,lxd-agent,lxd-benchmark,lxd-migrate,lxd-user} /usr/local/bin cp $install_dir/lxd/scripts/bash/lxd-client /etc/bash_completion.d/ ) diff --git a/scripts/upgrade b/scripts/upgrade index 054fbf0..b78fd6b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -56,16 +56,16 @@ pushd "$install_dir/lxd" export HOME=${HOME:-"/root/"} ynh_exec_warn_less make deps - export CGO_CFLAGS="-I${GOPATH}/raft/include/ -I${GOPATH}/dqlite/include/" - export CGO_LDFLAGS="-L${GOPATH}/raft/.libs -L${GOPATH}/dqlite/.libs/" - export LD_LIBRARY_PATH="${GOPATH}/raft/.libs/:${GOPATH}/dqlite/.libs/" + export CGO_CFLAGS="-I${GOPATH}dqlite/include/" + export CGO_LDFLAGS="-L${GOPATH}dqlite/.libs/" + export LD_LIBRARY_PATH="${GOPATH}dqlite/.libs/" export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" ynh_exec_warn_less make mkdir -p /usr/local/lib/$app mkdir -p /var/log/$app - cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/ + cp -a ${GOPATH}/dqlite/.libs/lib*.so* /usr/local/lib/$app/ cp ${GOPATH}/bin/{fuidshift,lxc,lxc-to-lxd,lxd,lxd-agent,lxd-benchmark,lxd-migrate,lxd-user} /usr/local/bin cp $install_dir/lxd/scripts/bash/lxd-client /etc/bash_completion.d/ popd