From b6b707711cd78fcedf2e9411cd5229fafb560909 Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Fri, 16 Aug 2019 00:08:27 +0200
Subject: [PATCH] [build] fix: cargo deb not found license
---
bin/dunitrust-server/Cargo.toml | 4 ++--
release/arch/linux-x64/build-lin-x64.sh | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/bin/dunitrust-server/Cargo.toml b/bin/dunitrust-server/Cargo.toml
index 13a96089..9b66a93c 100644
--- a/bin/dunitrust-server/Cargo.toml
+++ b/bin/dunitrust-server/Cargo.toml
@@ -31,7 +31,7 @@ ssl = ["durs-ws2p-v1-legacy/ssl"]
[package.metadata.deb]
maintainer = "librelois <contact@dunitrust.org>"
copyright = "2017-2019, AXIOM TEAM Association <contact@axiom-team.fr>"
-license-file = ["LICENSE", "4"]
+license-file = ["../../LICENSE", "4"]
depends = "$auto"
section = "misc"
priority = "optional"
@@ -44,7 +44,7 @@ features = ["ssl"]
[package.metadata.deb.variants.arm]
maintainer = "librelois <contact@dunitrust.org>"
copyright = "2017-2019, AXIOM TEAM Association <contact@axiom-team.fr>"
-license-file = ["LICENSE", "4"]
+license-file = ["../../LICENSE", "4"]
section = "misc"
priority = "optional"
assets = [
diff --git a/release/arch/linux-x64/build-lin-x64.sh b/release/arch/linux-x64/build-lin-x64.sh
index 85f2bd80..c6ecceac 100644
--- a/release/arch/linux-x64/build-lin-x64.sh
+++ b/release/arch/linux-x64/build-lin-x64.sh
@@ -58,8 +58,7 @@ build_extra_server() {
# Parameters:
# 1. Building type (either “desktop” or “server”).
build_deb_pack() {
- cd "${ROOT}/bin/dunitrust-${1}"
- cargo deb --output "${BIN}/duniter-rust-${1}-${DURS_TAG}-linux-x64.deb"
+ cargo deb --manifest-path "${ROOT}/bin/dunitrust-${1}/Cargo.toml" --output "${BIN}/dunitrust-server-${1}-${DURS_TAG}-linux-x64.deb"
create_desc "${BIN}/duniter-rust-${1}-${DURS_TAG}-linux-x64.deb" "${1}" "Linux (Ubuntu/Debian)"
}
--
GitLab