YunoHost-Apps/lxd_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/lxd_ynh.git synced 2024-09-03 19:45:53 +02:00
Code Issues Activity Actions 1

Merge pull request #16 from YunoHost-Apps/testing

Browse source 
4.18
This commit is contained in:
Kayou 2021-09-07 11:08:10 +02:00 • committed by GitHub
commit 24b207f366
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -9,7 +9,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
## Overview ## Overview
LXD is a next generation system container manager. It offers a user experience similar to virtual machines but using Linux containers instead. LXD is a next generation system container manager. It offers a user experience similar to virtual machines but using Linux containers instead.
**Shipped version:** 4.17 **Shipped version:** 4.18
## Demo ## Demo

4
conf/go.arm.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://golang.org/dl/go1.16.7.linux-armv6l.tar.gz SOURCE_URL=https://golang.org/dl/go1.17.linux-armv6l.tar.gz
SOURCE_SUM=b2973ceeae234866368baf9469fb7b9444857e50dc785ba879d98a0aa208a12b SOURCE_SUM=ae89d33f4e4acc222bdb04331933d5ece4ae71039812f6ccd7493cb3e8ddfb4e
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

4
conf/go.arm64.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://golang.org/dl/go1.16.7.linux-arm64.tar.gz SOURCE_URL=https://golang.org/dl/go1.17.linux-arm64.tar.gz
SOURCE_SUM=63d6b53ecbd2b05c1f0e9903c92042663f2f68afdbb67f4d0d12700156869bac SOURCE_SUM=01a9af009ada22122d3fcb9816049c1d21842524b38ef5d5a0e2ee4b26d7c3e7
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

4
conf/go.i386.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://golang.org/dl/go1.16.7.linux-386.tar.gz SOURCE_URL=https://golang.org/dl/go1.17.linux-386.tar.gz
SOURCE_SUM=5c0c8891fa88993f2193fbc9dd5cca6c250c89aa8c12bbaa382b6ff38139bcc3 SOURCE_SUM=c19e3227a6ac6329db91d1af77bbf239ccd760a259c16e6b9c932d527ff14848
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

4
conf/go.x86-64.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://golang.org/dl/go1.16.7.linux-amd64.tar.gz SOURCE_URL=https://golang.org/dl/go1.17.linux-amd64.tar.gz
SOURCE_SUM=7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04 SOURCE_SUM=6bf89fc4f5ad763871cf7eac80a2d594492de7a818303283f1366a7f6a30372d
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

4
conf/lxd.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/lxc/lxd/releases/download/lxd-4.17/lxd-4.17.tar.gz SOURCE_URL=https://github.com/lxc/lxd/releases/download/lxd-4.18/lxd-4.18.tar.gz
SOURCE_SUM=54524a25398e366d7ff20726e3bd59a3ac9a4da34b49a370e27ff0599e7ff5cf SOURCE_SUM=b60e09e4d349eebfedff8f1ca493533fb7353aceb43cbbcd7f4e340715a5f3a5
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

2
manifest.json
View file

