diff options
| author | François Andriot <albator78@libertysurf.fr> | 2024-04-17 19:16:43 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2024-04-17 19:17:09 +0200 |
| commit | c34960529cde4e1c5721191d897761f059c35748 (patch) | |
| tree | 0eca82c4e0c7c5a53931a62ae8718d3f6d8b2914 /redhat/docker/pclinuxos | |
| parent | 4682d07bdc78302d8eb5caf4d6aea5381c1c1df5 (diff) | |
| download | tde-packaging-c34960529cde4e1c5721191d897761f059c35748.tar.gz tde-packaging-c34960529cde4e1c5721191d897761f059c35748.zip | |
RPM: lots of updates for Trinity 14.1.2
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/docker/pclinuxos')
| -rw-r--r-- | redhat/docker/pclinuxos/Dockerfile.x86_64 | 5 | ||||
| -rw-r--r-- | redhat/docker/pclinuxos/rpmmacros | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index 10bb88882..8c5e5dc91 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,4 +1,4 @@ -FROM pclinuxos:2023 +FROM pclinuxos:2024 ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 @@ -26,8 +26,7 @@ COPY genla.sh /usr/bin/genla.sh RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \ && genla.sh libjpeg \ && genla.sh liblcms \ - && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la \ - && ln -sf /usr/lib64/libglvnd/libGL.so /usr/lib64/libGL.so + && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la # Add non-root user to build packages RUN rm -rf /home/trinity \ diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros index a8b78eb0d..5c9fcc2e4 100644 --- a/redhat/docker/pclinuxos/rpmmacros +++ b/redhat/docker/pclinuxos/rpmmacros @@ -3,3 +3,5 @@ %jobs 8 %pclinuxos 2022 %configure %configure2_5x +%python python3 +%__python /usr/bin/python3 |