From bcd2a8853fa5916e035415b39a74a14aaebf3664 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 29 Nov 2021 16:26:55 +0100 Subject: [PATCH] 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/"