From f6c38f17281e5bad397bbd3eadae11ee1e7bd0b7 Mon Sep 17 00:00:00 2001 From: Ohisemega Date: Fri, 16 Aug 2024 14:42:04 +0100 Subject: [PATCH 1/2] Fix bug Added concatenation to the line "yum install /tmp/libusb-devel-1.rpm" --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 74b2f66..264000c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -49,7 +49,7 @@ RUN yum update -y && \ # install the required libusb developer library RUN curl -SL https://rpmfind.net/linux/opensuse/distribution/leap/15.5/repo/oss/x86_64/libusb-1_0-devel-1.0.24-150400.3.3.1.x86_64.rpm -o /tmp/libusb-devel-1.rpm && \ - yum install /tmp/libusb-devel-1.rpm + yum install /tmp/libusb-devel-1.rpm && \ rm /tmp/libusb-devel-1.rpm # full sudo rights inside the container From 2bd09a0823a8ea2c67738f0a52126971130357ac Mon Sep 17 00:00:00 2001 From: Ohisemega Date: Fri, 16 Aug 2024 17:36:22 +0100 Subject: [PATCH 2/2] Fix Build Failure Add command to remove libusbx which is a conflict dependency with libusb-1 Add command to install libnet and libnet-devel Add command to install EPICS modules compatible libusb-1 and libusb-devel-1 versions --- docker/Dockerfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 264000c..fb8c46d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -40,6 +40,8 @@ RUN yum update -y && \ sudo meld tk dejavu-sans-mono-fonts gnome-terminal xterm xmessage evince eog firefox java openldap-clients && \ # These packages are not found in the initial install so try again yum install -y zeromq-devel git2u meld && \ + #install libnet library for EPICS module builds + yum install -y libnet libnet-devel && \ # clean up caches yum clean all && \ # nasty hack to avoid overlay filesystem problems with --userns=keep-id @@ -47,9 +49,13 @@ RUN yum update -y && \ # https://github.com/containers/fuse-overlayfs/pull/381 rm -fr /var/lib/yum/yumdb/* -# install the required libusb developer library -RUN curl -SL https://rpmfind.net/linux/opensuse/distribution/leap/15.5/repo/oss/x86_64/libusb-1_0-devel-1.0.24-150400.3.3.1.x86_64.rpm -o /tmp/libusb-devel-1.rpm && \ - yum install /tmp/libusb-devel-1.rpm && \ +#install the required libusb developer library +RUN yum remove -y libusbx && \ + curl -SL http://rpmfind.net/linux/opensuse/distribution/leap/15.5/repo/oss/x86_64/libusb-1_0-0-1.0.24-150400.3.3.1.x86_64.rpm -o /tmp/libusb-1.rpm && \ + yum install -y /tmp/libusb-1.rpm && \ + rm /tmp/libusb-1.rpm && \ + curl -SL https://rpmfind.net/linux/opensuse/distribution/leap/15.5/repo/oss/x86_64/libusb-1_0-devel-1.0.24-150400.3.3.1.x86_64.rpm -o /tmp/libusb-devel-1.rpm && \ + yum install -y /tmp/libusb-devel-1.rpm && \ rm /tmp/libusb-devel-1.rpm # full sudo rights inside the container