Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework of buildsystem, part 1 #273

Merged
merged 2 commits into from
Apr 17, 2020
Merged

Rework of buildsystem, part 1 #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
461a1db
Revert "Dockerfile: Undo Buster pkgconfig fixes"
cerna Apr 15, 2020
7ae78a4
Use Cloudsmith.io as a dependency source for Machinekit-HAL Debian bu…
cerna Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/build_docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ RUN echo '${USER}:*:17967:0:99999:7:::' >> /etc/shadow
ENV UID=${UID_GID/:*/}
EOF
else
NEWTAG=${TAG}
NEWTAG=${TAG}
fi

###########################################################
Expand Down
3 changes: 2 additions & 1 deletion scripts/buildsystem/debian/multistrap-configs/bullseye.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ packages=netcat-openbsd
source=file:/tmp/debs ./

[machinekit]
source=http://deb.machinekit.io/debian
source=https://dl.cloudsmith.io/public/machinekit/machinekit/deb/debian
omitdebsrc=true
suite=bullseye

[debian]
Expand Down
5 changes: 3 additions & 2 deletions scripts/buildsystem/debian/multistrap-configs/buster.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ packages=netcat-openbsd
source=file:/tmp/debs ./

[machinekit]
source=http://deb.machinekit.io/debian
source=https://dl.cloudsmith.io/public/machinekit/machinekit/deb/debian
omitdebsrc=true
suite=buster

[debian]
Expand All @@ -34,4 +35,4 @@ suite=buster-updates

[security]
source=http://security.debian.org
suite=buster/updates
suite=buster/updates
3 changes: 2 additions & 1 deletion scripts/buildsystem/debian/multistrap-configs/jessie.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ packages=libxenomai-dev
source=file:/tmp/debs ./

[machinekit]
source=http://deb.machinekit.io/debian
source=https://dl.cloudsmith.io/public/machinekit/machinekit/deb/debian
omitdebsrc=true
suite=jessie

[debian]
Expand Down
3 changes: 2 additions & 1 deletion scripts/buildsystem/debian/multistrap-configs/stretch.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ packages=netcat-openbsd
source=file:/tmp/debs ./

[machinekit]
source=http://deb.machinekit.io/debian
source=https://dl.cloudsmith.io/public/machinekit/machinekit/deb/debian
omitdebsrc=true
suite=stretch

[debian]
Expand Down
18 changes: 14 additions & 4 deletions scripts/containers/buildsystem/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ RUN apt-get -y install \
debian-archive-keyring \
python-apt \
rubygems \
curl \
&& { \
test $DISTRO_VER -ge 10 \
|| apt-get install -y \
Expand Down Expand Up @@ -231,10 +232,11 @@ RUN if test $DISTRO_VER -eq 8; then \
###################################################################
# Machinekit: Configure apt

# add Machinekit package archive
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 31B5958F43DDF224
RUN echo "deb http://deb.machinekit.io/debian $DISTRO_CODENAME main" > \
/etc/apt/sources.list.d/machinekit.list
# add Machinekit dependencies package archive
RUN curl -1sLf \
'https://dl.cloudsmith.io/public/machinekit/machinekit/cfg/setup/bash.deb.sh' \
| sudo bash \
&& apt-get update

###################################################################
# Machinekit: Install dependency packages
Expand Down Expand Up @@ -367,6 +369,14 @@ RUN test -z "$SYS_ROOT" \
ln -sf /usr/include.build/x86_64-linux-gnu $SYS_ROOT/usr/include; \
}

# On Buster, fix krb5-dev .pc files in sysroot
RUN if test $DISTRO_VER -eq 10 -a -n "$SYS_ROOT"; then \
cd /sysroot/usr/lib/${HOST_MULTIARCH}/pkgconfig/mit-krb5 && \
for i in *; do \
rm ../$i \
&& ln -s mit-krb5/$i ../$i; \
done; \
fi
# On Buster, the libczmq.pc file requires libsystemd but the
# libczmq-dev package doesn't require libsystemd-dev; take care of
# native case (sysroot case taken care of in multistrap config)
Expand Down