summaryrefslogtreecommitdiffstats
path: root/redhat/docker
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2023-05-10 21:35:26 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2023-05-10 21:35:26 +0200
commit7919e63aaf97f638d59961ca54a87f975f9c436e (patch)
treef3aaa2c7f456aa2c66470049a206adb6433a18bb /redhat/docker
parent6783a326d4d2fe5d801183a16243d9f82489f26a (diff)
downloadtde-packaging-7919e63aaf97f638d59961ca54a87f975f9c436e.tar.gz
tde-packaging-7919e63aaf97f638d59961ca54a87f975f9c436e.zip
RPM: add build scripts for Mageia 9
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/docker')
-rwxr-xr-xredhat/docker/mageia.sh34
-rw-r--r--redhat/docker/mga9/Dockerfile.i6862
-rw-r--r--redhat/docker/mga9/Dockerfile.x86_6432
-rw-r--r--redhat/docker/mga9/packages.i6863
-rw-r--r--redhat/docker/mga9/packages.x86_646
-rw-r--r--redhat/docker/mga9/rpmmacros2
6 files changed, 55 insertions, 24 deletions
diff --git a/redhat/docker/mageia.sh b/redhat/docker/mageia.sh
new file mode 100755
index 000000000..e0a84588a
--- /dev/null
+++ b/redhat/docker/mageia.sh
@@ -0,0 +1,34 @@
+#!/bin/bash -e
+
+NAME="mageia"
+VERSION="${1:-9}" # E.g: '9'
+IMAGE="${NAME}:${VERSION}"
+INSTALLROOT="/dev/shm/${IMAGE}"
+ARCH="x86_64"
+
+sudo rm -rf "${INSTALLROOT}"
+sudo mkdir -p "${INSTALLROOT}"
+sudo dnf -y \
+ --disablerepo="*" \
+ --enablerepo="mageia-${ARCH},updates-${ARCH}" \
+ --installroot="${INSTALLROOT}" \
+ --releasever="${VERSION}" \
+ install \
+ \
+ bash \
+ mageia-release-common \
+ urpmi \
+ vim
+
+sudo chroot "${INSTALLROOT}" rpmdb --rebuilddb
+
+FILE="${IMAGE//\//_}.tar"
+sudo tar -C "${INSTALLROOT}" -c . >"${FILE}"
+sudo rm -rf "${INSTALLROOT}"
+
+docker rmi -f "${IMAGE}"
+docker import "${FILE}" "${IMAGE}"
+
+pigz "${FILE}"
+mkdir -p "${HOME}/tde/docker"
+mv -fv "${FILE}.gz" "${HOME}/tde/docker"
diff --git a/redhat/docker/mga9/Dockerfile.i686 b/redhat/docker/mga9/Dockerfile.i686
index 46d2810d9..f465d0914 100644
--- a/redhat/docker/mga9/Dockerfile.i686
+++ b/redhat/docker/mga9/Dockerfile.i686
@@ -1,6 +1,6 @@
FROM mageia32:8
-ARG TDE_VERSION=14.0.13
+ARG TDE_VERSION=14.1.0
ARG ARCH=i686
# Reset URPMI repositories to default
diff --git a/redhat/docker/mga9/Dockerfile.x86_64 b/redhat/docker/mga9/Dockerfile.x86_64
index 9d4ef301e..49053893b 100644
--- a/redhat/docker/mga9/Dockerfile.x86_64
+++ b/redhat/docker/mga9/Dockerfile.x86_64
@@ -1,38 +1,36 @@
FROM mageia:9
-ARG TDE_VERSION=14.0.13
+ARG TDE_VERSION=14.1.0
ARG ARCH=x86_64
# Reset URPMI repositories to default
# Enable more URPMI repositories
-RUN urpmi.removemedia -a \
- && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/x86_64/ \
- && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}"
-
# Enable english locales
-RUN urpmi --replacepkgs glibc \
- && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || :
-
# Update distribution
# Install Trinity build dependencies
COPY packages.${ARCH} /packages
-RUN urpmi.update -a \
+RUN set -x \
+ && urpmi.removemedia -a \
+ && urpmi.addmedia --distrib http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/x86_64/ \
+ && sed -i "/etc/urpmi/urpmi.cfg" -e "/Tainted\\\ Release {/{p;N;d}" -e "/Tainted\\\ Updates {/{p;N;d}" \
+ && urpmi.update -a \
+ && urpmi --replacepkgs glibc \
+ && localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || : \
&& urpmi --auto-select --auto \
&& urpmi --auto $(</packages)
# Enable ccache
-RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|"
-
# Fix utempter detection
-RUN chmod a+r /usr/libexec/utempter/utempter
-
# Fix poppler support
-RUN sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|"
+RUN sed -i "/etc/sysconfig/ccache" -e "s|USE_CCACHE_DEFAULT=.*|USE_CCACHE_DEFAULT=\"yes\"|" \
+ && chmod a+r /usr/libexec/utempter/utempter \
+ && sed -i "/usr/include/poppler/poppler-config.h" -e "/define HAVE_SPLASH/ s|^|//|"
# Add non-root user to build packages
RUN rm -rf /home/trinity \
&& useradd -m -s /bin/bash -u 1000 trinity \
- && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
# Configure user trinity
USER trinity
@@ -47,5 +45,5 @@ RUN mkdir -p ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \
&& sudo urpmi.addmedia rpmbuild.noarch ${HOME}/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
# Build development packages that are missing
-RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/release/perl-PAR-Packer-1.51.0-2.mga8.src.rpm \
- && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
+#RUN setarch ${ARCH} rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-Packer-1.57.0-1.mga9.src.rpm \
+# && sudo rpm -Uvh --force "${HOME}/rpmbuild/RPMS/"*"/perl-PAR-Packer-"*".rpm"
diff --git a/redhat/docker/mga9/packages.i686 b/redhat/docker/mga9/packages.i686
index a39a701af..c44677fa0 100644
--- a/redhat/docker/mga9/packages.i686
+++ b/redhat/docker/mga9/packages.i686
@@ -218,8 +218,7 @@ polkit-devel
postgresql13
postgresql13-devel
ppp
-python-devel
-python-sip
+python3-devel
qt4-devel
readline-devel
recode
diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64
index 998e0c682..324364b40 100644
--- a/redhat/docker/mga9/packages.x86_64
+++ b/redhat/docker/mga9/packages.x86_64
@@ -69,7 +69,6 @@ karma-sharp
kde-dev-scripts
lib64apr-devel
lib64apr-util-devel
-lib64avformat58
lib64binutils-devel
lib64boost_python3-devel
lib64cln-devel
@@ -96,6 +95,7 @@ lib64jpeg-devel
lib64lua-devel
lib64mad-devel
lib64mp3lame-devel
+lib64musicbrainz5-devel
lib64npth-devel
lib64paper-devel
lib64pkcs11-helper-devel
@@ -150,7 +150,6 @@ libmng-devel
libmp4v2-devel
libmpcdec-devel
libmtp-devel
-libmusicbrainz-devel
libnjb-devel
libofx-devel
libotr-devel
@@ -221,8 +220,7 @@ polkit-devel
postgresql13
postgresql13-devel
ppp
-python-devel
-python-sip
+python3-devel
qt4-devel
readline-devel
recode
diff --git a/redhat/docker/mga9/rpmmacros b/redhat/docker/mga9/rpmmacros
index 2bc3bb37f..a92be537d 100644
--- a/redhat/docker/mga9/rpmmacros
+++ b/redhat/docker/mga9/rpmmacros
@@ -1,5 +1,7 @@
+%dist .mga9
%_smp_mflags -j8
%jobs 8
+%__brp_remove_la_files %nil
%_program_prefix ""
%_debugsource_packages %nil
%_debugsource_template %nil