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/mga6 | |
| parent | 18cafac14a063cb54c8ed6afc64e87b929c957ee (diff) | |
| download | tde-packaging-5259ca7ff29406043491aa22851af6b7ce32a748.tar.gz tde-packaging-5259ca7ff29406043491aa22851af6b7ce32a748.zip | |
RPM: update build scripts
Diffstat (limited to 'redhat/docker/mga6')
| -rw-r--r-- | redhat/docker/mga6/Dockerfile.i686 | 5 | ||||
| -rw-r--r-- | redhat/docker/mga6/Dockerfile.x86_64 | 5 | ||||
| -rw-r--r-- | redhat/docker/mga6/packages.i686 | 2 | ||||
| -rw-r--r-- | redhat/docker/mga6/packages.x86_64 | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/redhat/docker/mga6/Dockerfile.i686 b/redhat/docker/mga6/Dockerfile.i686 index 798cb8c3d..02446d0ac 100644 --- a/redhat/docker/mga6/Dockerfile.i686 +++ b/redhat/docker/mga6/Dockerfile.i686 @@ -24,6 +24,9 @@ RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAUL # Fix poppler include causing FTBFS RUN sed -i "/usr/include/poppler/PDFDoc.h" -e "/^#define PDFDOC_H/ s|$|\n#define nullptr NULL|" +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + # Add non-root user to build packages RUN rm -rf /home/trinity RUN useradd -m -s /bin/bash -u 1000 trinity @@ -31,7 +34,7 @@ RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" # Configure user trinity USER trinity -ADD rpmmacros ${HOME}/.rpmmacros +ADD rpmmacros /home/trinity/.rpmmacros # Add rpmbuild repositories RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} diff --git a/redhat/docker/mga6/Dockerfile.x86_64 b/redhat/docker/mga6/Dockerfile.x86_64 index b1e552139..b656182ec 100644 --- a/redhat/docker/mga6/Dockerfile.x86_64 +++ b/redhat/docker/mga6/Dockerfile.x86_64 @@ -24,6 +24,9 @@ RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAUL # Fix poppler include causing FTBFS RUN sed -i "/usr/include/poppler/PDFDoc.h" -e "/^#define PDFDOC_H/ s|$|\n#define nullptr NULL|" +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + # Add non-root user to build packages RUN rm -rf /home/trinity RUN useradd -m -s /bin/bash -u 1000 trinity @@ -31,7 +34,7 @@ RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" # Configure user trinity USER trinity -ADD rpmmacros ${HOME}/.rpmmacros +ADD rpmmacros /home/trinity/.rpmmacros # Add rpmbuild repositories RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686 index bbf5987ed..61e69a9d6 100644 --- a/redhat/docker/mga6/packages.i686 +++ b/redhat/docker/mga6/packages.i686 @@ -99,7 +99,7 @@ libtiff-devel libtwolame-devel libudev-devel libusb1.0-devel -libutempter +libutempter0 libutempter-devel libv4l-devel libxaw-devel diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64 index 0af3e9a35..0e8e91ad2 100644 --- a/redhat/docker/mga6/packages.x86_64 +++ b/redhat/docker/mga6/packages.x86_64 @@ -99,7 +99,7 @@ lib64tiff-devel lib64twolame-devel lib64udev-devel lib64usb1.0-devel -lib64utempter +lib64utempter0 lib64utempter-devel lib64v4l-devel lib64xaw-devel |