Skip to content

Commit 674eae4

Browse files
author
Murilo Marinho
committed
[debian] Created docker files to test, identified causes of #73 and modified debian/rules.
1 parent a898471 commit 674eae4

File tree

6 files changed

+68
-12
lines changed

6 files changed

+68
-12
lines changed

debian/rules

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,30 @@
22

33
BUILDDIR = build_dir
44

5-
# secondly called by launchpad
6-
build:
7-
mkdir $(BUILDDIR);
5+
# Apr 8, 2026. Added build-arch and build-indep for compliance with Ubuntu Resolute.
6+
build: build-indep build-arch
7+
# nothing to be done
8+
9+
build-indep:
10+
# nothing to be done
11+
12+
build-arch:
13+
mkdir -p $(BUILDDIR);
814
cd $(BUILDDIR); cmake -DCMAKE_CXX_FLAGS="-fdebug-prefix-map=$(shell pwd)/src/=/usr/src/dqrobotics/ -fdebug-prefix-map=$(shell pwd)/include/=/usr/include/" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=../debian/tmp/usr ..
9-
make -C $(BUILDDIR)
10-
#$(info ************ $(shell pwd) ************)
15+
make -C $(BUILDDIR)
1116

12-
# thirdly called by launchpad
1317
binary: binary-indep binary-arch
18+
# nothing to be done
1419

15-
binary-indep:
20+
binary-indep: build-indep
1621
# nothing to be done
1722

18-
binary-arch:
19-
mkdir -p $(BUILDDIR)
23+
binary-arch: build-arch
2024
cd $(BUILDDIR); cmake -P cmake_install.cmake
2125
mkdir -p debian/tmp/DEBIAN
2226
dpkg-gencontrol -plibdqrobotics
2327
dpkg --build debian/tmp ..
2428

25-
# firstly called by launchpad
2629
clean:
2730
rm -f build
2831
rm -rf $(BUILDDIR)
29-
30-
.PHONY: binary binary-arch binary-indep clean

docker/README.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Noble
2+
3+
```console
4+
cd ubuntu_24_04
5+
docker compose build --progress=plain
6+
```
7+
8+
## Remark
9+
10+
The following warning has been identified:
11+
12+
```console
13+
dpkg-buildpackage: warning: debian/rules must be updated to support the 'build-arch' and 'build-indep' targets (at least 'build-arch' seems to be missing)
14+
```
15+
16+
# Resolute
17+
18+
```console
19+
cd ubuntu_26_04
20+
docker compose build --progress=plain
21+
```

docker/ubuntu_24_04/Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM ubuntu:noble
2+
SHELL ["/bin/bash", "-c"]
3+
ENV BASH_ENV="/etc/bash_env"
4+
5+
# Update apt-get
6+
RUN apt-get update -q \
7+
&& apt-get upgrade -y
8+
9+
RUN apt-get install -y dpkg-dev libeigen3-dev cmake
10+
11+
COPY . /root/dqrobotics/cpp
12+
RUN cd /root/dqrobotics/cpp && dpkg-buildpackage --sanitize-env -us -uc -B -rfakeroot

docker/ubuntu_24_04/compose.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
services:
2+
dqrobotics:
3+
build:
4+
context: ../../
5+
dockerfile: docker/ubuntu_24_04/Dockerfile

docker/ubuntu_26_04/Dockerfile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FROM ubuntu:resolute
2+
SHELL ["/bin/bash", "-c"]
3+
ENV BASH_ENV="/etc/bash_env"
4+
5+
# Update apt-get
6+
RUN apt-get update -q \
7+
&& apt-get upgrade -y
8+
9+
RUN apt-get install -y dpkg-dev libeigen3-dev cmake
10+
11+
COPY . /root/dqrobotics/cpp
12+
RUN cd /root/dqrobotics/cpp && dpkg-buildpackage --sanitize-env -us -uc -B -rfakeroot

docker/ubuntu_26_04/compose.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
services:
2+
dqrobotics:
3+
build:
4+
context: ../../
5+
dockerfile: docker/ubuntu_26_04/Dockerfile

0 commit comments

Comments
 (0)