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

build: unify locally build package output directory.

Browse source
This commit is contained in:
Alexandre Pujol 2024-10-07 14:05:40 +01:00
parent 31af758639
commit 4f861158cf
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
5 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dists/docker.sh
View file

@ -12,6 +12,7 @@ readonly PREFIX="builder-"
readonly PKGNAME=apparmor.d
readonly VOLUME=/tmp/build
readonly BUILDIR=/home/build/tmp
readonly OUTPUT=".pkg"
readonly COMMAND="$1"
VERSION="0.$(git rev-list --count HEAD)"
PACKAGER="$(git config user.name) <$(git config user.email)>"
@ -62,7 +63,7 @@ build_in_docker_makepkg() {
fi
docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh pkg
mv "$VOLUME/$PKGNAME"-*.pkg.* .
mv "$VOLUME/$PKGNAME"-*.pkg.* "$OUTPUT"
}
build_in_docker_dpkg() {
@ -85,7 +86,7 @@ build_in_docker_dpkg() {
fi
docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh dpkg
mv "$VOLUME/$PKGNAME/${PKGNAME}_${VERSION}-1"_*.* .
mv "$VOLUME/$PKGNAME/${PKGNAME}_${VERSION}-1"_*.* "$OUTPUT"
}
build_in_docker_rpm() {
@ -104,14 +105,14 @@ build_in_docker_rpm() {
fi
docker exec --workdir="$BUILDIR/$PKGNAME" "$img" bash dists/build.sh rpm
mv "$VOLUME/$PKGNAME/$PKGNAME-$VERSION-"*.rpm .
mv "$VOLUME/$PKGNAME/$PKGNAME-$VERSION-"*.rpm "$OUTPUT"
}
main() {
case "$COMMAND" in
archlinux)
# build_in_docker_makepkg "$COMMAND"
PKGDEST=. makepkg -Cf
PKGDEST="$OUTPUT" makepkg -Cf
;;
debian | ubuntu | whonix)
@ -128,4 +129,5 @@ main() {
esac
}
mkdir -p "$OUTPUT"
main "$@"