From 5861da3f33f4b812917aaa9c2703228919b79a44 Mon Sep 17 00:00:00 2001 From: Alexandre Pujol Date: Sat, 29 Mar 2025 13:57:00 +0100 Subject: [PATCH] build: set distribution name in dpkg build. --- dists/build.sh | 2 +- dists/docker.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dists/build.sh b/dists/build.sh index 523bf8ca4..1f2e204c2 100644 --- a/dists/build.sh +++ b/dists/build.sh @@ -20,7 +20,7 @@ main() { ;; dpkg) - dch --newversion="$VERSION-1" --urgency=medium --distribution=stable --controlmaint "Release $VERSION-1" + dch --newversion="$VERSION-1" --urgency=medium --distribution="$(lsb_release -sc)" --controlmaint "Release $VERSION-1" dpkg-buildpackage -b -d --no-sign lintian || true mv ../"${PKGNAME}_${VERSION}-1"_*.deb "$OUTPUT" diff --git a/dists/docker.sh b/dists/docker.sh index a99fefaf7..362691998 100644 --- a/dists/docker.sh +++ b/dists/docker.sh @@ -81,7 +81,7 @@ build_in_docker_dpkg() { docker run -tid --name "$img" --volume "$VOLUME:$BUILDIR" \ --env DISTRIBUTION="$target" "$BASEIMAGE/$dist" docker exec "$img" sudo apt-get update -q - docker exec "$img" sudo apt-get install -y config-package-dev rsync + docker exec "$img" sudo apt-get install -y config-package-dev lsb-release libdistro-info-perl [[ "$dist" == debian ]] && aptopt=(-t bookworm-backports) docker exec "$img" sudo apt-get install -y "${aptopt[@]}" golang-go fi @@ -102,7 +102,7 @@ build_in_docker_rpm() { docker pull "$BASEIMAGE/$dist" docker run -tid --name "$img" --volume "$VOLUME:$BUILDIR" \ "$BASEIMAGE/$dist" - docker exec "$img" sudo zypper install -y distribution-release golang-packaging rsync apparmor-profiles + docker exec "$img" sudo zypper install -y distribution-release golang-packaging apparmor-profiles fi docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh rpm