From cd1117cc6cf3effd9ffaee7bde3316297b74444c Mon Sep 17 00:00:00 2001
From: Louis Maillard <louis.maillard@savoirfairelinux.com>
Date: Tue, 3 Sep 2024 13:42:35 -0400
Subject: [PATCH] packaging: replace `debs` folder by `artifacts`
In order to support new distribution not using .deb file format,
it should be better to call export folder `artifacts` instead of `debs`.
Change-Id: I21524fe535a4297851d87a66f2000a27efa565cc
---
extras/packaging/build_packages.sh | 2 +-
extras/packaging/gnu-linux/debian-10.Dockerfile | 4 ++--
extras/packaging/gnu-linux/debian-11.Dockerfile | 4 ++--
extras/packaging/gnu-linux/debian-12.Dockerfile | 4 ++--
extras/packaging/gnu-linux/ubuntu-20.Dockerfile | 4 ++--
extras/packaging/gnu-linux/ubuntu-22.Dockerfile | 4 ++--
extras/packaging/gnu-linux/ubuntu-24.Dockerfile | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/extras/packaging/build_packages.sh b/extras/packaging/build_packages.sh
index 9b44393..03f46f7 100755
--- a/extras/packaging/build_packages.sh
+++ b/extras/packaging/build_packages.sh
@@ -112,7 +112,7 @@ build_target() {
remainning_builds=$((remainning_builds+1))
(
docker run --rm \
- -v "$(pwd)/$target/":/build/debs \
+ -v "$(pwd)/$target/":/build/artifacts \
-e PKG_NAME="$FOLDER_NAME" "dhtnet-builder:$target" > "$target/build.log" 2>&1;
if [ $? -eq 0 ]; then
rm -f -- $target/build-at-*
diff --git a/extras/packaging/gnu-linux/debian-10.Dockerfile b/extras/packaging/gnu-linux/debian-10.Dockerfile
index 1f246e9..6a719a8 100644
--- a/extras/packaging/gnu-linux/debian-10.Dockerfile
+++ b/extras/packaging/gnu-linux/debian-10.Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && \
apt-get install -y \
dialog apt-utils make devscripts build-essential debmake lintian \
&& apt-get clean && \
- mkdir -p /build/debs
+ mkdir -p /build/artifacts
RUN apt-get update && apt-get install -y \
build-essential pkg-config cmake dpkg-dev gcc g++ git wget \
@@ -32,4 +32,4 @@ CMD tar -xzf ${PKG_NAME}.tar.gz && \
debuild && \
cd .. && \
rm -Rf ${PKG_NAME} ${PKG_NAME}.tar.gz && \
- cp /build/*.deb /build/debs/
+ cp /build/*.deb /build/artifacts/
diff --git a/extras/packaging/gnu-linux/debian-11.Dockerfile b/extras/packaging/gnu-linux/debian-11.Dockerfile
index 67fae01..fac72bb 100644
--- a/extras/packaging/gnu-linux/debian-11.Dockerfile
+++ b/extras/packaging/gnu-linux/debian-11.Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && \
apt-get install -y \
dialog apt-utils make devscripts build-essential debmake lintian \
&& apt-get clean && \
- mkdir -p /build/debs
+ mkdir -p /build/artifacts
RUN apt-get update && apt-get install -y \
build-essential pkg-config cmake dpkg-dev gcc g++ git wget \
@@ -32,4 +32,4 @@ CMD tar -xzf ${PKG_NAME}.tar.gz && \
debuild && \
cd .. && \
rm -Rf ${PKG_NAME} ${PKG_NAME}.tar.gz && \
- cp /build/*.deb /build/debs/
+ cp /build/*.deb /build/artifacts/
diff --git a/extras/packaging/gnu-linux/debian-12.Dockerfile b/extras/packaging/gnu-linux/debian-12.Dockerfile
index 1c359fc..011724f 100644
--- a/extras/packaging/gnu-linux/debian-12.Dockerfile
+++ b/extras/packaging/gnu-linux/debian-12.Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && \
apt-get install -y \
dialog apt-utils make devscripts build-essential debmake lintian \
&& apt-get clean && \
- mkdir -p /build/debs
+ mkdir -p /build/artifacts
RUN apt-get update && apt-get install -y \
build-essential pkg-config cmake dpkg-dev gcc g++ git wget \
@@ -32,4 +32,4 @@ CMD tar -xzf ${PKG_NAME}.tar.gz && \
debuild && \
cd .. && \
rm -Rf ${PKG_NAME} ${PKG_NAME}.tar.gz && \
- cp /build/*.deb /build/debs/
+ cp /build/*.deb /build/artifacts/
diff --git a/extras/packaging/gnu-linux/ubuntu-20.Dockerfile b/extras/packaging/gnu-linux/ubuntu-20.Dockerfile
index 1930e01..c3047e8 100644
--- a/extras/packaging/gnu-linux/ubuntu-20.Dockerfile
+++ b/extras/packaging/gnu-linux/ubuntu-20.Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && \
apt-get install -y \
dialog apt-utils make devscripts build-essential debmake lintian \
&& apt-get clean && \
- mkdir -p /build/debs
+ mkdir -p /build/artifacts
RUN apt-get update && apt-get install -y \
build-essential pkg-config cmake dpkg-dev gcc g++ git wget \
@@ -35,4 +35,4 @@ CMD tar -xzf ${PKG_NAME}.tar.gz && \
debuild && \
cd .. && \
rm -Rf ${PKG_NAME} ${PKG_NAME}.tar.gz && \
- cp /build/*.deb /build/debs/
+ cp /build/*.deb /build/artifacts/
diff --git a/extras/packaging/gnu-linux/ubuntu-22.Dockerfile b/extras/packaging/gnu-linux/ubuntu-22.Dockerfile
index eb1e5fe..0d82772 100644
--- a/extras/packaging/gnu-linux/ubuntu-22.Dockerfile
+++ b/extras/packaging/gnu-linux/ubuntu-22.Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && \
apt-get install -y \
dialog apt-utils make devscripts build-essential debmake lintian \
&& apt-get clean && \
- mkdir -p /build/debs
+ mkdir -p /build/artifacts
RUN apt-get update && apt-get install -y \
build-essential pkg-config cmake dpkg-dev gcc g++ git wget \
@@ -32,4 +32,4 @@ CMD tar -xzf ${PKG_NAME}.tar.gz && \
debuild && \
cd .. && \
rm -Rf ${PKG_NAME} ${PKG_NAME}.tar.gz && \
- cp /build/*.deb /build/debs/
+ cp /build/*.deb /build/artifacts/
diff --git a/extras/packaging/gnu-linux/ubuntu-24.Dockerfile b/extras/packaging/gnu-linux/ubuntu-24.Dockerfile
index 39c3c92..e7db0be 100644
--- a/extras/packaging/gnu-linux/ubuntu-24.Dockerfile
+++ b/extras/packaging/gnu-linux/ubuntu-24.Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && \
apt-get install -y \
dialog apt-utils make devscripts build-essential debmake lintian \
&& apt-get clean && \
- mkdir -p /build/debs
+ mkdir -p /build/artifacts
RUN apt-get update && apt-get install -y \
build-essential pkg-config cmake dpkg-dev gcc g++ git wget \
@@ -32,4 +32,4 @@ CMD tar -xzf ${PKG_NAME}.tar.gz && \
debuild && \
cd .. && \
rm -Rf ${PKG_NAME} ${PKG_NAME}.tar.gz && \
- cp /build/*.deb /build/debs/
+ cp /build/*.deb /build/artifacts/
--
GitLab