felipe/apparmor.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: set distribution name in dpkg build.

Browse source
This commit is contained in:
Alexandre Pujol 2025-03-29 13:57:00 +01:00
parent 42818ddcf6
commit 5861da3f33
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dists/build.sh
View file

@ -20,7 +20,7 @@ main() {
;; ;;
dpkg) 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 dpkg-buildpackage -b -d --no-sign
lintian || true lintian || true
mv ../"${PKGNAME}_${VERSION}-1"_*.deb "$OUTPUT" mv ../"${PKGNAME}_${VERSION}-1"_*.deb "$OUTPUT"

4
dists/docker.sh
View file

@ -81,7 +81,7 @@ build_in_docker_dpkg() {
docker run -tid --name "$img" --volume "$VOLUME:$BUILDIR" \ docker run -tid --name "$img" --volume "$VOLUME:$BUILDIR" \
--env DISTRIBUTION="$target" "$BASEIMAGE/$dist" --env DISTRIBUTION="$target" "$BASEIMAGE/$dist"
docker exec "$img" sudo apt-get update -q 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) [[ "$dist" == debian ]] && aptopt=(-t bookworm-backports)
docker exec "$img" sudo apt-get install -y "${aptopt[@]}" golang-go docker exec "$img" sudo apt-get install -y "${aptopt[@]}" golang-go
fi fi
@ -102,7 +102,7 @@ build_in_docker_rpm() {
docker pull "$BASEIMAGE/$dist" docker pull "$BASEIMAGE/$dist"
docker run -tid --name "$img" --volume "$VOLUME:$BUILDIR" \ docker run -tid --name "$img" --volume "$VOLUME:$BUILDIR" \
"$BASEIMAGE/$dist" "$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 fi
docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh rpm docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh rpm