Skip to content

Commit

Permalink
packaging: replace debs folder by artifacts
Browse files Browse the repository at this point in the history
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
  • Loading branch information
loulou123546 committed Sep 30, 2024
1 parent 1aaaa96 commit cd1117c
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion extras/packaging/build_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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-*
Expand Down
4 changes: 2 additions & 2 deletions extras/packaging/gnu-linux/debian-10.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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/
4 changes: 2 additions & 2 deletions extras/packaging/gnu-linux/debian-11.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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/
4 changes: 2 additions & 2 deletions extras/packaging/gnu-linux/debian-12.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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/
4 changes: 2 additions & 2 deletions extras/packaging/gnu-linux/ubuntu-20.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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/
4 changes: 2 additions & 2 deletions extras/packaging/gnu-linux/ubuntu-22.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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/
4 changes: 2 additions & 2 deletions extras/packaging/gnu-linux/ubuntu-24.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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/

0 comments on commit cd1117c

Please sign in to comment.