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

build: minor fixes.

Browse source
This commit is contained in:
Alexandre Pujol 2023-11-19 21:04:58 +00:00
parent 8686cc458f
commit d64ef39bd1
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dists/build.sh
View file

@ -22,7 +22,7 @@ main() {
dpkg) dpkg)
dch --newversion="$VERSION-1" --urgency=medium --distribution=stable --controlmaint "Release $VERSION-1" dch --newversion="$VERSION-1" --urgency=medium --distribution=stable --controlmaint "Release $VERSION-1"
dpkg-buildpackage -b -d --no-sign dpkg-buildpackage -b -d --no-sign
mv ../"${PKGNAME}_${VERSION}-1"_*.deb "$OUTPUT" mv ../"${PKGNAME}_${VERSION}-1"_*.deb .
;; ;;
rpm) rpm)

2
dists/docker.sh
View file

@ -79,7 +79,7 @@ build_in_docker_dpkg() {
--env DEBIAN_FRONTEND=noninteractive --env DISTRIBUTION="$dist" \ --env DEBIAN_FRONTEND=noninteractive --env DISTRIBUTION="$dist" \
"$BASEIMAGE/$dist" "$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 rsync
[[ "$COMMAND" == debian ]] && aptopt=(-t bookworm-backports) [[ "$COMMAND" == 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

5
tests/packer/src/aa-update
View file

@ -13,7 +13,10 @@ DISTRIBUTION="$(_lsb_release)"
cd "$HOME/Projects/apparmor.d" cd "$HOME/Projects/apparmor.d"
case "$DISTRIBUTION" in case "$DISTRIBUTION" in
arch) make pkg ;; arch) make pkg ;;
debian | ubuntu | whonix) make dpkg ;; debian | ubuntu | whonix)
make dpkg
sudo rm -rf debian/.debhelper/
;;
opensuse*) make rpm ;; opensuse*) make rpm ;;
*) ;; *) ;;
esac esac