Skip to content
This repository was archived by the owner on Aug 8, 2024. It is now read-only.

Commit a27d925

Browse files
committed
Use "make package" in ubuntu/debian build containers
1 parent feb0340 commit a27d925

File tree

4 files changed

+22
-10
lines changed

4 files changed

+22
-10
lines changed

docker/debian-build/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ RUN apt-get update && \
5555
libasound2-dev alsa-utils vorbis-tools qtbase5-dev \
5656
qttools5-dev qttools5-dev-tools libopus-dev \
5757
librtlsdr-dev libjsoncpp-dev libcurl4-openssl-dev \
58-
libgpiod-dev libogg-dev curl sudo
58+
libgpiod-dev libogg-dev ladspa-sdk curl sudo
5959
#RUN apt-get -y install groff doxygen
6060

6161
ARG SOUNDS_VER="19.09.99.3"

docker/debian-build/build-svxlink.sh

+10-4
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,15 @@ cd
2828
[[ -d build ]] && rm -rf build
2929
mkdir build
3030
cd build
31-
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc \
31+
cmake -DCMAKE_INSTALL_PREFIX=/usr \
32+
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
3233
-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
33-
-DCMAKE_BUILD_TYPE=Release ../svxlink/src
34+
-DCPACK_GENERATOR=DEB \
35+
-DCMAKE_BUILD_TYPE=Release \
36+
../svxlink/src
3437
make -j$num_cores
35-
sudo make install
36-
sudo ldconfig
38+
rm -f *.deb
39+
make package
40+
sudo dpkg -i *.deb
41+
#sudo make install
42+
#sudo ldconfig

docker/ubuntu-build/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ RUN apt-get update && \
5656
libasound2-dev alsa-utils vorbis-tools qtbase5-dev \
5757
qttools5-dev qttools5-dev-tools libopus-dev \
5858
librtlsdr-dev libjsoncpp-dev libcurl4-openssl-dev \
59-
libgpiod-dev libogg-dev curl sudo
59+
libgpiod-dev libogg-dev ladspa-sdk curl sudo
6060
#RUN apt-get -y install groff doxygen
6161

6262
ARG SOUNDS_VER="19.09.99.3"

docker/ubuntu-build/build-svxlink.sh

+10-4
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,15 @@ cd
2828
[[ -d build ]] && rm -rf build
2929
mkdir build
3030
cd build
31-
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc \
31+
cmake -DCMAKE_INSTALL_PREFIX=/usr \
32+
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
3233
-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
33-
-DCMAKE_BUILD_TYPE=Release ../svxlink/src
34+
-DCPACK_GENERATOR=DEB \
35+
-DCMAKE_BUILD_TYPE=Release \
36+
../svxlink/src
3437
make -j$num_cores
35-
sudo make install
36-
sudo ldconfig
38+
rm -f *.deb
39+
make package
40+
sudo dpkg -i *.deb
41+
#sudo make install
42+
#sudo ldconfig

0 commit comments

Comments
 (0)