From 461a1db128ea571192aadd4ed513e60667733713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Fi=C5=A1er?= Date: Wed, 15 Apr 2020 14:54:27 +0200 Subject: [PATCH 1/2] Revert "Dockerfile: Undo Buster pkgconfig fixes" This reverts commit 05bad16923fe56402c260e1d50ca8ec13585cc5f. --- scripts/containers/buildsystem/debian/Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/containers/buildsystem/debian/Dockerfile b/scripts/containers/buildsystem/debian/Dockerfile index d5169f1359..9b618b08d0 100644 --- a/scripts/containers/buildsystem/debian/Dockerfile +++ b/scripts/containers/buildsystem/debian/Dockerfile @@ -367,6 +367,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) From 7ae78a42609bed2bf1adc4dc2911feea4cccdf0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Fi=C5=A1er?= Date: Wed, 15 Apr 2020 15:05:10 +0200 Subject: [PATCH 2/2] Use Cloudsmith.io as a dependency source for Machinekit-HAL Debian builder/testing Docker images instead of MAH.PRIV.AT server --- scripts/build_docker | 2 +- .../debian/multistrap-configs/bullseye.conf | 3 ++- .../buildsystem/debian/multistrap-configs/buster.conf | 5 +++-- .../buildsystem/debian/multistrap-configs/jessie.conf | 3 ++- .../buildsystem/debian/multistrap-configs/stretch.conf | 3 ++- scripts/containers/buildsystem/debian/Dockerfile | 10 ++++++---- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/scripts/build_docker b/scripts/build_docker index 41561aed83..2af72ccf57 100755 --- a/scripts/build_docker +++ b/scripts/build_docker @@ -191,7 +191,7 @@ RUN echo '${USER}:*:17967:0:99999:7:::' >> /etc/shadow ENV UID=${UID_GID/:*/} EOF else - NEWTAG=${TAG} + NEWTAG=${TAG} fi ########################################################### diff --git a/scripts/buildsystem/debian/multistrap-configs/bullseye.conf b/scripts/buildsystem/debian/multistrap-configs/bullseye.conf index 1c6eb71ece..2af29839ce 100644 --- a/scripts/buildsystem/debian/multistrap-configs/bullseye.conf +++ b/scripts/buildsystem/debian/multistrap-configs/bullseye.conf @@ -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] diff --git a/scripts/buildsystem/debian/multistrap-configs/buster.conf b/scripts/buildsystem/debian/multistrap-configs/buster.conf index a9f0ea685c..16fa386634 100644 --- a/scripts/buildsystem/debian/multistrap-configs/buster.conf +++ b/scripts/buildsystem/debian/multistrap-configs/buster.conf @@ -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] @@ -34,4 +35,4 @@ suite=buster-updates [security] source=http://security.debian.org -suite=buster/updates \ No newline at end of file +suite=buster/updates diff --git a/scripts/buildsystem/debian/multistrap-configs/jessie.conf b/scripts/buildsystem/debian/multistrap-configs/jessie.conf index 8e17af2949..1ac3f0fd13 100644 --- a/scripts/buildsystem/debian/multistrap-configs/jessie.conf +++ b/scripts/buildsystem/debian/multistrap-configs/jessie.conf @@ -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] diff --git a/scripts/buildsystem/debian/multistrap-configs/stretch.conf b/scripts/buildsystem/debian/multistrap-configs/stretch.conf index 0582658493..824e7896a7 100644 --- a/scripts/buildsystem/debian/multistrap-configs/stretch.conf +++ b/scripts/buildsystem/debian/multistrap-configs/stretch.conf @@ -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] diff --git a/scripts/containers/buildsystem/debian/Dockerfile b/scripts/containers/buildsystem/debian/Dockerfile index 9b618b08d0..289027ddf9 100644 --- a/scripts/containers/buildsystem/debian/Dockerfile +++ b/scripts/containers/buildsystem/debian/Dockerfile @@ -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 \ @@ -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