Skip to content

Commit

Permalink
packaging: add ubuntu 24.10 build
Browse files Browse the repository at this point in the history
Building dhtnet for ubuntu 24.10 require the addition of libzstd for
compilation to work (linker require it).

Change-Id: I2168a84ee9fde3dc21925f000d5f136ef76fb207
  • Loading branch information
loulou123546 committed Oct 24, 2024
1 parent 9edce5f commit ea0ddeb
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 2 deletions.
2 changes: 1 addition & 1 deletion extras/packaging/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ pipeline {
axes {
axis {
name 'TARGET'
values 'ubuntu_22.04', 'ubuntu_24.04', 'debian_12', 'fedora_39', 'fedora_40'/*, 'almalinux_9'*/
values 'ubuntu_22.04', 'ubuntu_24.04', 'ubuntu_24.10', 'debian_12', 'fedora_39', 'fedora_40'/*, 'almalinux_9'*/
}
}
stages {
Expand Down
15 changes: 14 additions & 1 deletion extras/packaging/build_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ build_ubuntu=false
build_ubuntu20_04=false
build_ubuntu22_04=false
build_ubuntu24_04=false
build_ubuntu24_10=false
build_debian=false
build_debian10=false
build_debian11=false
Expand All @@ -46,7 +47,14 @@ parse_args() {
-u22 | -u22.04 | --ubuntu22.04 ) build_ubuntu22_04=true
build_ubuntu=true
;;
-u24 | -u24.04 | --ubuntu24.04 ) build_ubuntu24_04=true
-u24.04 | --ubuntu24.04 ) build_ubuntu24_04=true
build_ubuntu=true
;;
-u24.10 | --ubuntu24.10 ) build_ubuntu24_10=true
build_ubuntu=true
;;
-u24 ) build_ubuntu24_04=true
build_ubuntu24_10=true
build_ubuntu=true
;;
-d | --debian ) build_debian=true
Expand Down Expand Up @@ -77,6 +85,7 @@ parse_args() {
# not working: build_ubuntu20=true
build_ubuntu22_04=true
build_ubuntu24_04=true
build_ubuntu24_10=true
build_debian=true
# not working: build_debian10=true
# not working: build_debian11=true
Expand Down Expand Up @@ -148,6 +157,10 @@ build_target() {
}

# build Ubuntu package (deb-*)
if [ "$build_ubuntu24_10" == true ]; then
build_target "ubuntu_24.10"
fi

if [ "$build_ubuntu24_04" == true ]; then
build_target "ubuntu_24.04"
fi
Expand Down
35 changes: 35 additions & 0 deletions extras/packaging/gnu-linux/ubuntu_24.10.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
FROM ubuntu:24.10

WORKDIR /build

ENV EMAIL="[email protected]"
ENV DEBFULLNAME="Savoir-faire Linux"

RUN apt-get update && \
echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \
apt-get install -y \
dialog apt-utils make devscripts build-essential debmake lintian \
&& apt-get clean && \
mkdir -p /build/artifacts

RUN apt-get update && apt-get install -y \
build-essential pkg-config cmake dpkg-dev gcc g++ git wget \
libtool autotools-dev autoconf automake sbuild autopkgtest debhelper debhelper-compat \
cython3 python3-dev python3-setuptools python3-build python3-virtualenv \
libncurses5-dev libreadline-dev nettle-dev libcppunit-dev \
libgnutls28-dev libuv1-dev libjsoncpp-dev libargon2-dev libunistring-dev \
libssl-dev libfmt-dev libasio-dev libmsgpack-dev libyaml-cpp-dev \
libupnp-dev libnatpmp-dev \
systemd libzstd-dev\
&& apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/*

ARG PKG_NAME
COPY deb-${PKG_NAME}.tar.gz /build/${PKG_NAME}.tar.gz

CMD tar -xzf ${PKG_NAME}.tar.gz && \
cd ${PKG_NAME} && \
debmake -b "dhtnet:bin" -y && \
debuild && \
cd .. && \
rm -Rf ${PKG_NAME} ${PKG_NAME}.tar.gz && \
cp /build/*.deb /build/artifacts/

0 comments on commit ea0ddeb

Please sign in to comment.