[Build-System] Use unique .orig.tar.xz filenames across different Debian distribution...

diff --git a/.github/docker/debian/bookworm/amd64/public.release.Dockerfile b/.github/docker/debian/bookworm/amd64/public.release.Dockerfile
index 2a99fe6a4653f9201f70245f1691940093b62ee8..86f78c7018d226eb2bb0af66665fd47e211caf38 100644 (file)
--- a/.github/docker/debian/bookworm/amd64/public.release.Dockerfile
+++ b/.github/docker/debian/bookworm/amd64/public.release.Dockerfile
@@ -59,8 +59,7 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a amd64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
@@ -83,21 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a amd64 -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/bookworm/amd64/public.unstable.Dockerfile b/.github/docker/debian/bookworm/amd64/public.unstable.Dockerfile
index a39bbd05f2d5d17ac0ef4a5e74d3894e642bd065..f84da92fa4173b671ef44d2f4ac26c4f33f64bcd 100644 (file)
--- a/.github/docker/debian/bookworm/amd64/public.unstable.Dockerfile
+++ b/.github/docker/debian/bookworm/amd64/public.unstable.Dockerfile
@@ -59,8 +59,7 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a amd64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
@@ -83,21 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a amd64 -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/bookworm/arm32v7/public.release.Dockerfile b/.github/docker/debian/bookworm/arm32v7/public.release.Dockerfile
index 78d10ee66c5eee00ce942b9b20c55a135e2e6d56..b7c518829283a9f68b88c5f9e839cf8db01aad45 100644 (file)
--- a/.github/docker/debian/bookworm/arm32v7/public.release.Dockerfile
+++ b/.github/docker/debian/bookworm/arm32v7/public.release.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a armhf -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/bookworm/arm32v7/public.unstable.Dockerfile b/.github/docker/debian/bookworm/arm32v7/public.unstable.Dockerfile
index 94ef25d4320a750c6bc470ec144a1440ae09aeac..48f00343da4851493630eb44f16be620c92f4282 100644 (file)
--- a/.github/docker/debian/bookworm/arm32v7/public.unstable.Dockerfile
+++ b/.github/docker/debian/bookworm/arm32v7/public.unstable.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a armhf -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/bookworm/arm64v8/public.release.Dockerfile b/.github/docker/debian/bookworm/arm64v8/public.release.Dockerfile
index 2bf5084ca3fdb02b5452a4579a00b1cfeaa27227..6f11d33e3efb801b98d82b34d99013459d2e5a93 100644 (file)
--- a/.github/docker/debian/bookworm/arm64v8/public.release.Dockerfile
+++ b/.github/docker/debian/bookworm/arm64v8/public.release.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a arm64 -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/bookworm/arm64v8/public.unstable.Dockerfile b/.github/docker/debian/bookworm/arm64v8/public.unstable.Dockerfile
index 56cc1c7e47a47887f59b9b48d92e1c37d0343077..a185961dc6eea0bd685227984292b8c194f6103c 100644 (file)
--- a/.github/docker/debian/bookworm/arm64v8/public.unstable.Dockerfile
+++ b/.github/docker/debian/bookworm/arm64v8/public.unstable.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a arm64 -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/bullseye/amd64/public.release.Dockerfile b/.github/docker/debian/bullseye/amd64/public.release.Dockerfile
index 17411f7afdca6de62a6b2cc22578854c24baa2c7..d9b0db0522f1e74adbe4a1fc6a98a5a12cbf0292 100644 (file)
--- a/.github/docker/debian/bullseye/amd64/public.release.Dockerfile
+++ b/.github/docker/debian/bullseye/amd64/public.release.Dockerfile
@@ -59,8 +59,7 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a amd64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a amd64 -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/bullseye/amd64/public.unstable.Dockerfile b/.github/docker/debian/bullseye/amd64/public.unstable.Dockerfile
index 364107852e6115d0180bea49b5b34c27cf181a91..a2e54e819cf578a1ef452a5c0eb079923bd7ad3d 100644 (file)
--- a/.github/docker/debian/bullseye/amd64/public.unstable.Dockerfile
+++ b/.github/docker/debian/bullseye/amd64/public.unstable.Dockerfile
@@ -59,8 +59,7 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a amd64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     printf "machine ${REPO_DOMAIN} "  > /etc/apt/auth.conf && \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a amd64 -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/bullseye/arm32v7/public.release.Dockerfile b/.github/docker/debian/bullseye/arm32v7/public.release.Dockerfile
index f3e135b7a31360e37f4adcb5c63e25bc266d07e0..8fb8c47f20f82b153806b60b64c2b1f02229c6e2 100644 (file)
--- a/.github/docker/debian/bullseye/arm32v7/public.release.Dockerfile
+++ b/.github/docker/debian/bullseye/arm32v7/public.release.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a armhf -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/bullseye/arm32v7/public.unstable.Dockerfile b/.github/docker/debian/bullseye/arm32v7/public.unstable.Dockerfile
index 6c6367ff147c0321fde972da102a831e8cc87340..76c8eab3a3b31a21e41d767c6c1f528870174756 100644 (file)
--- a/.github/docker/debian/bullseye/arm32v7/public.unstable.Dockerfile
+++ b/.github/docker/debian/bullseye/arm32v7/public.unstable.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a armhf -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/bullseye/arm64v8/public.release.Dockerfile b/.github/docker/debian/bullseye/arm64v8/public.release.Dockerfile
index 53361956d7a8b9e9981141a462a2c948961d49c2..1c23d558ee81b90deda97485170ca01e80d3cd42 100644 (file)
--- a/.github/docker/debian/bullseye/arm64v8/public.release.Dockerfile
+++ b/.github/docker/debian/bullseye/arm64v8/public.release.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a arm64 -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/bullseye/arm64v8/public.unstable.Dockerfile b/.github/docker/debian/bullseye/arm64v8/public.unstable.Dockerfile
index 3ae9e546fb83311b6ba82276264838569c499413..5131671dbd384212b02dc3910255f14d6f5a35f9 100644 (file)
--- a/.github/docker/debian/bullseye/arm64v8/public.unstable.Dockerfile
+++ b/.github/docker/debian/bullseye/arm64v8/public.unstable.Dockerfile
@@ -59,7 +59,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -83,20 +82,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a arm64 -z9 ${CODENAME} "$ORIGFILE"
+
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/trixie/amd64/public.release.Dockerfile b/.github/docker/debian/trixie/amd64/public.release.Dockerfile
index 13a57440acf2c59d7912c6d3f9037dd312b63086..4fa212d656771e75bdff080ae1c2a8e38e8c6c63 100644 (file)
--- a/.github/docker/debian/trixie/amd64/public.release.Dockerfile
+++ b/.github/docker/debian/trixie/amd64/public.release.Dockerfile
@@ -49,8 +49,7 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a amd64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     sha512sum /run/secrets/REPO_PASSWORD && \
@@ -65,21 +64,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a amd64 -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/trixie/amd64/public.unstable.Dockerfile b/.github/docker/debian/trixie/amd64/public.unstable.Dockerfile
index 13a57440acf2c59d7912c6d3f9037dd312b63086..4fa212d656771e75bdff080ae1c2a8e38e8c6c63 100644 (file)
--- a/.github/docker/debian/trixie/amd64/public.unstable.Dockerfile
+++ b/.github/docker/debian/trixie/amd64/public.unstable.Dockerfile
@@ -49,8 +49,7 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
-RUN . ~/.env && ./debian/util.sh prep-create-dsc ${CODENAME}
+RUN . ~/.env && ./debian/util.sh prep-create-dsc -a amd64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     sha512sum /run/secrets/REPO_PASSWORD && \
@@ -65,21 +64,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a amd64 -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/trixie/arm32v7/public.release.Dockerfile b/.github/docker/debian/trixie/arm32v7/public.release.Dockerfile
index c96c491ffa4911028db3f8d7336c2dada59185a5..e378b3224e0bbacd464f5c27dee581938145267d 100644 (file)
--- a/.github/docker/debian/trixie/arm32v7/public.release.Dockerfile
+++ b/.github/docker/debian/trixie/arm32v7/public.release.Dockerfile
@@ -49,7 +49,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -65,21 +64,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a armhf -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/trixie/arm32v7/public.unstable.Dockerfile b/.github/docker/debian/trixie/arm32v7/public.unstable.Dockerfile
index c96c491ffa4911028db3f8d7336c2dada59185a5..e378b3224e0bbacd464f5c27dee581938145267d 100644 (file)
--- a/.github/docker/debian/trixie/arm32v7/public.unstable.Dockerfile
+++ b/.github/docker/debian/trixie/arm32v7/public.unstable.Dockerfile
@@ -49,7 +49,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a armhf ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -65,21 +64,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a armhf -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/trixie/arm64v8/public.release.Dockerfile b/.github/docker/debian/trixie/arm64v8/public.release.Dockerfile
index ef0ad6a7e9cf89260ec89bdde5e2c466f546a7fc..fb4e4d46e22c9affdaff807dd36b837918eadde2 100644 (file)
--- a/.github/docker/debian/trixie/arm64v8/public.release.Dockerfile
+++ b/.github/docker/debian/trixie/arm64v8/public.release.Dockerfile
@@ -49,7 +49,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -65,21 +64,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a arm64 -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/.github/docker/debian/trixie/arm64v8/public.unstable.Dockerfile b/.github/docker/debian/trixie/arm64v8/public.unstable.Dockerfile
index ef0ad6a7e9cf89260ec89bdde5e2c466f546a7fc..fb4e4d46e22c9affdaff807dd36b837918eadde2 100644 (file)
--- a/.github/docker/debian/trixie/arm64v8/public.unstable.Dockerfile
+++ b/.github/docker/debian/trixie/arm64v8/public.unstable.Dockerfile
@@ -49,7 +49,6 @@ COPY . ${DATA_DIR}
 WORKDIR ${DATA_DIR}
 RUN echo "export VERSION=$(cat ./build/next-release.txt | tr -d '\n')" | tee -a ~/.env
 
-RUN . ~/.env && ./debian/util.sh prep-create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 RUN . ~/.env && ./debian/util.sh prep-create-dsc -a arm64 ${CODENAME}
 
 RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
@@ -65,21 +64,22 @@ RUN --mount=type=secret,id=REPO_PASSWORD,required=true \
     rm -f /etc/apt/auth.conf
 
 ENV DEB_BUILD_OPTIONS="parallel=1"
-RUN . ~/.env && dch -b -M -v "${VERSION}-${BUILD_NUMBER}-${GIT_SHA}~${CODENAME}" \
-  --force-distribution -D "${CODENAME}" "Nightly build, ${GIT_SHA}"
+RUN . ~/.env && ./debian/util.sh create-orig -n -v${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
 
-RUN . ~/.env && ./debian/util.sh create-orig -n -V${VERSION}-${BUILD_NUMBER}-${GIT_SHA} -x
+RUN . ~/.env && ORIGFILE=$(find ../ -name "freeswitch_*.orig.tar.xz" -type f) \
+    && ./debian/util.sh create-dsc -a arm64 -z9 ${CODENAME} "$ORIGFILE"
 
-RUN dpkg-source \
-        --diff-ignore=.* \
-        --compression=xz \
-        --compression-level=9 \
-        --build \
-    . \
-    && debuild -b -us -uc \
-    && mkdir OUT \
-    && mv -v ../*.{deb,dsc,changes,tar.*} OUT/.
+WORKDIR /
+RUN dpkg-source -x freeswitch_*.dsc
+
+RUN cd freeswitch-*/ && debuild -S -sa -d -us -uc
+
+RUN cd freeswitch-*/ && debuild -b -us -uc
+
+RUN mkdir OUT && mv -v *.{deb,dsc,changes,tar.*} OUT/.
+
+RUN ls -lah /OUT
 
 # Artifacts image (mandatory part, the resulting image must have a single filesystem layer)
 FROM scratch
-COPY --from=builder /data/OUT/ /
+COPY --from=builder /OUT/ /

diff --git a/debian/util.sh b/debian/util.sh
index aefc0efebfd489a05d02cb720619970294775943..5f3dadcc208e78414ce621703dbf93961c1e231f 100755 (executable)
--- a/debian/util.sh
+++ b/debian/util.sh
@@ -46,10 +46,10 @@ find_distro () {
   case "$1" in
     experimental) echo "sid";;
     unstable) echo "sid";;
-    testing) echo "trixie";;
-    stable) echo "bookworm";;
-    oldstable) echo "bullseye";;
-    oldoldstable) echo "buster";;
+    stable) echo "trixie";;
+    oldstable) echo "bookworm";;
+    oldoldstable) echo "bullseye";;
+    oldoldoldstable) echo "buster";;
     *) echo "$1";;
   esac
 }
@@ -57,10 +57,10 @@ find_distro () {
 find_suite () {
   case "$1" in
     sid) echo "unstable";;
-    trixie) echo "testing";;
-    bookworm) echo "stable";;
-    bullseye) echo "oldstable";;
-    buster) echo "oldoldstable";;
+    trixie) echo "stable";;
+    bookworm) echo "oldstable";;
+    bullseye) echo "oldoldstable";;
+    buster) echo "oldoldoldstable";;
     *) echo "$1";;
   esac
 }
@@ -210,8 +210,8 @@ create_orig () {
       orig="../freeswitch_$(debian/version-omit_revision.pl).orig.tar.xz"
       git_archive_prefix="freeswitch/"
     else
-      orig="../freeswitch_$(mk_dver "$uver")~$(lsb_release -sc).orig.tar.xz"
-      git_archive_prefix="freeswitch-$uver/"
+      orig="../freeswitch_${uver}~$(lsb_release -sc)~$(dpkg-architecture -qDEB_BUILD_ARCH).orig.tar.xz"
+      git_archive_prefix="freeswitch/"
     fi
 
     mv .gitattributes .gitattributes.orig
@@ -360,7 +360,7 @@ create_dsc () {
 
     [ "$zl" -ge "1" ] || zl=1
 
-    dch -b -m -v "$dver" --force-distribution -D "$suite" "Nightly build."
+    dch -b -m -v "$dver" --force-distribution -D "$distro" "Nightly build."
 
     git add debian/rules debian/changelog && git commit -m "nightly v$orig_ver"