From 77eb7a148878d8814e9c5d94ed67e5039e0dc4b5 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 6 Sep 2021 11:37:32 +0200 Subject: [PATCH 1/2] 4.18 --- README.md | 2 +- conf/go.arm.src | 4 ++-- conf/go.arm64.src | 4 ++-- conf/go.i386.src | 4 ++-- conf/go.x86-64.src | 4 ++-- conf/lxd.src | 4 ++-- manifest.json | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 73646a3..b081fef 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview 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 diff --git a/conf/go.arm.src b/conf/go.arm.src index 1a78734..2c5177a 100644 --- a/conf/go.arm.src +++ b/conf/go.arm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://golang.org/dl/go1.16.7.linux-armv6l.tar.gz -SOURCE_SUM=b2973ceeae234866368baf9469fb7b9444857e50dc785ba879d98a0aa208a12b +SOURCE_URL=https://golang.org/dl/go1.17.linux-armv6l.tar.gz +SOURCE_SUM=ae89d33f4e4acc222bdb04331933d5ece4ae71039812f6ccd7493cb3e8ddfb4e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/go.arm64.src b/conf/go.arm64.src index f25fee9..cefdc7d 100644 --- a/conf/go.arm64.src +++ b/conf/go.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://golang.org/dl/go1.16.7.linux-arm64.tar.gz -SOURCE_SUM=63d6b53ecbd2b05c1f0e9903c92042663f2f68afdbb67f4d0d12700156869bac +SOURCE_URL=https://golang.org/dl/go1.17.linux-arm64.tar.gz +SOURCE_SUM=01a9af009ada22122d3fcb9816049c1d21842524b38ef5d5a0e2ee4b26d7c3e7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/go.i386.src b/conf/go.i386.src index 1f5044a..822c04a 100644 --- a/conf/go.i386.src +++ b/conf/go.i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://golang.org/dl/go1.16.7.linux-386.tar.gz -SOURCE_SUM=5c0c8891fa88993f2193fbc9dd5cca6c250c89aa8c12bbaa382b6ff38139bcc3 +SOURCE_URL=https://golang.org/dl/go1.17.linux-386.tar.gz +SOURCE_SUM=c19e3227a6ac6329db91d1af77bbf239ccd760a259c16e6b9c932d527ff14848 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/go.x86-64.src b/conf/go.x86-64.src index 4675585..b883cc4 100644 --- a/conf/go.x86-64.src +++ b/conf/go.x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://golang.org/dl/go1.16.7.linux-amd64.tar.gz -SOURCE_SUM=7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04 +SOURCE_URL=https://golang.org/dl/go1.17.linux-amd64.tar.gz +SOURCE_SUM=6bf89fc4f5ad763871cf7eac80a2d594492de7a818303283f1366a7f6a30372d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/lxd.src b/conf/lxd.src index 5c5608a..ccfaf43 100644 --- a/conf/lxd.src +++ b/conf/lxd.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/lxc/lxd/releases/download/lxd-4.17/lxd-4.17.tar.gz -SOURCE_SUM=54524a25398e366d7ff20726e3bd59a3ac9a4da34b49a370e27ff0599e7ff5cf +SOURCE_URL=https://github.com/lxc/lxd/releases/download/lxd-4.18/lxd-4.18.tar.gz +SOURCE_SUM=b60e09e4d349eebfedff8f1ca493533fb7353aceb43cbbcd7f4e340715a5f3a5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index b283594..bb78185 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "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", "license": "Apache-2.0", "maintainer": { From 66671d0a0d05054f28fb61bb19bd0e68aee522e6 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Mon, 6 Sep 2021 15:17:18 +0200 Subject: [PATCH 2/2] fix install --- scripts/_common.sh | 2 +- scripts/install | 13 +++++-------- scripts/upgrade | 11 +++++------ 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index b689f59..829c271 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # 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 diff --git a/scripts/install b/scripts/install index 3849b5d..3f5bb61 100755 --- a/scripts/install +++ b/scripts/install @@ -56,7 +56,7 @@ export PATH=$go_tmp/bin:$PATH lxd_tmp=$(mktemp -d) ynh_setup_source --dest_dir="$lxd_tmp" --source_id="lxd" -export GOPATH=${lxd_tmp}/_dist +export GOPATH=${lxd_tmp}/vendor/ #================================================= # BUILD FROM SOURCES @@ -66,19 +66,16 @@ ynh_script_progression --message="Building lxd from sources..." --weight=60 pushd ${lxd_tmp} ynh_exec_warn_less make deps -export CGO_CFLAGS="-I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/dqlite/include/" -export CGO_LDFLAGS="-L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/dqlite/.libs/" -export LD_LIBRARY_PATH="${GOPATH}/deps/raft/.libs/:${GOPATH}/deps/dqlite/.libs/" +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_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 mkdir -p /usr/local/lib/$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 ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/ popd diff --git a/scripts/upgrade b/scripts/upgrade index 8c38571..f3b13de 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,7 +71,7 @@ export PATH=$go_tmp/bin:$PATH lxd_tmp=$(mktemp -d) ynh_setup_source --dest_dir="$lxd_tmp" --source_id="lxd" -export GOPATH=${lxd_tmp}/_dist +export GOPATH=${lxd_tmp}/vendor/ #================================================= # BUILD FROM SOURCES @@ -81,11 +81,10 @@ ynh_script_progression --message="Building lxd from sources..." --weight=60 pushd ${lxd_tmp} ynh_exec_warn_less make deps -export CGO_CFLAGS="-I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/dqlite/include/" -export CGO_LDFLAGS="-L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/dqlite/.libs/" -export LD_LIBRARY_PATH="${GOPATH}/deps/raft/.libs/:${GOPATH}/deps/dqlite/.libs/" +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_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)" -cd $GOPATH/src/github.com/lxc/lxd export GOCACHE=$go_tmp @@ -93,7 +92,7 @@ ynh_exec_warn_less make mkdir -p /usr/local/lib/$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 ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/ popd