@ -5,7 +5,7 @@
"description": { "description": {
"en": "Offers a user experience similar to virtual machines but using Linux containers instead." "en": "Offers a user experience similar to virtual machines but using Linux containers instead."
}, },
"version": "4.17~ynh1", "version": "4.18~ynh1",
"url": "https://example.com", "url": "https://example.com",
"license": "Apache-2.0", "license": "Apache-2.0",
"maintainer": { "maintainer": {

2
scripts/_common.sh
View file

@ -5,7 +5,7 @@
#================================================= #=================================================
# dependencies used by the app # dependencies used by the app
pkg_dependencies="acl autoconf dnsmasq-base git libacl1-dev libcap-dev liblxc1 lxc-dev libsqlite3-dev libtool libudev-dev libuv1-dev make pkg-config rsync squashfs-tools tar tcl xz-utils ebtables libapparmor-dev libseccomp-dev libcap-dev liblz4-dev lvm2 thin-provisioning-tools btrfs-progs" pkg_dependencies="acl attr autoconf dnsmasq-base git libacl1-dev libcap-dev liblxc1 lxc-dev libsqlite3-dev libtool libudev-dev liblz4-dev libuv1-dev make pkg-config rsync squashfs-tools tar tcl xz-utils ebtables libapparmor-dev libseccomp-dev libcap-dev lvm2 thin-provisioning-tools btrfs-progs"
#================================================= #=================================================
# PERSONAL HELPERS # PERSONAL HELPERS

13
scripts/install
View file

@ -56,7 +56,7 @@ export PATH=$go_tmp/bin:$PATH
lxd_tmp=$(mktemp -d) lxd_tmp=$(mktemp -d)
ynh_setup_source --dest_dir="$lxd_tmp" --source_id="lxd" ynh_setup_source --dest_dir="$lxd_tmp" --source_id="lxd"
export GOPATH=${lxd_tmp}/_dist export GOPATH=${lxd_tmp}/vendor/
#================================================= #=================================================
# BUILD FROM SOURCES # BUILD FROM SOURCES
@ -66,19 +66,16 @@ ynh_script_progression --message="Building lxd from sources..." --weight=60
pushd ${lxd_tmp} pushd ${lxd_tmp}
ynh_exec_warn_less make deps ynh_exec_warn_less make deps
export CGO_CFLAGS="-I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/dqlite/include/" export CGO_CFLAGS="-I${GOPATH}/raft/include/ -I${GOPATH}/dqlite/include/"
export CGO_LDFLAGS="-L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/dqlite/.libs/" export CGO_LDFLAGS="-L${GOPATH}/raft/.libs -L${GOPATH}/dqlite/.libs/"
export LD_LIBRARY_PATH="${GOPATH}/deps/raft/.libs/:${GOPATH}/deps/dqlite/.libs/" export LD_LIBRARY_PATH="${GOPATH}/raft/.libs/:${GOPATH}/dqlite/.libs/"
export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
cd $GOPATH/src/github.com/lxc/lxd
export GOCACHE=$go_tmp
ynh_exec_warn_less make ynh_exec_warn_less make
mkdir -p /usr/local/lib/$app mkdir -p /usr/local/lib/$app
mkdir -p /var/log/$app mkdir -p /var/log/$app
cp -a ${GOPATH}/deps/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/ cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/
cp ${GOPATH}/bin/{lxc,lxd,lxc-to-lxd,lxd-p2c} /usr/local/bin cp ${GOPATH}/bin/{lxc,lxd,lxc-to-lxd,lxd-p2c} /usr/local/bin
cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/ cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/
popd popd

11
scripts/upgrade
View file

@ -71,7 +71,7 @@ export PATH=$go_tmp/bin:$PATH
lxd_tmp=$(mktemp -d) lxd_tmp=$(mktemp -d)
ynh_setup_source --dest_dir="$lxd_tmp" --source_id="lxd" ynh_setup_source --dest_dir="$lxd_tmp" --source_id="lxd"
export GOPATH=${lxd_tmp}/_dist export GOPATH=${lxd_tmp}/vendor/
#================================================= #=================================================
# BUILD FROM SOURCES # BUILD FROM SOURCES
@ -81,11 +81,10 @@ ynh_script_progression --message="Building lxd from sources..." --weight=60
pushd ${lxd_tmp} pushd ${lxd_tmp}
ynh_exec_warn_less make deps ynh_exec_warn_less make deps
export CGO_CFLAGS="-I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/dqlite/include/" export CGO_CFLAGS="-I${GOPATH}/raft/include/ -I${GOPATH}/dqlite/include/"
export CGO_LDFLAGS="-L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/dqlite/.libs/" export CGO_LDFLAGS="-L${GOPATH}/raft/.libs -L${GOPATH}/dqlite/.libs/"
export LD_LIBRARY_PATH="${GOPATH}/deps/raft/.libs/:${GOPATH}/deps/dqlite/.libs/" export LD_LIBRARY_PATH="${GOPATH}/raft/.libs/:${GOPATH}/dqlite/.libs/"
export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
cd $GOPATH/src/github.com/lxc/lxd
export GOCACHE=$go_tmp export GOCACHE=$go_tmp
@ -93,7 +92,7 @@ ynh_exec_warn_less make
mkdir -p /usr/local/lib/$app mkdir -p /usr/local/lib/$app
mkdir -p /var/log/$app mkdir -p /var/log/$app
cp -a ${GOPATH}/deps/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/ cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/
cp ${GOPATH}/bin/{lxc,lxd,lxc-to-lxd,lxd-p2c} /usr/local/bin cp ${GOPATH}/bin/{lxc,lxd,lxc-to-lxd,lxd-p2c} /usr/local/bin
cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/ cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/
popd popd