[Git][qa/jenkins.debian.net][master] rdn: correctly deal with packages with an epoch in their version again
Holger Levsen (@holger)
gitlab at salsa.debian.org
Fri May 9 12:39:17 BST 2025
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
c66113ce by Holger Levsen at 2025-05-09T13:39:07+02:00
rdn: correctly deal with packages with an epoch in their version again
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
10 changed files:
- hosts/codethink01-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/codethink02-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/codethink05-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/common-ppc64el/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/common-riscv64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/infom07-i386/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/infom08-i386/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/ionos17-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/osuosl4-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
- hosts/osuosl5-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
Changes:
=====================================
hosts/codethink01-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,6 +17,11 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
+SOURCE=$(basename "$1" | cut -d_ -f1)
+VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+echo Source: $SOURCE
+echo Source: $VERSION
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
@@ -25,8 +30,8 @@ export TMPDIR=/srv/rebuilderd/tmp ; mkdir -p $TMPDIR ; chmod 777 $TMPDIR
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian trixie main' > etc/apt/sources.list
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian sid main' >> etc/apt/sources.list
apt-get -o Dir=. update -q
-apt-get -o Dir=. source -qq --print-uris "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
-apt-get -o Dir=. source -qq --download-only "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
+apt-get -o Dir=. source -qq --print-uris "$SOURCE=$VERSION"
+apt-get -o Dir=. source -qq --download-only "$SOURCE=$VERSION"
dcmd sha256sum *.dsc
echo
@@ -34,6 +39,6 @@ echo "+-------------------------------------------------------------------------
echo "| Calling debrebuild $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
echo
-echo Rebuilding $(basename "$1") in $(pwd) now.
+echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
=====================================
hosts/codethink02-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,6 +17,11 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
+SOURCE=$(basename "$1" | cut -d_ -f1)
+VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+echo Source: $SOURCE
+echo Source: $VERSION
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
@@ -25,8 +30,8 @@ export TMPDIR=/srv/rebuilderd/tmp ; mkdir -p $TMPDIR ; chmod 777 $TMPDIR
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian trixie main' > etc/apt/sources.list
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian sid main' >> etc/apt/sources.list
apt-get -o Dir=. update -q
-apt-get -o Dir=. source -qq --print-uris "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
-apt-get -o Dir=. source -qq --download-only "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
+apt-get -o Dir=. source -qq --print-uris "$SOURCE=$VERSION"
+apt-get -o Dir=. source -qq --download-only "$SOURCE=$VERSION"
dcmd sha256sum *.dsc
echo
@@ -34,6 +39,6 @@ echo "+-------------------------------------------------------------------------
echo "| Calling debrebuild $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
echo
-echo Rebuilding $(basename "$1") in $(pwd) now.
+echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
=====================================
hosts/codethink05-arm64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,6 +17,11 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
+SOURCE=$(basename "$1" | cut -d_ -f1)
+VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+echo Source: $SOURCE
+echo Source: $VERSION
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
@@ -25,8 +30,8 @@ export TMPDIR=/srv/rebuilderd/tmp ; mkdir -p $TMPDIR ; chmod 777 $TMPDIR
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian trixie main' > etc/apt/sources.list
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian sid main' >> etc/apt/sources.list
apt-get -o Dir=. update -q
-apt-get -o Dir=. source -qq --print-uris "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
-apt-get -o Dir=. source -qq --download-only "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
+apt-get -o Dir=. source -qq --print-uris "$SOURCE=$VERSION"
+apt-get -o Dir=. source -qq --download-only "$SOURCE=$VERSION"
dcmd sha256sum *.dsc
echo
@@ -34,6 +39,6 @@ echo "+-------------------------------------------------------------------------
echo "| Calling debrebuild $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
echo
-echo Rebuilding $(basename "$1") in $(pwd) now.
+echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
=====================================
hosts/common-ppc64el/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,6 +17,11 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
+SOURCE=$(basename "$1" | cut -d_ -f1)
+VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+echo Source: $SOURCE
+echo Source: $VERSION
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
@@ -25,8 +30,8 @@ export TMPDIR=/srv/rebuilderd/tmp ; mkdir -p $TMPDIR ; chmod 777 $TMPDIR
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian trixie main' > etc/apt/sources.list
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian sid main' >> etc/apt/sources.list
apt-get -o Dir=. update -q
-apt-get -o Dir=. source -qq --print-uris "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
-apt-get -o Dir=. source -qq --download-only "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
+apt-get -o Dir=. source -qq --print-uris "$SOURCE=$VERSION"
+apt-get -o Dir=. source -qq --download-only "$SOURCE=$VERSION"
dcmd sha256sum *.dsc
echo
@@ -34,6 +39,6 @@ echo "+-------------------------------------------------------------------------
echo "| Calling debrebuild $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
echo
-echo Rebuilding $(basename "$1") in $(pwd) now.
+echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
=====================================
hosts/common-riscv64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,6 +17,11 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
+SOURCE=$(basename "$1" | cut -d_ -f1)
+VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+echo Source: $SOURCE
+echo Source: $VERSION
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
@@ -25,8 +30,8 @@ export TMPDIR=/srv/rebuilderd/tmp ; mkdir -p $TMPDIR ; chmod 777 $TMPDIR
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian trixie main' > etc/apt/sources.list
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian sid main' >> etc/apt/sources.list
apt-get -o Dir=. update -q
-apt-get -o Dir=. source -qq --print-uris "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
-apt-get -o Dir=. source -qq --download-only "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
+apt-get -o Dir=. source -qq --print-uris "$SOURCE=$VERSION"
+apt-get -o Dir=. source -qq --download-only "$SOURCE=$VERSION"
dcmd sha256sum *.dsc
echo
@@ -34,6 +39,6 @@ echo "+-------------------------------------------------------------------------
echo "| Calling debrebuild $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
echo
-echo Rebuilding $(basename "$1") in $(pwd) now.
+echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
=====================================
hosts/infom07-i386/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,6 +17,11 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
+SOURCE=$(basename "$1" | cut -d_ -f1)
+VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+echo Source: $SOURCE
+echo Source: $VERSION
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
@@ -25,8 +30,8 @@ export TMPDIR=/srv/rebuilderd/tmp ; mkdir -p $TMPDIR ; chmod 777 $TMPDIR
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian trixie main' > etc/apt/sources.list
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian sid main' >> etc/apt/sources.list
apt-get -o Dir=. update -q
-apt-get -o Dir=. source -qq --print-uris "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
-apt-get -o Dir=. source -qq --download-only "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
+apt-get -o Dir=. source -qq --print-uris "$SOURCE=$VERSION"
+apt-get -o Dir=. source -qq --download-only "$SOURCE=$VERSION"
dcmd sha256sum *.dsc
echo
@@ -34,6 +39,6 @@ echo "+-------------------------------------------------------------------------
echo "| Calling debrebuild $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
echo
-echo Rebuilding $(basename "$1") in $(pwd) now.
+echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
=====================================
hosts/infom08-i386/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,6 +17,11 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
+SOURCE=$(basename "$1" | cut -d_ -f1)
+VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+echo Source: $SOURCE
+echo Source: $VERSION
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
@@ -25,8 +30,8 @@ export TMPDIR=/srv/rebuilderd/tmp ; mkdir -p $TMPDIR ; chmod 777 $TMPDIR
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian trixie main' > etc/apt/sources.list
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian sid main' >> etc/apt/sources.list
apt-get -o Dir=. update -q
-apt-get -o Dir=. source -qq --print-uris "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
-apt-get -o Dir=. source -qq --download-only "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
+apt-get -o Dir=. source -qq --print-uris "$SOURCE=$VERSION"
+apt-get -o Dir=. source -qq --download-only "$SOURCE=$VERSION"
dcmd sha256sum *.dsc
echo
@@ -34,6 +39,6 @@ echo "+-------------------------------------------------------------------------
echo "| Calling debrebuild $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
echo
-echo Rebuilding $(basename "$1") in $(pwd) now.
+echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
=====================================
hosts/ionos17-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,6 +17,11 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
+SOURCE=$(basename "$1" | cut -d_ -f1)
+VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+echo Source: $SOURCE
+echo Source: $VERSION
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
@@ -25,8 +30,8 @@ export TMPDIR=/srv/rebuilderd/tmp ; mkdir -p $TMPDIR ; chmod 777 $TMPDIR
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian trixie main' > etc/apt/sources.list
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian sid main' >> etc/apt/sources.list
apt-get -o Dir=. update -q
-apt-get -o Dir=. source -qq --print-uris "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
-apt-get -o Dir=. source -qq --download-only "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
+apt-get -o Dir=. source -qq --print-uris "$SOURCE=$VERSION"
+apt-get -o Dir=. source -qq --download-only "$SOURCE=$VERSION"
dcmd sha256sum *.dsc
echo
@@ -34,6 +39,6 @@ echo "+-------------------------------------------------------------------------
echo "| Calling debrebuild $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
echo
-echo Rebuilding $(basename "$1") in $(pwd) now.
+echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
=====================================
hosts/osuosl4-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,6 +17,11 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
+SOURCE=$(basename "$1" | cut -d_ -f1)
+VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+echo Source: $SOURCE
+echo Source: $VERSION
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
@@ -25,8 +30,8 @@ export TMPDIR=/srv/rebuilderd/tmp ; mkdir -p $TMPDIR ; chmod 777 $TMPDIR
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian trixie main' > etc/apt/sources.list
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian sid main' >> etc/apt/sources.list
apt-get -o Dir=. update -q
-apt-get -o Dir=. source -qq --print-uris "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
-apt-get -o Dir=. source -qq --download-only "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
+apt-get -o Dir=. source -qq --print-uris "$SOURCE=$VERSION"
+apt-get -o Dir=. source -qq --download-only "$SOURCE=$VERSION"
dcmd sha256sum *.dsc
echo
@@ -34,6 +39,6 @@ echo "+-------------------------------------------------------------------------
echo "| Calling debrebuild $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
echo
-echo Rebuilding $(basename "$1") in $(pwd) now.
+echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
=====================================
hosts/osuosl5-amd64/opt/usr/libexec/rebuilderd/rebuilder-debian.sh
=====================================
@@ -17,6 +17,11 @@ For more information please go to https://reproduce.debian.net or join
EOF
echo "Preparing download of sources for $1"
+SOURCE=$(basename "$1" | cut -d_ -f1)
+VERSION=$(grep ^Version: "$1" |cut -d' ' -f2-)
+echo Source: $SOURCE
+echo Source: $VERSION
+echo
cd "$(dirname "$1")"
mkdir -p etc/apt
@@ -25,8 +30,8 @@ export TMPDIR=/srv/rebuilderd/tmp ; mkdir -p $TMPDIR ; chmod 777 $TMPDIR
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian trixie main' > etc/apt/sources.list
echo 'deb-src [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] https://deb.debian.org/debian sid main' >> etc/apt/sources.list
apt-get -o Dir=. update -q
-apt-get -o Dir=. source -qq --print-uris "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
-apt-get -o Dir=. source -qq --download-only "$(basename "$1" | cut -d_ -f1-2 | tr _ =)"
+apt-get -o Dir=. source -qq --print-uris "$SOURCE=$VERSION"
+apt-get -o Dir=. source -qq --download-only "$SOURCE=$VERSION"
dcmd sha256sum *.dsc
echo
@@ -34,6 +39,6 @@ echo "+-------------------------------------------------------------------------
echo "| Calling debrebuild $(date -u -R) |"
echo "+------------------------------------------------------------------------------+"
echo
-echo Rebuilding $(basename "$1") in $(pwd) now.
+echo "Rebuilding $SOURCE=$VERSION in $(pwd) now."
set -x
nice /usr/bin/debrebuild --buildresult="${REBUILDERD_OUTDIR}" --builder=sbuild+unshare --cache=/srv/rebuilderd/cache -- "${1}"
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/c66113ce0743b1d08604629cb3056af3c15ed5f9
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/c66113ce0743b1d08604629cb3056af3c15ed5f9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20250509/2ade5445/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list