diff options
| author | François Andriot <albator78@libertysurf.fr> | 2024-05-10 13:03:26 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2024-05-10 13:03:47 +0200 |
| commit | 79e9e064950acffc9b840cd8697884b9d8e4feb9 (patch) | |
| tree | 37756477c33f9e0a0a9821448bc8f3ca1b4c2c88 /redhat/docker/omv5000 | |
| parent | 61f83f1471dc6c855930195172131f6531b0f2a1 (diff) | |
| download | tde-packaging-79e9e064.tar.gz tde-packaging-79e9e064.zip | |
RPM: initial support for OMV cooker
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/docker/omv5000')
| -rw-r--r-- | redhat/docker/omv5000/Dockerfile.x86_64 | 12 | ||||
| -rw-r--r-- | redhat/docker/omv5000/packages | 1 |
2 files changed, 3 insertions, 10 deletions
diff --git a/redhat/docker/omv5000/Dockerfile.x86_64 b/redhat/docker/omv5000/Dockerfile.x86_64 index fa73aaa5b..37b186710 100644 --- a/redhat/docker/omv5000/Dockerfile.x86_64 +++ b/redhat/docker/omv5000/Dockerfile.x86_64 @@ -13,12 +13,6 @@ RUN set -x \ RUN set -x \ && chmod a+r /usr/libexec/utempter/utempter -# Prefer GCC over clang -#RUN set -x \ -# && ln -sfv ld.bfd /usr/bin/ld \ -# && ln -sfv g++ /usr/bin/c++ \ -# && ln -sfv gcc /usr/bin/cc - # Add non-root user to build packages RUN set -x \ && rm -rf /home/trinity \ @@ -37,8 +31,7 @@ RUN set -x \ RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-11.mga10.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/sword.spec -e "/pycache/d" \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --define "_unpackaged_files_terminate_build %nil" --nodeps \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm RUN set -x \ @@ -47,8 +40,7 @@ RUN set -x \ RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/rdiff-backup.spec -e "/pycache/d" \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec --define "_unpackaged_files_terminate_build %nil" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm RUN set -x \ diff --git a/redhat/docker/omv5000/packages b/redhat/docker/omv5000/packages index 8b9af8cff..47a126218 100644 --- a/redhat/docker/omv5000/packages +++ b/redhat/docker/omv5000/packages @@ -40,6 +40,7 @@ freetype-devel fribidi-devel gamin-devel gettext-devel +ghostscript glib2-devel glibc-i18ndata gmime-devel |