From dbe3d4339b741cb422abb15318ad9f426be43c05 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 29 Nov 2021 16:25:48 +0100 Subject: [PATCH 1/3] Revert "Testing" --- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/install | 2 -- scripts/upgrade | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/manifest.json b/manifest.json index fce2641..47b719c 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.20~ynh2", + "version": "4.20~ynh1", "url": "https://example.com", "license": "Apache-2.0", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 4ea3ed1..829c271 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -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 busybox|busybox-static" +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 6132685..3f5bb61 100755 --- a/scripts/install +++ b/scripts/install @@ -65,8 +65,6 @@ ynh_script_progression --message="Building lxd from sources..." --weight=60 pushd ${lxd_tmp} -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/" diff --git a/scripts/upgrade b/scripts/upgrade index 58a2519..a2d5df6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -81,8 +81,6 @@ ynh_script_progression --message="Building lxd from sources..." --weight=60 pushd ${lxd_tmp} -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/" From bcd2a8853fa5916e035415b39a74a14aaebf3664 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 29 Nov 2021 16:26:55 +0100 Subject: [PATCH 2/3] Revert "Revert "Testing" / Ooopsies" --- manifest.json | 2 +- scripts/_common.sh | 2 +- scripts/install | 2 ++ scripts/upgrade | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 47b719c..fce2641 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.20~ynh1", + "version": "4.20~ynh2", "url": "https://example.com", "license": "Apache-2.0", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 829c271..4ea3ed1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -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" +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 busybox|busybox-static" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 3f5bb61..6132685 100755 --- a/scripts/install +++ b/scripts/install @@ -65,6 +65,8 @@ ynh_script_progression --message="Building lxd from sources..." --weight=60 pushd ${lxd_tmp} +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/" diff --git a/scripts/upgrade b/scripts/upgrade index a2d5df6..58a2519 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -81,6 +81,8 @@ ynh_script_progression --message="Building lxd from sources..." --weight=60 pushd ${lxd_tmp} +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/" From f9cd2ea352e56aafe6f6ec74de90e8e50a84536c Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 23 Dec 2021 17:15:34 +0100 Subject: [PATCH 3/3] 4.21 --- 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 9271bcf..72ae141 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.20 +**Shipped version:** 4.21 ## Demo diff --git a/conf/go.arm.src b/conf/go.arm.src index 2c5177a..324088c 100644 --- a/conf/go.arm.src +++ b/conf/go.arm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://golang.org/dl/go1.17.linux-armv6l.tar.gz -SOURCE_SUM=ae89d33f4e4acc222bdb04331933d5ece4ae71039812f6ccd7493cb3e8ddfb4e +SOURCE_URL=https://go.dev/dl/go1.17.5.linux-armv6l.tar.gz +SOURCE_SUM=aa1fb6c53b4fe72f159333362a10aca37ae938bde8adc9c6eaf2a8e87d1e47de 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 cefdc7d..7f2f95d 100644 --- a/conf/go.arm64.src +++ b/conf/go.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://golang.org/dl/go1.17.linux-arm64.tar.gz -SOURCE_SUM=01a9af009ada22122d3fcb9816049c1d21842524b38ef5d5a0e2ee4b26d7c3e7 +SOURCE_URL=https://go.dev/dl/go1.17.5.linux-arm64.tar.gz +SOURCE_SUM=6f95ce3da40d9ce1355e48f31f4eb6508382415ca4d7413b1e7a3314e6430e7e 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 822c04a..c46d213 100644 --- a/conf/go.i386.src +++ b/conf/go.i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://golang.org/dl/go1.17.linux-386.tar.gz -SOURCE_SUM=c19e3227a6ac6329db91d1af77bbf239ccd760a259c16e6b9c932d527ff14848 +SOURCE_URL=https://go.dev/dl/go1.17.5.linux-386.tar.gz +SOURCE_SUM=4f4914303bc18f24fd137a97e595735308f5ce81323c7224c12466fd763fc59f 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 b883cc4..f3505a1 100644 --- a/conf/go.x86-64.src +++ b/conf/go.x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://golang.org/dl/go1.17.linux-amd64.tar.gz -SOURCE_SUM=6bf89fc4f5ad763871cf7eac80a2d594492de7a818303283f1366a7f6a30372d +SOURCE_URL=https://go.dev/dl/go1.17.5.linux-amd64.tar.gz +SOURCE_SUM=bd78114b0d441b029c8fe0341f4910370925a4d270a6a590668840675b0c653e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/lxd.src b/conf/lxd.src index 083c4a5..c7565c3 100644 --- a/conf/lxd.src +++ b/conf/lxd.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/lxc/lxd/releases/download/lxd-4.20/lxd-4.20.tar.gz -SOURCE_SUM=35504ef2e2dc7024b7088010987657969b1e2dea5581b24b4294f8f449248ed5 +SOURCE_URL=https://github.com/lxc/lxd/releases/download/lxd-4.21/lxd-4.21.tar.gz +SOURCE_SUM=7a6745b50a5914d6f7812ee1def103373b38ea4759593302a0eded2787a652ac SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index fce2641..6ad7106 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.20~ynh2", + "version": "4.21~ynh1", "url": "https://example.com", "license": "Apache-2.0", "maintainer": {