Skip to content
Snippets Groups Projects
Unverified Commit 6d0caec2 authored by Amin Bandali's avatar Amin Bandali Committed by Maxim Cournoyer
Browse files

debian: build and package client-qt 

Also remove unused DEBIAN_PACKAGING_OVERRIDE.

Change-Id: Ida109a811bebd1fb46fd1a8b90fb5463518382c0
parent 019583c0
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 436 additions and 571 deletions
docker/Dockerfile_debian_10
+ 28
− 58
View file @ 6d0caec2
FROM debian:buster FROM debian:buster
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get clean RUN apt-get clean
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y vim devscripts apt-get install -y -o Acquire::Retries=10 \
ca-certificates \
devscripts \
dirmngr \
gnupg \
wget
# Speed up mk-build-deps RUN wget -O - https://dl.jami.net/public-key.gpg | \
RUN apt-get clean tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
RUN apt-get update && \ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/debian_10_qt/ jami main' > /etc/apt/sources.list.d/libqt-jami.list"
apt-get install -y -o Acquire::Retires=10 \
git \ # add deb-src entries (needed for next step)
autoconf \ RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
automake \ RUN apt-get clean && apt-get update
autopoint \
cmake \ COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
nasm \ RUN cd /tmp/builddeps/debian; \
libtool \ if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
libdbus-1-dev \ mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
libdbus-c++-dev \ rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
libargon2-0-dev \ fi; \
libcanberra-gtk3-dev \ cd ..; \
libclutter-gtk-1.0-dev \ apt-get update; \
libclutter-1.0-dev \ mk-build-deps \
libglib2.0-dev \ --remove --install \
libgtk-3-dev \ --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
libnotify-dev \ "debian/control"; \
qtbase5-dev \ cd / && rm -rf /tmp/builddeps
qttools5-dev \
qttools5-dev-tools \
yasm \
autotools-dev \
gettext \
libpulse-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
libyaml-cpp-dev \
libboost-dev \
libxext-dev \
libxfixes-dev \
libspeex-dev \
libspeexdsp-dev \
uuid-dev \
libavcodec-dev \
libavutil-dev \
libavformat-dev \
libswscale-dev \
libavdevice-dev \
libopus-dev \
libudev-dev \
libgsm1-dev \
libjsoncpp-dev \
libmsgpack-dev \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
libvdpau-dev \
libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
docker/Dockerfile_debian_10_arm64
+ 28
− 58
View file @ 6d0caec2
FROM arm64v8/debian:buster FROM arm64v8/debian:buster
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get clean RUN apt-get clean
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y vim devscripts apt-get install -y -o Acquire::Retries=10 \
ca-certificates \
devscripts \
dirmngr \
gnupg \
wget
# Speed up mk-build-deps RUN wget -O - https://dl.jami.net/public-key.gpg | \
RUN apt-get clean tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
RUN apt-get update && \ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/debian_10_qt/ jami main' > /etc/apt/sources.list.d/libqt-jami.list"
apt-get install -y -o Acquire::Retires=10 \
git \ # add deb-src entries (needed for next step)
autoconf \ RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
automake \ RUN apt-get clean && apt-get update
autopoint \
cmake \ COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
nasm \ RUN cd /tmp/builddeps/debian; \
libtool \ if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
libdbus-1-dev \ mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
libdbus-c++-dev \ rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
libargon2-0-dev \ fi; \
libcanberra-gtk3-dev \ cd ..; \
libclutter-gtk-1.0-dev \ apt-get update; \
libclutter-1.0-dev \ mk-build-deps \
libglib2.0-dev \ --remove --install \
libgtk-3-dev \ --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
libnotify-dev \ "debian/control"; \
qtbase5-dev \ cd / && rm -rf /tmp/builddeps
qttools5-dev \
qttools5-dev-tools \
yasm \
autotools-dev \
gettext \
libpulse-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
libyaml-cpp-dev \
libboost-dev \
libxext-dev \
libxfixes-dev \
libspeex-dev \
libspeexdsp-dev \
uuid-dev \
libavcodec-dev \
libavutil-dev \
libavformat-dev \
libswscale-dev \
libavdevice-dev \
libopus-dev \
libudev-dev \
libgsm1-dev \
libjsoncpp-dev \
libmsgpack-dev \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
libvdpau-dev \
libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
docker/Dockerfile_debian_10_armhf
+ 28
− 58
View file @ 6d0caec2
FROM arm32v7/debian:buster FROM arm32v7/debian:buster
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get clean RUN apt-get clean
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y vim devscripts apt-get install -y -o Acquire::Retries=10 \
ca-certificates \
devscripts \
dirmngr \
gnupg \
wget
# Speed up mk-build-deps RUN wget -O - https://dl.jami.net/public-key.gpg | \
RUN apt-get clean tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
RUN apt-get update && \ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/debian_10_qt/ jami main' > /etc/apt/sources.list.d/libqt-jami.list"
apt-get install -y -o Acquire::Retires=10 \
git \ # add deb-src entries (needed for next step)
autoconf \ RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
automake \ RUN apt-get clean && apt-get update
autopoint \
cmake \ COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
nasm \ RUN cd /tmp/builddeps/debian; \
libtool \ if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
libdbus-1-dev \ mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
libdbus-c++-dev \ rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
libargon2-0-dev \ fi; \
libcanberra-gtk3-dev \ cd ..; \
libclutter-gtk-1.0-dev \ apt-get update; \
libclutter-1.0-dev \ mk-build-deps \
libglib2.0-dev \ --remove --install \
libgtk-3-dev \ --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
libnotify-dev \ "debian/control"; \
qtbase5-dev \ cd / && rm -rf /tmp/builddeps
qttools5-dev \
qttools5-dev-tools \
yasm \
autotools-dev \
gettext \
libpulse-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
libyaml-cpp-dev \
libboost-dev \
libxext-dev \
libxfixes-dev \
libspeex-dev \
libspeexdsp-dev \
uuid-dev \
libavcodec-dev \
libavutil-dev \
libavformat-dev \
libswscale-dev \
libavdevice-dev \
libopus-dev \
libudev-dev \
libgsm1-dev \
libjsoncpp-dev \
libmsgpack-dev \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
libvdpau-dev \
libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
docker/Dockerfile_debian_10_i386
+ 28
− 58
View file @ 6d0caec2
FROM i386/debian:buster FROM i386/debian:buster
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get clean RUN apt-get clean
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y vim devscripts apt-get install -y -o Acquire::Retries=10 \
ca-certificates \
devscripts \
dirmngr \
gnupg \
wget
# Speed up mk-build-deps RUN wget -O - https://dl.jami.net/public-key.gpg | \
RUN apt-get clean tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
RUN apt-get update && \ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/debian_10_qt/ jami main' > /etc/apt/sources.list.d/libqt-jami.list"
apt-get install -y -o Acquire::Retires=10 \
git \ # add deb-src entries (needed for next step)
autoconf \ RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
automake \ RUN apt-get clean && apt-get update
autopoint \
cmake \ COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
nasm \ RUN cd /tmp/builddeps/debian; \
libtool \ if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
libdbus-1-dev \ mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
libdbus-c++-dev \ rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
libargon2-0-dev \ fi; \
libcanberra-gtk3-dev \ cd ..; \
libclutter-gtk-1.0-dev \ apt-get update; \
libclutter-1.0-dev \ mk-build-deps \
libglib2.0-dev \ --remove --install \
libgtk-3-dev \ --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
libnotify-dev \ "debian/control"; \
qtbase5-dev \ cd / && rm -rf /tmp/builddeps
qttools5-dev \
qttools5-dev-tools \
yasm \
autotools-dev \
gettext \
libpulse-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
libyaml-cpp-dev \
libboost-dev \
libxext-dev \
libxfixes-dev \
libspeex-dev \
libspeexdsp-dev \
uuid-dev \
libavcodec-dev \
libavutil-dev \
libavformat-dev \
libswscale-dev \
libavdevice-dev \
libopus-dev \
libudev-dev \
libgsm1-dev \
libjsoncpp-dev \
libmsgpack-dev \
libnatpmp-dev \
libappindicator3-dev \
libqrencode-dev \
libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
libvdpau-dev \
libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
docker/Dockerfile_ubuntu_18.04
+ 30
− 65
View file @ 6d0caec2
FROM ubuntu:18.04 FROM ubuntu:18.04
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get clean
RUN apt-get update && \
apt-get install -y devscripts equivs
# Speed up mk-build-deps
RUN apt-get clean RUN apt-get clean
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y -o Acquire::Retries=10 \ apt-get install -y -o Acquire::Retries=10 \
g++-8 \ ca-certificates \
devscripts \
dirmngr \
equivs \
gcc-8 \ gcc-8 \
cpp-8 \ g++-8 \
file \ gnupg \
make \ wget
libc6-dev \
libstdc++-8-dev \ RUN wget -O - https://dl.jami.net/public-key.gpg | \
git \ tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
autoconf \ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/ubuntu_18.04_qt/ jami main' > /etc/apt/sources.list.d/libqt-jami.list"
automake \
autopoint \ # add deb-src entries (needed for next step)
cmake \ RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
libdbus-1-dev \ RUN apt-get clean && apt-get update
libdbus-c++-dev \
libgnutls28-dev \ COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
libargon2-0-dev \ RUN cd /tmp/builddeps/debian; \
libcanberra-gtk3-dev \ if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
libclutter-gtk-1.0-dev \ mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
libclutter-1.0-dev \ rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
libglib2.0-dev \ fi; \
libgtk-3-dev \ cd ..; \
libnotify-dev \ apt-get update; \
qtbase5-dev \ mk-build-deps \
qttools5-dev \ --remove --install \
qttools5-dev-tools \ --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
yasm \ "debian/control"; \
nasm \ cd / && rm -rf /tmp/builddeps
autotools-dev \
gettext \
libpulse-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
libyaml-cpp-dev \
libboost-dev \
libxext-dev \
libxfixes-dev \
libspeex-dev \
libspeexdsp-dev \
uuid-dev \
libavcodec-dev \
libavutil-dev \
libavformat-dev \
libswscale-dev \
libavdevice-dev \
libopus-dev \
libudev-dev \
libgsm1-dev \
libjsoncpp-dev \
libmsgpack-dev \
libnatpmp-dev \
libayatana-appindicator3-dev \
libqrencode-dev \
libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
libvdpau-dev \
libssl-dev \
libsndfile1-dev
RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 50 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 50
......
docker/Dockerfile_ubuntu_18.04_i386
+ 30
− 65
View file @ 6d0caec2
FROM i386/ubuntu:18.04 FROM i386/ubuntu:18.04
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get clean
RUN apt-get update && \
apt-get install -y devscripts equivs
# Speed up mk-build-deps
RUN apt-get clean RUN apt-get clean
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y -o Acquire::Retries=10 \ apt-get install -y -o Acquire::Retries=10 \
g++-8 \ ca-certificates \
devscripts \
dirmngr \
equivs \
gcc-8 \ gcc-8 \
cpp-8 \ g++-8 \
file \ gnupg \
make \ wget
libc6-dev \
libstdc++-8-dev \ RUN wget -O - https://dl.jami.net/public-key.gpg | \
git \ tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
autoconf \ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/ubuntu_18.04_qt/ jami main' > /etc/apt/sources.list.d/libqt-jami.list"
automake \
autopoint \ # add deb-src entries (needed for next step)
cmake \ RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
libdbus-1-dev \ RUN apt-get clean && apt-get update
libdbus-c++-dev \
libgnutls28-dev \ COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
libargon2-0-dev \ RUN cd /tmp/builddeps/debian; \
libcanberra-gtk3-dev \ if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
libclutter-gtk-1.0-dev \ mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
libclutter-1.0-dev \ rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
libglib2.0-dev \ fi; \
libgtk-3-dev \ cd ..; \
libnotify-dev \ apt-get update; \
qtbase5-dev \ mk-build-deps \
qttools5-dev \ --remove --install \
qttools5-dev-tools \ --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
yasm \ "debian/control"; \
nasm \ cd / && rm -rf /tmp/builddeps
autotools-dev \
gettext \
libpulse-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
libyaml-cpp-dev \
libboost-dev \
libxext-dev \
libxfixes-dev \
libspeex-dev \
libspeexdsp-dev \
uuid-dev \
libavcodec-dev \
libavutil-dev \
libavformat-dev \
libswscale-dev \
libavdevice-dev \
libopus-dev \
libudev-dev \
libgsm1-dev \
libjsoncpp-dev \
libmsgpack-dev \
libnatpmp-dev \
libayatana-appindicator3-dev \
libqrencode-dev \
libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
libvdpau-dev \
libssl-dev \
libsndfile1-dev
RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 50 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 50
......
docker/Dockerfile_ubuntu_20.04
+ 29
− 59
View file @ 6d0caec2
FROM ubuntu:20.04 FROM ubuntu:20.04
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get clean
RUN apt-get update && \
apt-get install -y devscripts equivs
# Speed up mk-build-deps
RUN apt-get clean RUN apt-get clean
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y -o Acquire::Retries=10 \ apt-get install -y -o Acquire::Retries=10 \
git \ ca-certificates \
autoconf \ devscripts \
automake \ dirmngr \
autopoint \ equivs \
cmake \ gnupg \
libtool \ wget
libdbus-1-dev \
libdbus-c++-dev \ RUN wget -O - https://dl.jami.net/public-key.gpg | \
libgnutls28-dev \ tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
libargon2-0-dev \ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/ubuntu_20.04_qt/ jami main' > /etc/apt/sources.list.d/libqt-jami.list"
libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \ # add deb-src entries (needed for next step)
libclutter-1.0-dev \ RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
libglib2.0-dev \ RUN apt-get clean && apt-get update
libgtk-3-dev \
libnotify-dev \ COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
qtbase5-dev \ RUN cd /tmp/builddeps/debian; \
qttools5-dev \ if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
qttools5-dev-tools \ mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
yasm \ rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
nasm \ fi; \
autotools-dev \ cd ..; \
gettext \ apt-get update; \
libpulse-dev \ mk-build-deps \
libasound2-dev \ --remove --install \
libexpat1-dev \ --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
libpcre3-dev \ "debian/control"; \
libyaml-cpp-dev \ cd / && rm -rf /tmp/builddeps
libboost-dev \
libxext-dev \
libxfixes-dev \
libspeex-dev \
libspeexdsp-dev \
uuid-dev \
libavcodec-dev \
libavutil-dev \
libavformat-dev \
libswscale-dev \
libavdevice-dev \
libopus-dev \
libudev-dev \
libgsm1-dev \
libjsoncpp-dev \
libmsgpack-dev \
libnatpmp-dev \
libayatana-appindicator3-dev \
libqrencode-dev \
libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
libvdpau-dev \
libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
docker/Dockerfile_ubuntu_20.10
+ 29
− 59
View file @ 6d0caec2
FROM ubuntu:20.10 FROM ubuntu:20.10
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get clean RUN apt-get clean
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y devscripts equivs apt-get install -y -o Acquire::Retries=10 \
ca-certificates \
devscripts \
dirmngr \
equivs \
gnupg \
wget
# Speed up mk-build-deps RUN wget -O - https://dl.jami.net/public-key.gpg | \
RUN apt-get clean tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
RUN apt-get update && \ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/ubuntu_20.10_qt/ jami main' > /etc/apt/sources.list.d/libqt-jami.list"
apt-get install -y -o Acquire::Retries=3 \
git \ # add deb-src entries (needed for next step)
autoconf \ RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
automake \ RUN apt-get clean && apt-get update
autopoint \
cmake \ COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
libtool \ RUN cd /tmp/builddeps/debian; \
libdbus-1-dev \ if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
libdbus-c++-dev \ mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
libgnutls28-dev \ rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
libargon2-0-dev \ fi; \
libcanberra-gtk3-dev \ cd ..; \
libclutter-gtk-1.0-dev \ apt-get update; \
libclutter-1.0-dev \ mk-build-deps \
libglib2.0-dev \ --remove --install \
libgtk-3-dev \ --tool "apt-get -y --no-install-recommends -o Acquire::Retries=10" \
libnotify-dev \ "debian/control"; \
qtbase5-dev \ cd / && rm -rf /tmp/builddeps
qttools5-dev \
qttools5-dev-tools \
yasm \
nasm \
autotools-dev \
gettext \
libpulse-dev \
libasound2-dev \
libexpat1-dev \
libpcre3-dev \
libyaml-cpp-dev \
libboost-dev \
libxext-dev \
libxfixes-dev \
libspeex-dev \
libspeexdsp-dev \
uuid-dev \
libavcodec-dev \
libavutil-dev \
libavformat-dev \
libswscale-dev \
libavdevice-dev \
libopus-dev \
libudev-dev \
libgsm1-dev \
libjsoncpp-dev \
libmsgpack-dev \
libnatpmp-dev \
libayatana-appindicator3-dev \
libqrencode-dev \
libnm-dev \
libwebkit2gtk-4.0-dev \
libcrypto++-dev \
libva-dev \
libvdpau-dev \
libssl-dev
ADD scripts/build-package-debian.sh /opt/build-package-debian.sh ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
......
packaging/rules/debian-one-click-install/control
+ 35
− 14
View file @ 6d0caec2
Source: jami Source: jami
Section: comm Section: comm
Priority: optional Priority: optional
Maintainer: Alexandre Viau <aviau@debian.org> Maintainer: The Jami project <jami@gnu.org>
Build-Depends: debhelper (>= 9), Build-Depends: debhelper (>= 9),
autoconf, autoconf,
automake, automake,
cmake, cmake,
libtool, libtool,
autotools-dev, autotools-dev,
# qt client
libqt-jami,
# libqt5svg5-dev,
# qml-module-qt-labs-platform,
# qml-module-qtquick-controls,
# qml-module-qtquick-controls2,
# qml-module-qtquick-dialogs,
# qml-module-qtquick-layouts,
# qml-module-qtquick-privatewidgets,
# qml-module-qtquick-shapes,
# qml-module-qtquick-templates2,
# qml-module-qtquick-window2,
# qml-module-qtquick2,
# qml-module-qtwebchannel,
# qml-module-qtwebengine | qml-module-qtwebkit,
# qtdeclarative5-dev,
# qtmultimedia5-dev,
# qtquickcontrols2-5-dev,
# qtwebengine5-dev | libqtwebkit-dev,
# both qt client and gnome client
libnm-dev,
libnotify-dev,
# gnome client # gnome client
libebook1.2-dev, libebook1.2-dev,
libcanberra-gtk3-dev,
libclutter-gtk-1.0-dev, libclutter-gtk-1.0-dev,
libclutter-1.0-dev, libclutter-1.0-dev,
libglib2.0-dev, libglib2.0-dev,
libgtk-3-dev, libgtk-3-dev,
libnotify-dev, # qtbase5-dev,
qtbase5-dev, # qttools5-dev,
qttools5-dev, # qttools5-dev-tools,
qttools5-dev-tools,
gettext, gettext,
libqrencode-dev, libqrencode-dev,
libayatana-appindicator3-dev | libappindicator3-dev, libayatana-appindicator3-dev | libappindicator3-dev,
libnm-dev,
libwebkit2gtk-4.0-dev | libwebkit2gtk-3.0-dev, libwebkit2gtk-4.0-dev | libwebkit2gtk-3.0-dev,
# jami-daemon # daemon
libdbus-1-dev, libdbus-1-dev,
libdbus-c++-dev, libdbus-c++-dev,
libupnp-dev, libupnp-dev,
...@@ -52,7 +73,9 @@ Build-Depends: debhelper (>= 9), ...@@ -52,7 +73,9 @@ Build-Depends: debhelper (>= 9),
libva-dev, libva-dev,
libcrypto++-dev, libcrypto++-dev,
libvdpau-dev, libvdpau-dev,
libssl-dev,
# other # other
nasm,
yasm, yasm,
Standards-Version: 4.1.5 Standards-Version: 4.1.5
Homepage: https://jami.net Homepage: https://jami.net
...@@ -61,24 +84,22 @@ Vcs-Browser: https://git.jami.net/savoirfairelinux/ring-project ...@@ -61,24 +84,22 @@ Vcs-Browser: https://git.jami.net/savoirfairelinux/ring-project
Package: jami-all Package: jami-all
Architecture: any Architecture: any
Depends: libqt5sql5-sqlite, Depends: gnupg,
gnupg, # libqt5sql5-sqlite,
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Replaces: jami, Replaces: jami,
jami-daemon, jami-daemon,
jami-gnome,
ring, ring,
ring-all, ring-all,
ring-daemon, ring-daemon
ring-gnome
Conflicts: jami, Conflicts: jami,
jami-daemon, jami-daemon,
jami-gnome, jami-gnome,
ring, ring,
ring-all, ring-all,
ring-daemon, ring-gnome,
ring-gnome ring-daemon
Description: Secure and distributed voice, video and chat platform - all in one package Description: Secure and distributed voice, video and chat platform - all in one package
Jami (jami.net) is a secure and distributed voice, video and chat communication Jami (jami.net) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy platform that requires no centralized server and leaves the power of privacy
......
packaging/rules/debian-one-click-install/copyright
+ 0
− 1
View file @ 6d0caec2
...@@ -4,7 +4,6 @@ Upstream-Contact: Alexandre Viau <alexandre.viau@savoirfairelinux.net> ...@@ -4,7 +4,6 @@ Upstream-Contact: Alexandre Viau <alexandre.viau@savoirfairelinux.net>
Source: https://dl.jami.net/release/tarballs/ Source: https://dl.jami.net/release/tarballs/
Files-Excluded: client-electron/* Files-Excluded: client-electron/*
client-uwp/* client-uwp/*
client-qt/*
client-android/* client-android/*
client-macosx/* client-macosx/*
client-ios/* client-ios/*
......
packaging/rules/debian-one-click-install/rules
+ 40
− 1
View file @ 6d0caec2
...@@ -32,6 +32,14 @@ BUNDLED_PKGS="--enable-ffmpeg" # For ubuntu 21.04 it seems there is massive issu ...@@ -32,6 +32,14 @@ BUNDLED_PKGS="--enable-ffmpeg" # For ubuntu 21.04 it seems there is massive issu
endif endif
endif endif
# Qt-related variables
QT_JAMI_PREFIX := ${QT_JAMI_PREFIX}
export PATH := $(QT_JAMI_PREFIX)/bin:${PATH}
export LD_LIBRARY_PATH := $(QT_JAMI_PREFIX)/lib:${LD_LIBRARY_PATH}
export PKG_CONFIG_PATH := $(QT_JAMI_PREFIX)/lib/pkgconfig:${PKG_CONFIG_PATH}
export CMAKE_PREFIX_PATH := $(QT_JAMI_PREFIX)/lib/cmake:${CMAKE_PREFIX_PATH}
%: %:
dh $@ dh $@
...@@ -101,6 +109,11 @@ override_dh_auto_configure: ...@@ -101,6 +109,11 @@ override_dh_auto_configure:
$(CMAKE_OPTIONS) \ $(CMAKE_OPTIONS) \
.. ..
#########################
## qt client configure ##
#########################
# needs to be done after lrc is built; see below
dh_auto_configure dh_auto_configure
override_dh_auto_build: override_dh_auto_build:
...@@ -120,6 +133,19 @@ override_dh_auto_build: ...@@ -120,6 +133,19 @@ override_dh_auto_build:
######################## ########################
make -C client-gnome/build LDFLAGS="-lpthread" -j$(NO_CPUS) V=1 make -C client-gnome/build LDFLAGS="-lpthread" -j$(NO_CPUS) V=1
###################################
## qt client configure and build ##
###################################
cd client-qt && \
mkdir build && \
cd build && \
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLRC=$(CURDIR)/lrc \
$(CMAKE_OPTIONS) \
..
make -C client-qt/build -j$(NO_CPUS) V=1
override_dh_auto_clean: override_dh_auto_clean:
################################ ################################
## Generated contrib tarballs ## ## Generated contrib tarballs ##
...@@ -147,6 +173,13 @@ override_dh_auto_clean: ...@@ -147,6 +173,13 @@ override_dh_auto_clean:
if [ -f client-gnome/build/Makefile ]; then make -C client-gnome/build clean; fi if [ -f client-gnome/build/Makefile ]; then make -C client-gnome/build clean; fi
rm -rfv client-gnome/build rm -rfv client-gnome/build
#####################
## qt client clean ##
#####################
# CMake build system has no distclean target, so use clean.
if [ -f client-qt/build/Makefile ]; then make -C client-qt/build clean; fi
rm -rfv client-qt/build
override_dh_clean: override_dh_clean:
# GNUTLS contains: # GNUTLS contains:
# ring-project/daemon/contrib/tarballs-unpacked/gnutls-3.5.10.tar.xz/gnutls-3.5.10/src/certtool-args.c.bak # ring-project/daemon/contrib/tarballs-unpacked/gnutls-3.5.10.tar.xz/gnutls-3.5.10/src/certtool-args.c.bak
...@@ -176,7 +209,13 @@ override_dh_auto_install: ...@@ -176,7 +209,13 @@ override_dh_auto_install:
## GNOME client ## GNOME client
cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
ln -sf /usr/bin/jami $(CURDIR)/debian/jami-all/usr/bin/ring.cx rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/bin/jami
## Qt client
cd client-qt/build && \
make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
ln -sf /usr/bin/jami $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/bin/ring.cx
tmpdir:= $(shell mktemp -d) tmpdir:= $(shell mktemp -d)
workdir:= $(shell pwd) workdir:= $(shell pwd)
......
packaging/rules/debian/control
+ 65
− 18
View file @ 6d0caec2
Source: jami Source: jami
Section: comm Section: comm
Priority: optional Priority: optional
Maintainer: Alexandre Viau <aviau@debian.org> Maintainer: The Jami project <jami@gnu.org>
Build-Depends: debhelper (>= 9), Build-Depends: debhelper (>= 9),
autoconf, autoconf,
automake, automake,
cmake, cmake,
libtool, libtool,
autotools-dev, autotools-dev,
# qt client
libqt-jami,
# libqt5svg5-dev,
# qml-module-qt-labs-platform,
# qml-module-qtquick-controls,
# qml-module-qtquick-controls2,
# qml-module-qtquick-dialogs,
# qml-module-qtquick-layouts,
# qml-module-qtquick-privatewidgets,
# qml-module-qtquick-shapes,
# qml-module-qtquick-templates2,
# qml-module-qtquick-window2,
# qml-module-qtquick2,
# qml-module-qtwebchannel,
# qml-module-qtwebengine | qml-module-qtwebkit,
# qtdeclarative5-dev,
# qtmultimedia5-dev,
# qtquickcontrols2-5-dev,
# qtwebengine5-dev | libqtwebkit-dev,
# both qt client and gnome client
libnm-dev,
libnotify-dev,
# gnome client # gnome client
libebook1.2-dev, libebook1.2-dev,
libcanberra-gtk3-dev,
libclutter-gtk-1.0-dev, libclutter-gtk-1.0-dev,
libclutter-1.0-dev, libclutter-1.0-dev,
libglib2.0-dev, libglib2.0-dev,
libgtk-3-dev, libgtk-3-dev,
libnotify-dev, # qtbase5-dev,
qtbase5-dev, # qttools5-dev,
qttools5-dev, # qttools5-dev-tools,
qttools5-dev-tools,
gettext, gettext,
libqrencode-dev, libqrencode-dev,
libayatana-appindicator3-dev | libappindicator3-dev, libayatana-appindicator3-dev | libappindicator3-dev,
libnm-dev,
libwebkit2gtk-4.0-dev | libwebkit2gtk-3.0-dev, libwebkit2gtk-4.0-dev | libwebkit2gtk-3.0-dev,
# jami-daemon # daemon
libdbus-1-dev, libdbus-1-dev,
libdbus-c++-dev, libdbus-c++-dev,
libupnp-dev, libupnp-dev,
...@@ -52,7 +73,9 @@ Build-Depends: debhelper (>= 9), ...@@ -52,7 +73,9 @@ Build-Depends: debhelper (>= 9),
libva-dev, libva-dev,
libcrypto++-dev, libcrypto++-dev,
libvdpau-dev, libvdpau-dev,
libssl-dev,
# other # other
nasm,
yasm, yasm,
Standards-Version: 4.1.5 Standards-Version: 4.1.5
Homepage: https://jami.net Homepage: https://jami.net
...@@ -61,18 +84,18 @@ Vcs-Browser: https://git.jami.net/savoirfairelinux/ring-project ...@@ -61,18 +84,18 @@ Vcs-Browser: https://git.jami.net/savoirfairelinux/ring-project
Package: jami-all Package: jami-all
Architecture: any Architecture: any
Depends: libqt5sql5-sqlite, Depends: gnupg,
gnupg, # libqt5sql5-sqlite,
${shlibs:Depends}, ${shlibs:Depends},
${misc:Depends} ${misc:Depends}
Replaces: jami, Replaces: jami,
jami-libclient,
jami-daemon, jami-daemon,
jami-gnome,
ring, ring,
ring-all, ring-all,
ring-gnome,
ring-daemon ring-daemon
Conflicts: jami, Conflicts: jami,
jami-libclient,
jami-daemon, jami-daemon,
jami-gnome, jami-gnome,
ring, ring,
...@@ -96,18 +119,15 @@ Package: jami ...@@ -96,18 +119,15 @@ Package: jami
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, Depends: ${shlibs:Depends},
${misc:Depends}, ${misc:Depends},
libqt5sql5-sqlite, # libqt5sql5-sqlite,
jami-daemon (=${binary:Version}) jami-libclient (=${binary:Version})
Replaces: jami-genome, Provides: jami-qt
ring-gnome
Conflicts: jami-gnome,
ring-gnome
Description: Secure and distributed voice, video and chat platform - desktop client Description: Secure and distributed voice, video and chat platform - desktop client
Jami (jami.net) is a secure and distributed voice, video and chat communication Jami (jami.net) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy platform that requires no centralized server and leaves the power of privacy
in the hands of the user. in the hands of the user.
. .
This package contains the desktop client: jami-gnome. This package contains the jami-qt desktop client.
Package: ring Package: ring
Depends: jami, ${misc:Depends} Depends: jami, ${misc:Depends}
...@@ -115,6 +135,33 @@ Architecture: all ...@@ -115,6 +135,33 @@ Architecture: all
Description: transitional package for jami Description: transitional package for jami
This is a transitional package. It can safely be removed. This is a transitional package. It can safely be removed.
Package: jami-gnome
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
# libqt5sql5-sqlite,
jami-libclient (=${binary:Version})
Replaces: ring-gnome
Conflicts: ring-gnome
Description: Secure and distributed voice, video and chat platform - desktop client
Jami (jami.net) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy
in the hands of the user.
.
This package contains the older jami-gnome desktop client.
Package: jami-libclient
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
jami-daemon (=${binary:Version})
Description: Secure and distributed voice, video and chat platform - daemon
Jami (jami.net) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy
in the hands of the user.
.
This package contains the Jami client library: lrc.
Package: jami-daemon Package: jami-daemon
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, Depends: ${shlibs:Depends},
......
packaging/rules/debian/copyright
+ 0
− 1
View file @ 6d0caec2
...@@ -4,7 +4,6 @@ Upstream-Contact: Alexandre Viau <alexandre.viau@savoirfairelinux.net> ...@@ -4,7 +4,6 @@ Upstream-Contact: Alexandre Viau <alexandre.viau@savoirfairelinux.net>
Source: https://dl.jami.net/release/tarballs/ Source: https://dl.jami.net/release/tarballs/
Files-Excluded: client-electron/* Files-Excluded: client-electron/*
client-uwp/* client-uwp/*
client-qt/*
client-android/* client-android/*
client-macosx/* client-macosx/*
client-ios/* client-ios/*
......
packaging/rules/debian/rules
+ 56
− 5
View file @ 6d0caec2
...@@ -15,6 +15,8 @@ endif ...@@ -15,6 +15,8 @@ endif
# Binary package names # Binary package names
JAMI_ALL_IN_ONE_PKG_NAME="jami-all" JAMI_ALL_IN_ONE_PKG_NAME="jami-all"
JAMI_CLIENT_PKG_NAME="jami" JAMI_CLIENT_PKG_NAME="jami"
JAMI_CLIENT_GNOME_PKG_NAME="jami-gnome"
JAMI_LIB_CLIENT_PKG_NAME="jami-libclient"
JAMI_DAEMON_PKG_NAME="jami-daemon" JAMI_DAEMON_PKG_NAME="jami-daemon"
# Bundled packages from contrib # Bundled packages from contrib
...@@ -34,6 +36,14 @@ BUNDLED_PKGS="--enable-ffmpeg" # For ubuntu 21.04 it seems there is massive issu ...@@ -34,6 +36,14 @@ BUNDLED_PKGS="--enable-ffmpeg" # For ubuntu 21.04 it seems there is massive issu
endif endif
endif endif
# Qt-related variables
QT_JAMI_PREFIX := ${QT_JAMI_PREFIX}
export PATH := $(QT_JAMI_PREFIX)/bin:${PATH}
export LD_LIBRARY_PATH := $(QT_JAMI_PREFIX)/lib:${LD_LIBRARY_PATH}
export PKG_CONFIG_PATH := $(QT_JAMI_PREFIX)/lib/pkgconfig:${PKG_CONFIG_PATH}
export CMAKE_PREFIX_PATH := $(QT_JAMI_PREFIX)/lib/cmake:${CMAKE_PREFIX_PATH}
%: %:
dh $@ dh $@
...@@ -103,6 +113,11 @@ override_dh_auto_configure: ...@@ -103,6 +113,11 @@ override_dh_auto_configure:
$(CMAKE_OPTIONS) \ $(CMAKE_OPTIONS) \
.. ..
#########################
## qt client configure ##
#########################
# needs to be done after lrc is built; see below
dh_auto_configure dh_auto_configure
override_dh_auto_build: override_dh_auto_build:
...@@ -122,6 +137,19 @@ override_dh_auto_build: ...@@ -122,6 +137,19 @@ override_dh_auto_build:
######################## ########################
make -C client-gnome/build LDFLAGS="-lpthread" -j$(NO_CPUS) V=1 make -C client-gnome/build LDFLAGS="-lpthread" -j$(NO_CPUS) V=1
###################################
## qt client configure and build ##
###################################
cd client-qt && \
mkdir build && \
cd build && \
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLRC=$(CURDIR)/lrc \
$(CMAKE_OPTIONS) \
..
make -C client-qt/build -j$(NO_CPUS) V=1
override_dh_auto_clean: override_dh_auto_clean:
################################ ################################
## Generated contrib tarballs ## ## Generated contrib tarballs ##
...@@ -149,6 +177,13 @@ override_dh_auto_clean: ...@@ -149,6 +177,13 @@ override_dh_auto_clean:
if [ -f client-gnome/build/Makefile ]; then make -C client-gnome/build clean; fi if [ -f client-gnome/build/Makefile ]; then make -C client-gnome/build clean; fi
rm -rfv client-gnome/build rm -rfv client-gnome/build
#####################
## qt client clean ##
#####################
# CMake build system has no distclean target, so use clean.
if [ -f client-qt/build/Makefile ]; then make -C client-qt/build clean; fi
rm -rfv client-qt/build
override_dh_clean: override_dh_clean:
# GNUTLS contains: # GNUTLS contains:
# ring-project/daemon/contrib/tarballs-unpacked/gnutls-3.5.10.tar.xz/gnutls-3.5.10/src/certtool-args.c.bak # ring-project/daemon/contrib/tarballs-unpacked/gnutls-3.5.10.tar.xz/gnutls-3.5.10/src/certtool-args.c.bak
...@@ -170,17 +205,24 @@ override_dh_auto_install: ...@@ -170,17 +205,24 @@ override_dh_auto_install:
######################### #########################
## LibRingClient ## LibRingClient
cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME) install cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_LIB_CLIENT_PKG_NAME) install
rm -rfv $(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME)/usr/include rm -rfv $(CURDIR)/debian/$(JAMI_LIB_CLIENT_PKG_NAME)/usr/include
# This is a symlink, should be in -dev package # This is a symlink, should be in -dev package
rm -v $(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME)/usr/lib/libringclient.so rm -v $(CURDIR)/debian/$(JAMI_LIB_CLIENT_PKG_NAME)/usr/lib/libringclient.so
# cmake files # cmake files
rm -rfv $(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME)/usr/lib/cmake rm -rfv $(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME)/usr/lib/cmake
## GNOME client ## GNOME client
cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME) install cd client-gnome/build && \
make DESTDIR=$(CURDIR)/debian/$(JAMI_CLIENT_GNOME_PKG_NAME) install
rm -rfv $(CURDIR)/debian/$(JAMI_CLIENT_GNOME_PKG_NAME)/usr/bin/jami
## Qt client
cd client-qt/build && \
make DESTDIR=$(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME) install
ln -sf /usr/bin/jami $(CURDIR)/debian/jami/usr/bin/ring.cx ln -sf /usr/bin/jami $(CURDIR)/debian/jami/usr/bin/ring.cx
###################### ######################
...@@ -205,7 +247,16 @@ override_dh_auto_install: ...@@ -205,7 +247,16 @@ override_dh_auto_install:
## GNOME client ## GNOME client
cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
ln -sf /usr/bin/jami $(CURDIR)/debian/jami-all/usr/bin/ring.cx rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/bin/jami
## Qt client
cd client-qt/build && \
make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
ln -sf /usr/bin/jami $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/bin/ring.cx
override_dh_shlibdeps:
dh_shlibdeps -- -x$(JAMI_ALL_IN_ONE_PKG_NAME)
tmpdir:= $(shell mktemp -d) tmpdir:= $(shell mktemp -d)
workdir:= $(shell pwd) workdir:= $(shell pwd)
......
scripts/build-package-debian.sh
+ 0
− 14
View file @ 6d0caec2
...@@ -35,30 +35,16 @@ fi ...@@ -35,30 +35,16 @@ fi
# import the debian folder and override files if needed # import the debian folder and override files if needed
cp -r ${PKG_DIR} debian cp -r ${PKG_DIR} debian
if [ -z "${DEBIAN_PACKAGING_OVERRIDE}" ]; then
echo "DEBIAN_PACKAGING_OVERRIDE not set."
else
cp -r ${DEBIAN_PACKAGING_OVERRIDE}/* debian/
fi
DPKG_BUILD_OPTIONS="" DPKG_BUILD_OPTIONS=""
MKBUILD_OPTIONS=""
# Set the host architecture as armhf and add some specific architecture # Set the host architecture as armhf and add some specific architecture
# options to the package builder. # options to the package builder.
if grep -q "raspbian_10_armhf" <<< "${DISTRIBUTION}"; then if grep -q "raspbian_10_armhf" <<< "${DISTRIBUTION}"; then
echo "Adding armhf as the host architecture." echo "Adding armhf as the host architecture."
export HOST_ARCH=arm-linux-gnueabihf export HOST_ARCH=arm-linux-gnueabihf
dpkg --add-architecture armhf
DPKG_BUILD_OPTIONS="${DPKG_BUILD_OPTIONS} -a armhf" DPKG_BUILD_OPTIONS="${DPKG_BUILD_OPTIONS} -a armhf"
MKBUILD_OPTIONS="${MKBUILD_OPTIONS} --host-arch armhf"
fi fi
# install build deps
apt-get clean
apt-get update
apt-get upgrade -o Acquire::Retries=10 -y
mk-build-deps ${MKBUILD_OPTIONS} --remove --install debian/control -t "apt-get -y --no-install-recommends"
# create changelog file # create changelog file
DEBEMAIL="The Jami project <jami@gnu.org>" dch --create --package jami --newversion ${DEBIAN_VERSION} "Automatic nightly release" DEBEMAIL="The Jami project <jami@gnu.org>" dch --create --package jami --newversion ${DEBIAN_VERSION} "Automatic nightly release"
DEBEMAIL="The Jami project <jami@gnu.org>" dch --release --distribution "unstable" debian/changelog DEBEMAIL="The Jami project <jami@gnu.org>" dch --release --distribution "unstable" debian/changelog
......
scripts/make-packaging-target.py
+ 10
− 37
View file @ 6d0caec2
...@@ -51,7 +51,6 @@ PACKAGE_%(distribution)s_DOCKER_RUN_COMMAND = docker run \\ ...@@ -51,7 +51,6 @@ PACKAGE_%(distribution)s_DOCKER_RUN_COMMAND = docker run \\
-e RELEASE_VERSION=$(RELEASE_VERSION) \\ -e RELEASE_VERSION=$(RELEASE_VERSION) \\
-e RELEASE_TARBALL_FILENAME=$(RELEASE_TARBALL_FILENAME) \\ -e RELEASE_TARBALL_FILENAME=$(RELEASE_TARBALL_FILENAME) \\
-e DEBIAN_VERSION=%(version)s \\ -e DEBIAN_VERSION=%(version)s \\
-e DEBIAN_PACKAGING_OVERRIDE=%(debian_packaging_override)s \\
-e CURRENT_UID=$(CURRENT_UID) \\ -e CURRENT_UID=$(CURRENT_UID) \\
-e CURRENT_GID=$(CURRENT_GID) \\ -e CURRENT_GID=$(CURRENT_GID) \\
-e DISTRIBUTION=%(distribution)s \\ -e DISTRIBUTION=%(distribution)s \\
...@@ -110,7 +109,6 @@ def generate_target(distribution, output_file, options='', docker_image='', ...@@ -110,7 +109,6 @@ def generate_target(distribution, output_file, options='', docker_image='',
return target_template % { return target_template % {
"distribution": distribution, "distribution": distribution,
"docker_image": docker_image, "docker_image": docker_image,
"debian_packaging_override": debian_packaging_override,
"output_file": output_file, "output_file": output_file,
"options": options, "options": options,
"version": version, "version": version,
...@@ -120,7 +118,6 @@ def generate_target(distribution, output_file, options='', docker_image='', ...@@ -120,7 +118,6 @@ def generate_target(distribution, output_file, options='', docker_image='',
def run_generate(parsed_args): def run_generate(parsed_args):
print(generate_target(parsed_args.distribution, print(generate_target(parsed_args.distribution,
parsed_args.debian_packaging_override,
parsed_args.output_file, parsed_args.output_file,
parsed_args.options, parsed_args.options,
parsed_args.docker_image, parsed_args.docker_image,
...@@ -132,31 +129,26 @@ def run_generate_all(parsed_args): ...@@ -132,31 +129,26 @@ def run_generate_all(parsed_args):
# Debian # Debian
{ {
"distribution": "debian_10", "distribution": "debian_10",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "--privileged --security-opt apparmor=docker-default", "options": "-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX) --privileged --security-opt apparmor=docker-default",
}, },
{ {
"distribution": "debian_10_i386", "distribution": "debian_10_i386",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "--privileged --security-opt apparmor=docker-default", "options": "--privileged --security-opt apparmor=docker-default",
}, },
{ {
"distribution": "debian_10_armhf", "distribution": "debian_10_armhf",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "--privileged --security-opt apparmor=docker-default", "options": "--privileged --security-opt apparmor=docker-default",
}, },
{ {
"distribution": "debian_10_arm64", "distribution": "debian_10_arm64",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "--privileged --security-opt apparmor=docker-default" "options": "--privileged --security-opt apparmor=docker-default"
}, },
{ {
"distribution": "debian_10_qt", "distribution": "debian_10_qt",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_QT_DSC_FILENAME)", "output_file": "$(DEBIAN_QT_DSC_FILENAME)",
"options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS_QT, "options": DPKG_BASED_SYSTEMS_DOCKER_RUN_OPTIONS_QT,
"version": "$(DEBIAN_QT_VERSION)", "version": "$(DEBIAN_QT_VERSION)",
...@@ -164,15 +156,13 @@ def run_generate_all(parsed_args): ...@@ -164,15 +156,13 @@ def run_generate_all(parsed_args):
{ {
"distribution": "debian_10_oci", "distribution": "debian_10_oci",
"docker_image": "debian_10", "docker_image": "debian_10",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_OCI_DSC_FILENAME)", "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default", "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) -e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)", "version": "$(DEBIAN_OCI_VERSION)",
}, },
{ {
"distribution": "debian_10_i386_oci", "distribution": "debian_10_i386_oci",
"docker_image": "debian_10_i386", "docker_image": "debian_10_i386",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_OCI_DSC_FILENAME)", "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default", "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)", "version": "$(DEBIAN_OCI_VERSION)",
...@@ -180,7 +170,6 @@ def run_generate_all(parsed_args): ...@@ -180,7 +170,6 @@ def run_generate_all(parsed_args):
{ {
"distribution": "debian_10_armhf_oci", "distribution": "debian_10_armhf_oci",
"docker_image": "debian_10_armhf", "docker_image": "debian_10_armhf",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default", "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)" "version": "$(DEBIAN_OCI_VERSION)"
...@@ -188,7 +177,6 @@ def run_generate_all(parsed_args): ...@@ -188,7 +177,6 @@ def run_generate_all(parsed_args):
{ {
"distribution": "debian_10_arm64_oci", "distribution": "debian_10_arm64_oci",
"docker_image": "debian_10_arm64", "docker_image": "debian_10_arm64",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default", "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)" "version": "$(DEBIAN_OCI_VERSION)"
...@@ -196,14 +184,12 @@ def run_generate_all(parsed_args): ...@@ -196,14 +184,12 @@ def run_generate_all(parsed_args):
# Raspbian # Raspbian
{ {
"distribution": "raspbian_10_armhf", "distribution": "raspbian_10_armhf",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "--privileged --security-opt apparmor=docker-default", "options": "--privileged --security-opt apparmor=docker-default",
}, },
{ {
"distribution": "raspbian_10_armhf_oci", "distribution": "raspbian_10_armhf_oci",
"docker_image": "raspbian_10_armhf", "docker_image": "raspbian_10_armhf",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default", "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)", "version": "$(DEBIAN_OCI_VERSION)",
...@@ -211,13 +197,13 @@ def run_generate_all(parsed_args): ...@@ -211,13 +197,13 @@ def run_generate_all(parsed_args):
# Ubuntu # Ubuntu
{ {
"distribution": "ubuntu_18.04", "distribution": "ubuntu_18.04",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX)",
}, },
{ {
"distribution": "ubuntu_18.04_i386", "distribution": "ubuntu_18.04_i386",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX)",
}, },
{ {
"distribution": "ubuntu_18.04_qt", "distribution": "ubuntu_18.04_qt",
...@@ -234,24 +220,21 @@ def run_generate_all(parsed_args): ...@@ -234,24 +220,21 @@ def run_generate_all(parsed_args):
{ {
"distribution": "ubuntu_18.04_oci", "distribution": "ubuntu_18.04_oci",
"docker_image": "ubuntu_18.04", "docker_image": "ubuntu_18.04",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_OCI_DSC_FILENAME)", "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)", "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) -e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX)",
"version": "$(DEBIAN_OCI_VERSION)", "version": "$(DEBIAN_OCI_VERSION)",
}, },
{ {
"distribution": "ubuntu_18.04_i386_oci", "distribution": "ubuntu_18.04_i386_oci",
"docker_image": "ubuntu_18.04_i386", "docker_image": "ubuntu_18.04_i386",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_OCI_DSC_FILENAME)", "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)", "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) -e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX)",
"version": "$(DEBIAN_OCI_VERSION)", "version": "$(DEBIAN_OCI_VERSION)",
}, },
{ {
"distribution": "ubuntu_20.04", "distribution": "ubuntu_20.04",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "--privileged --security-opt apparmor=docker-default", "options": "-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX) --privileged --security-opt apparmor=docker-default",
}, },
{ {
"distribution": "ubuntu_20.04_qt", "distribution": "ubuntu_20.04_qt",
...@@ -262,16 +245,14 @@ def run_generate_all(parsed_args): ...@@ -262,16 +245,14 @@ def run_generate_all(parsed_args):
{ {
"distribution": "ubuntu_20.04_oci", "distribution": "ubuntu_20.04_oci",
"docker_image": "ubuntu_20.04", "docker_image": "ubuntu_20.04",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_OCI_DSC_FILENAME)", "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default", "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) -e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)", "version": "$(DEBIAN_OCI_VERSION)",
}, },
{ {
"distribution": "ubuntu_20.10", "distribution": "ubuntu_20.10",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_DSC_FILENAME)", "output_file": "$(DEBIAN_DSC_FILENAME)",
"options": "--privileged --security-opt apparmor=docker-default", "options": "-e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX) --privileged --security-opt apparmor=docker-default",
}, },
{ {
"distribution": "ubuntu_20.10_qt", "distribution": "ubuntu_20.10_qt",
...@@ -282,9 +263,8 @@ def run_generate_all(parsed_args): ...@@ -282,9 +263,8 @@ def run_generate_all(parsed_args):
{ {
"distribution": "ubuntu_20.10_oci", "distribution": "ubuntu_20.10_oci",
"docker_image": "ubuntu_20.10", "docker_image": "ubuntu_20.10",
"debian_packaging_override": "",
"output_file": "$(DEBIAN_OCI_DSC_FILENAME)", "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
"options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default", "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) -e QT_JAMI_PREFIX=$(QT_JAMI_PREFIX) --privileged --security-opt apparmor=docker-default",
"version": "$(DEBIAN_OCI_VERSION)", "version": "$(DEBIAN_OCI_VERSION)",
}, },
{ {
...@@ -305,13 +285,11 @@ def run_generate_all(parsed_args): ...@@ -305,13 +285,11 @@ def run_generate_all(parsed_args):
# Fedora # Fedora
{ {
"distribution": "fedora_32", "distribution": "fedora_32",
"debian_packaging_override": "",
"output_file": ".packages-built", "output_file": ".packages-built",
"options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS "options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS
}, },
{ {
"distribution": "fedora_33", "distribution": "fedora_33",
"debian_packaging_override": "",
"output_file": ".packages-built", "output_file": ".packages-built",
"options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS "options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS
}, },
...@@ -323,7 +301,6 @@ def run_generate_all(parsed_args): ...@@ -323,7 +301,6 @@ def run_generate_all(parsed_args):
}, },
{ {
"distribution": "rhel_8", "distribution": "rhel_8",
"debian_packaging_override": "",
"output_file": ".packages-built", "output_file": ".packages-built",
"options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS, "options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS,
"docker_build_args": "--build-arg PASS=${PASS}" "docker_build_args": "--build-arg PASS=${PASS}"
...@@ -331,20 +308,17 @@ def run_generate_all(parsed_args): ...@@ -331,20 +308,17 @@ def run_generate_all(parsed_args):
# OpenSUSE # OpenSUSE
{ {
"distribution": "opensuse-leap_15.2", "distribution": "opensuse-leap_15.2",
"debian_packaging_override": "",
"output_file": ".packages-built", "output_file": ".packages-built",
"options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS "options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS
}, },
{ {
"distribution": "opensuse-tumbleweed", "distribution": "opensuse-tumbleweed",
"debian_packaging_override": "",
"output_file": ".packages-built", "output_file": ".packages-built",
"options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS "options": RPM_BASED_SYSTEMS_DOCKER_RUN_OPTIONS
}, },
# Snap # Snap
{ {
"distribution": "snap", "distribution": "snap",
"debian_packaging_override": "",
"output_file": ".packages-built", "output_file": ".packages-built",
}, },
...@@ -371,7 +345,6 @@ def parse_args(): ...@@ -371,7 +345,6 @@ def parse_args():
# Parameters # Parameters
ap.add_argument('--distribution') ap.add_argument('--distribution')
ap.add_argument('--debian_packaging_override', default='')
ap.add_argument('--output_file') ap.add_argument('--output_file')
ap.add_argument('--options', default='') ap.add_argument('--options', default='')
ap.add_argument('--docker_image', default='') ap.add_argument('--docker_image', default='')
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment