diff --git a/packaging/deps.sh b/packaging/deps.sh index c0de77f3b..832bfcf2f 100644 --- a/packaging/deps.sh +++ b/packaging/deps.sh @@ -118,12 +118,12 @@ fi # Build & Install EtherLab if [ -z "${SKIP_ETHERLAB}" ]; then - hg clone --branch stable-1.5 http://hg.code.sf.net/p/etherlabmaster/code etherlab - pushd etherlab + git clone --branch stable-1.5 --depth 1 https://gitlab.com/etherlab.org/ethercat.git + pushd ethercat ./bootstrap ./configure --enable-userlib=yes --enable-kernel=no ${CONFIGURE_OPTS} if [ -z "${PACKAGE}" ]; then - make ${MAKE_OPTS} install + make ${MAKE_OPTS} ${TARGET} else wget https://etherlab.org/download/ethercat/ethercat-1.5.2.tar.bz2 cp ethercat-1.5.2.tar.bz2 ~/rpmbuild/SOURCES @@ -182,7 +182,7 @@ if ! pkg-config "libuldaq >= 1.2.0" && \ make ${MAKE_OPTS} install else make dist - cp fedora/uldaq_ldconfig.patch libuldaq-1.1.2.tar.gz ~/rpmbuild/SOURCES + cp fedora/uldaq_ldconfig.patch libuldaq-1.2.0.tar.gz ~/rpmbuild/SOURCES rpmbuild -ba fedora/uldaq.spec fi popd diff --git a/packaging/docker/Dockerfile.alpine b/packaging/docker/Dockerfile.alpine index 64e86c154..4c6c44456 100644 --- a/packaging/docker/Dockerfile.alpine +++ b/packaging/docker/Dockerfile.alpine @@ -34,7 +34,7 @@ RUN apk update && \ apk add gcc g++ \ pkgconf cmake make \ autoconf automake libtool \ - git mercurial \ + git \ flex bison \ protobuf \ file diff --git a/packaging/docker/Dockerfile.centos b/packaging/docker/Dockerfile.centos index bc03cfb89..2d1d23116 100644 --- a/packaging/docker/Dockerfile.centos +++ b/packaging/docker/Dockerfile.centos @@ -39,7 +39,7 @@ RUN dnf -y install \ pkgconfig cmake make \ autoconf automake autogen libtool \ flex bison \ - texinfo git mercurial curl tar \ + texinfo git curl tar \ protobuf-compiler protobuf-c-compiler # Dependencies diff --git a/packaging/docker/Dockerfile.debian b/packaging/docker/Dockerfile.debian index f6769d99b..85bd16ae8 100644 --- a/packaging/docker/Dockerfile.debian +++ b/packaging/docker/Dockerfile.debian @@ -36,7 +36,7 @@ RUN apt-get update && \ gcc g++ \ pkg-config cmake make \ autoconf automake autogen libtool \ - texinfo git mercurial curl tar wget diffutils \ + texinfo git curl tar wget diffutils \ flex bison \ protobuf-compiler protobuf-c-compiler diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch index 23f1d4a14..88b8db108 100644 --- a/packaging/docker/Dockerfile.debian-multiarch +++ b/packaging/docker/Dockerfile.debian-multiarch @@ -42,7 +42,7 @@ RUN apt-get update && \ crossbuild-essential-${ARCH} \ pkg-config make \ autoconf automake autogen libtool \ - texinfo git mercurial curl tar wget diffutils \ + texinfo git curl tar wget diffutils \ flex bison \ protobuf-compiler protobuf-c-compiler diff --git a/packaging/docker/Dockerfile.fedora b/packaging/docker/Dockerfile.fedora index d4bfa105e..1121b2a0e 100644 --- a/packaging/docker/Dockerfile.fedora +++ b/packaging/docker/Dockerfile.fedora @@ -32,7 +32,7 @@ RUN dnf -y install \ gcc gcc-c++ \ pkgconfig cmake make \ autoconf automake autogen libtool \ - texinfo git mercurial curl tar \ + texinfo git curl tar \ flex bison \ protobuf-compiler protobuf-c-compiler diff --git a/packaging/docker/Dockerfile.ubuntu b/packaging/docker/Dockerfile.ubuntu index 8e4526e0c..3c7fc1f07 100644 --- a/packaging/docker/Dockerfile.ubuntu +++ b/packaging/docker/Dockerfile.ubuntu @@ -36,7 +36,7 @@ RUN apt-get update && \ gcc g++ \ pkg-config cmake make \ autoconf automake autogen libtool \ - texinfo git mercurial curl tar wget diffutils \ + texinfo git curl tar wget diffutils \ flex bison \ protobuf-compiler protobuf-c-compiler