Unverified Commit 7ae79f80 authored by Maxim Cournoyer's avatar Maxim Cournoyer
Browse files

maint: Completely get rid of OVERRIDE_PACKAGING_DIR.

This is a follow-up to commit
47b1b0151d6c3703ee25c0050cd2031ab7edae4c, which removed it from the
make-packaging-target.py script.

* docker/Dockerfile_debian_10: Remove support code for
OVERRIDE_PACKAGING_DIR.
* docker/Dockerfile_debian_10_arm64: Likewise.
* docker/Dockerfile_debian_10_armhf: Likewise.
* docker/Dockerfile_debian_10_i386: Likewise.
* docker/Dockerfile_debian_10_qt: Likewise.
* docker/Dockerfile_ubuntu_18.04: Likewise.
* docker/Dockerfile_ubuntu_18.04_i386: Likewise.
* docker/Dockerfile_ubuntu_18.04_qt: Likewise.
* docker/Dockerfile_ubuntu_18.04_qt_i386: Likewise.
* docker/Dockerfile_ubuntu_20.04: Likewise.
* docker/Dockerfile_ubuntu_20.04_qt: Likewise.
* docker/Dockerfile_ubuntu_20.10: Likewise.
* docker/Dockerfile_ubuntu_20.10_qt: Likewise.
* scripts/build-package-debian-qt.sh: Likewise.
* scripts/build-package-debian.sh: Likewise.

Change-Id: Ia15961fe1ccc05222d43da2bdded819f95315aae
parent 98b22dff
......@@ -19,13 +19,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
RUN apt-get clean && apt-get update
COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
RUN cd /tmp/builddeps/debian; \
if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
fi; \
cd ..; \
COPY packaging/rules/debian/* /tmp/builddeps/debian/
RUN cd /tmp/builddeps && \
apt-get update; \
mk-build-deps \
--remove --install \
......
......@@ -19,13 +19,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
RUN apt-get clean && apt-get update
COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
RUN cd /tmp/builddeps/debian; \
if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
fi; \
cd ..; \
COPY packaging/rules/debian/* /tmp/builddeps/debian/
RUN cd /tmp/builddeps && \
apt-get update; \
mk-build-deps \
--remove --install \
......
......@@ -19,13 +19,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
RUN apt-get clean && apt-get update
COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
RUN cd /tmp/builddeps/debian; \
if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
fi; \
cd ..; \
COPY packaging/rules/debian/* /tmp/builddeps/debian/
RUN cd /tmp/builddeps && \
apt-get update; \
mk-build-deps \
--remove --install \
......
......@@ -19,13 +19,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
RUN apt-get clean && apt-get update
COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
RUN cd /tmp/builddeps/debian; \
if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
fi; \
cd ..; \
COPY packaging/rules/debian/* /tmp/builddeps/debian/
RUN cd /tmp/builddeps && \
apt-get update; \
mk-build-deps \
--remove --install \
......
......@@ -12,13 +12,8 @@ RUN apt-get update && \
RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
RUN apt-get clean && apt-get update
COPY packaging/rules/debian-qt/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
RUN cd /tmp/builddeps/debian; \
if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
fi; \
cd ..; \
COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/
RUN cd /tmp/builddeps && \
apt-get update; \
mk-build-deps \
--remove --install \
......
......@@ -22,13 +22,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
RUN apt-get clean && apt-get update
COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
RUN cd /tmp/builddeps/debian; \
if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
fi; \
cd ..; \
COPY packaging/rules/debian/* /tmp/builddeps/debian/
RUN cd /tmp/builddeps && \
apt-get update; \
mk-build-deps \
--remove --install \
......
......@@ -22,13 +22,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
RUN apt-get clean && apt-get update
COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
RUN cd /tmp/builddeps/debian; \
if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
fi; \
cd ..; \
COPY packaging/rules/debian/* /tmp/builddeps/debian/
RUN cd /tmp/builddeps && \
apt-get update; \
mk-build-deps \
--remove --install \
......
......@@ -13,13 +13,8 @@ RUN apt-get update && \
RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
RUN apt-get clean && apt-get update
COPY packaging/rules/debian-qt/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
RUN cd /tmp/builddeps/debian; \
if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
fi; \
cd ..; \
COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/
RUN cd /tmp/builddeps && \
apt-get update; \
mk-build-deps \
--remove --install \
......
......@@ -13,13 +13,8 @@ RUN apt-get update && \
RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
RUN apt-get clean && apt-get update
COPY packaging/rules/debian-qt/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
RUN cd /tmp/builddeps/debian; \
if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
fi; \
cd ..; \
COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/
RUN cd /tmp/builddeps && \
apt-get update; \
mk-build-deps \
--remove --install \
......
......@@ -20,13 +20,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
RUN apt-get clean && apt-get update
COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
RUN cd /tmp/builddeps/debian; \
if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
fi; \
cd ..; \
COPY packaging/rules/debian/* /tmp/builddeps/debian/
RUN cd /tmp/builddeps && \
apt-get update; \
mk-build-deps \
--remove --install \
......
......@@ -13,13 +13,8 @@ RUN apt-get update && \
RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
RUN apt-get clean && apt-get update
COPY packaging/rules/debian-qt/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
RUN cd /tmp/builddeps/debian; \
if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
fi; \
cd ..; \
COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/
RUN cd /tmp/builddeps && \
apt-get update; \
mk-build-deps \
--remove --install \
......
......@@ -20,13 +20,8 @@ RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] ht
RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
RUN apt-get clean && apt-get update
COPY packaging/rules/debian/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
RUN cd /tmp/builddeps/debian; \
if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
fi; \
cd ..; \
COPY packaging/rules/debian/* /tmp/builddeps/debian/
RUN cd /tmp/builddeps && \
apt-get update; \
mk-build-deps \
--remove --install \
......
......@@ -13,13 +13,8 @@ RUN apt-get update && \
RUN sed -n '/^deb\s/s//deb-src /p' /etc/apt/sources.list > /etc/apt/sources.list.d/deb-src.list
RUN apt-get clean && apt-get update
COPY packaging/rules/debian-qt/* ${OVERRIDE_PACKAGING_DIR} /tmp/builddeps/debian/
RUN cd /tmp/builddeps/debian; \
if [ -n "${OVERRIDE_PACKAGING_DIR}" ] && [ -d "$(basename ${OVERRIDE_PACKAGING_DIR})" ]; then \
mv "$(basename ${OVERRIDE_PACKAGING_DIR})"/* .; \
rm -r "$(basename ${OVERRIDE_PACKAGING_DIR})"; \
fi; \
cd ..; \
COPY packaging/rules/debian-qt/* /tmp/builddeps/debian/
RUN cd /tmp/builddeps && \
apt-get update; \
mk-build-deps \
--remove --install \
......
......@@ -24,10 +24,6 @@
set -e
PKG_DIR="packaging/rules/debian-qt"
if [ -n "${OVERRIDE_PACKAGING_DIR}" ]; then
echo "Using OVERRIDE_PACKAGING_DIR: $OVERRIDE_PACKAGING_DIR"
PKG_DIR="${OVERRIDE_PACKAGING_DIR}"
fi
cache_dir=/opt/ring-contrib
temp_dir=$(mktemp -d)
......
......@@ -27,11 +27,6 @@ cp -r /opt/ring-project-ro /opt/ring-project
cd /opt/ring-project
PKG_DIR="packaging/rules/debian"
if [ -z "${OVERRIDE_PACKAGING_DIR}" ]; then
echo "OVERRIDE_PACKAGING_DIR not set."
else
PKG_DIR="${OVERRIDE_PACKAGING_DIR}"
fi
# import the debian folder and override files if needed
cp -r ${PKG_DIR} debian
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment