From 33bcc37a7d186276e567e5e74b3b017cdcb46e29 Mon Sep 17 00:00:00 2001
From: Andres Montano <andres.montano@tecnalia.com>
Date: Thu, 20 Mar 2025 18:49:03 +0100
Subject: [PATCH] Solve conflict on merge
---
dockerfiles/devenv.Dockerfile | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/dockerfiles/devenv.Dockerfile b/dockerfiles/devenv.Dockerfile
index cd5057e..7e9508b 100644
--- a/dockerfiles/devenv.Dockerfile
+++ b/dockerfiles/devenv.Dockerfile
@@ -180,7 +180,6 @@ RUN if [ "$DOCKER_IN_DOCKER" = "install" ]; \
ARG PEAK_DRIVER=none
RUN if [ "$PEAK_DRIVER" = "install" ]; \
then \
-<<<<<<< HEAD
apt-get update && apt-get install -y udev libpopt-dev linux-headers-$(uname -r) gcc-12\
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 \
&& update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 200 \
@@ -197,20 +196,6 @@ RUN if [ "$PEAK_DRIVER" = "install" ]; \
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /var/cache/apt/archives/*.deb \
&& rm -rf *; \
-=======
- apt-get update && apt-get install -y udev libpopt-dev linux-headers-$(uname -r) \
- && wget https://www.peak-system.com/fileadmin/media/linux/files/peak-linux-driver-8.20.0.tar.gz \
- && wget https://www.peak-system.com/produktcd/Develop/PC%20interfaces/Linux/PCAN-Basic_API_for_Linux/PCAN-Basic_Linux-4.10.0.4.tar.gz
- # && wget https://www.peak-system.com/quick/BasicLinux -O PCAN-Basic_Linux.tar.gz \
- && tar -xvf peak-linux-driver-8.20.0.tar.gz \
- && cd peak-linux-driver-8.20.0 \
- && make && make install || echo 'make failed but move forward'\
- && cd .. \
- && tar -xvf PCAN-Basic_Linux-4.10.0.4.tar.gz \
- && cd PCAN-Basic_Linux-4.10.0.4/libpcanbasic \
- && make && make install || echo 'make failed but move forward';\
- rm -rf /var/lib/apt/lists/*; \
->>>>>>> 9f234849a3bdb7d6f6cf0d3ec5de2786c9ab6815
fi
# Install conan for Kortex driver
--
GitLab