From 7ae79f80dac812918f48ea2b6a58461ef268ea1c Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
Date: Fri, 30 Apr 2021 00:03:40 -0400
Subject: [PATCH] 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
---
 docker/Dockerfile_debian_10            | 9 ++-------
 docker/Dockerfile_debian_10_arm64      | 9 ++-------
 docker/Dockerfile_debian_10_armhf      | 9 ++-------
 docker/Dockerfile_debian_10_i386       | 9 ++-------
 docker/Dockerfile_debian_10_qt         | 9 ++-------
 docker/Dockerfile_ubuntu_18.04         | 9 ++-------
 docker/Dockerfile_ubuntu_18.04_i386    | 9 ++-------
 docker/Dockerfile_ubuntu_18.04_qt      | 9 ++-------
 docker/Dockerfile_ubuntu_18.04_qt_i386 | 9 ++-------
 docker/Dockerfile_ubuntu_20.04         | 9 ++-------
 docker/Dockerfile_ubuntu_20.04_qt      | 9 ++-------
 docker/Dockerfile_ubuntu_20.10         | 9 ++-------
 docker/Dockerfile_ubuntu_20.10_qt      | 9 ++-------
 scripts/build-package-debian-qt.sh     | 4 ----
 scripts/build-package-debian.sh        | 5 -----
 15 files changed, 26 insertions(+), 100 deletions(-)

diff --git a/docker/Dockerfile_debian_10 b/docker/Dockerfile_debian_10
index 10dc6cc6..a96b009b 100644
--- a/docker/Dockerfile_debian_10
+++ b/docker/Dockerfile_debian_10
@@ -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 \
diff --git a/docker/Dockerfile_debian_10_arm64 b/docker/Dockerfile_debian_10_arm64
index e14ed3bc..0dd24e06 100644
--- a/docker/Dockerfile_debian_10_arm64
+++ b/docker/Dockerfile_debian_10_arm64
@@ -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 \
diff --git a/docker/Dockerfile_debian_10_armhf b/docker/Dockerfile_debian_10_armhf
index b248da2c..f8229e9b 100644
--- a/docker/Dockerfile_debian_10_armhf
+++ b/docker/Dockerfile_debian_10_armhf
@@ -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 \
diff --git a/docker/Dockerfile_debian_10_i386 b/docker/Dockerfile_debian_10_i386
index f40d4673..4d08a5a5 100644
--- a/docker/Dockerfile_debian_10_i386
+++ b/docker/Dockerfile_debian_10_i386
@@ -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 \
diff --git a/docker/Dockerfile_debian_10_qt b/docker/Dockerfile_debian_10_qt
index 32459806..54e6b082 100644
--- a/docker/Dockerfile_debian_10_qt
+++ b/docker/Dockerfile_debian_10_qt
@@ -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 \
diff --git a/docker/Dockerfile_ubuntu_18.04 b/docker/Dockerfile_ubuntu_18.04
index da48ed1e..b7d2ede1 100644
--- a/docker/Dockerfile_ubuntu_18.04
+++ b/docker/Dockerfile_ubuntu_18.04
@@ -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 \
diff --git a/docker/Dockerfile_ubuntu_18.04_i386 b/docker/Dockerfile_ubuntu_18.04_i386
index 35d636ff..e6aaa730 100644
--- a/docker/Dockerfile_ubuntu_18.04_i386
+++ b/docker/Dockerfile_ubuntu_18.04_i386
@@ -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 \
diff --git a/docker/Dockerfile_ubuntu_18.04_qt b/docker/Dockerfile_ubuntu_18.04_qt
index 222be506..774f56f3 100644
--- a/docker/Dockerfile_ubuntu_18.04_qt
+++ b/docker/Dockerfile_ubuntu_18.04_qt
@@ -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 \
diff --git a/docker/Dockerfile_ubuntu_18.04_qt_i386 b/docker/Dockerfile_ubuntu_18.04_qt_i386
index 271b8afd..4b31ab2e 100644
--- a/docker/Dockerfile_ubuntu_18.04_qt_i386
+++ b/docker/Dockerfile_ubuntu_18.04_qt_i386
@@ -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 \
diff --git a/docker/Dockerfile_ubuntu_20.04 b/docker/Dockerfile_ubuntu_20.04
index d4bb9ae8..e3adb9b7 100644
--- a/docker/Dockerfile_ubuntu_20.04
+++ b/docker/Dockerfile_ubuntu_20.04
@@ -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 \
diff --git a/docker/Dockerfile_ubuntu_20.04_qt b/docker/Dockerfile_ubuntu_20.04_qt
index 053bf6d2..12b5fc51 100644
--- a/docker/Dockerfile_ubuntu_20.04_qt
+++ b/docker/Dockerfile_ubuntu_20.04_qt
@@ -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 \
diff --git a/docker/Dockerfile_ubuntu_20.10 b/docker/Dockerfile_ubuntu_20.10
index 6201b424..db33b293 100644
--- a/docker/Dockerfile_ubuntu_20.10
+++ b/docker/Dockerfile_ubuntu_20.10
@@ -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 \
diff --git a/docker/Dockerfile_ubuntu_20.10_qt b/docker/Dockerfile_ubuntu_20.10_qt
index 6b1ed4cb..46adee1d 100644
--- a/docker/Dockerfile_ubuntu_20.10_qt
+++ b/docker/Dockerfile_ubuntu_20.10_qt
@@ -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 \
diff --git a/scripts/build-package-debian-qt.sh b/scripts/build-package-debian-qt.sh
index bfbf46a5..2852cbf7 100755
--- a/scripts/build-package-debian-qt.sh
+++ b/scripts/build-package-debian-qt.sh
@@ -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)
diff --git a/scripts/build-package-debian.sh b/scripts/build-package-debian.sh
index 0a93f4b3..0df0d246 100755
--- a/scripts/build-package-debian.sh
+++ b/scripts/build-package-debian.sh
@@ -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
-- 
GitLab