diff options
| author | François Andriot <albator78@libertysurf.fr> | 2019-11-08 20:47:18 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2019-11-19 15:07:31 +0100 |
| commit | 5259ca7ff29406043491aa22851af6b7ce32a748 (patch) | |
| tree | 7d79564eb7d916fd0defb8c7bbfb065e56a58978 /redhat/docker/pclinuxos/Dockerfile.x86_64 | |
| parent | 18cafac14a063cb54c8ed6afc64e87b929c957ee (diff) | |
| download | tde-packaging-5259ca7ff29406043491aa22851af6b7ce32a748.tar.gz tde-packaging-5259ca7ff29406043491aa22851af6b7ce32a748.zip | |
RPM: update build scripts
Diffstat (limited to 'redhat/docker/pclinuxos/Dockerfile.x86_64')
| -rw-r--r-- | redhat/docker/pclinuxos/Dockerfile.x86_64 | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index d9701cae7..a449dca81 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -16,15 +16,12 @@ RUN apt-get -y install $(</packages) ADD rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list RUN sed -i "/etc/apt/sources.list.d/rpmbuild.list" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" -# Add non-root user to build packages -RUN rm -rf /home/trinity -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers -ADD rpmmacros /home/trinity/.rpmmacros - # Fix SUDO configuration RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|" +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + # Fix missing '.la' files ADD genla.sh /usr/bin/genla.sh RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 @@ -32,7 +29,20 @@ RUN genla.sh libjpeg RUN genla.sh liblcms RUN 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 +RUN useradd -m -s /bin/bash -u 1000 trinity +RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" + +USER trinity +ADD rpmmacros /home/trinity/.rpmmacros + # Build supplementary development tools -RUN rpm -i --define "_topdir /tmp" http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm RUN sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" -RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/torsocks-2*.rpm +RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec +RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/torsocks-2*.rpm + +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm +RUN sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|" +RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm |