From 09515ae29baa63ea735c4ea7d6cd9367d5a70aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 14 Jul 2024 17:37:55 +0200 Subject: [PATCH 1/4] Rename source as main --- manifest.toml | 2 +- scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index f231df7..c1aabf9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -43,7 +43,7 @@ ram.runtime = "500M" armhf.url = "https://go.dev/dl/go1.21.5.linux-armv6l.tar.gz" armhf.sha256 = "837f4bf4e22fcdf920ffeaa4abf3d02d1314e03725431065f4d44c46a01b42fe" - [resources.sources.lxd] + [resources.sources.main] url = "https://github.com/canonical/lxd/releases/download/lxd-5.21.1/lxd-5.21.1.tar.gz" sha256 = "f148aa7e1fc31f6cef3038e141e9bd03787274ffc506b97376d758abf1a93cb7" autoupdate.strategy = "latest_github_release" diff --git a/scripts/install b/scripts/install index 3bf9c53..ced3fae 100755 --- a/scripts/install +++ b/scripts/install @@ -16,7 +16,7 @@ ynh_script_progression --message="Setting up source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --source_id="go" --dest_dir="$install_dir/go" -ynh_setup_source --source_id="lxd" --dest_dir="$install_dir/lxd" +ynh_setup_source --source_id="main" --dest_dir="$install_dir/lxd" #================================================= # SPECIFIC SETUP diff --git a/scripts/upgrade b/scripts/upgrade index 86ae56c..054fbf0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -41,7 +41,7 @@ ynh_setup_source --source_id="go" --dest_dir="$install_dir/go" --full_replace=1 export PATH="$install_dir/go/bin:$PATH" -ynh_setup_source --source_id="lxd" --dest_dir="$install_dir/lxd" --full_replace=1 +ynh_setup_source --source_id="main" --dest_dir="$install_dir/lxd" --full_replace=1 export GOPATH="$install_dir/lxd/vendor/" From 770634d0ddfb038dc8cccfcfb0d43ca6ac9eb01f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 14 Jul 2024 17:39:56 +0200 Subject: [PATCH 2/4] fix version_regex autoupdate --- manifest.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifest.toml b/manifest.toml index c1aabf9..a4cda5a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -46,8 +46,10 @@ ram.runtime = "500M" [resources.sources.main] url = "https://github.com/canonical/lxd/releases/download/lxd-5.21.1/lxd-5.21.1.tar.gz" sha256 = "f148aa7e1fc31f6cef3038e141e9bd03787274ffc506b97376d758abf1a93cb7" + autoupdate.strategy = "latest_github_release" autoupdate.asset = "^lxd-.*.tar.gz$" + autoupdate.version_regex = "^lxd-(.*)$" [resources.system_user] From 4f164c4e13c319493c727b3ba5755685c8035b01 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 14 Jul 2024 03:38:48 +0200 Subject: [PATCH 3/4] Upgrade sources --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index a4cda5a..5eca6c4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -44,8 +44,8 @@ ram.runtime = "500M" armhf.sha256 = "837f4bf4e22fcdf920ffeaa4abf3d02d1314e03725431065f4d44c46a01b42fe" [resources.sources.main] - url = "https://github.com/canonical/lxd/releases/download/lxd-5.21.1/lxd-5.21.1.tar.gz" - sha256 = "f148aa7e1fc31f6cef3038e141e9bd03787274ffc506b97376d758abf1a93cb7" + url = "https://github.com/canonical/lxd/releases/download/lxd-6.1/lxd-6.1.tar.gz" + sha256 = "ef073f19b5e666f306232d7c086ec1f39bbc14672237f2fd7b65d259caead1b9" autoupdate.strategy = "latest_github_release" autoupdate.asset = "^lxd-.*.tar.gz$" From 0f37a2d7923dd34882aa7ef775374cd526275f58 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sun, 14 Jul 2024 20:27:22 +0200 Subject: [PATCH 4/4] fix build and version number --- manifest.toml | 2 +- scripts/install | 8 ++++---- scripts/upgrade | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) 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