mirrors/apparmor.d
1
0
Fork 0
mirror of https://github.com/roddhjav/apparmor.d.git synced 2024-12-24 14:06:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

build: minor improvements.

Browse source
This commit is contained in:
Alexandre Pujol 2023-10-21 21:51:23 +01:00
parent a8be57a1db
commit cdf601ca5c
Failed to generate hash of commit
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dists/build.sh
View file

@ -16,7 +16,7 @@ readonly VERSION
main() { main() {
case "$COMMAND" in case "$COMMAND" in
pkg) pkg)
PKGDEST=. makepkg --syncdeps --force --cleanbuild --noconfirm --noprogressbar PKGDEST="$OUTPUT" makepkg --syncdeps --force --cleanbuild --noconfirm --noprogressbar
;; ;;
dpkg) dpkg)

7
dists/docker.sh
View file

@ -56,9 +56,8 @@ build_in_docker_makepkg() {
else else
docker pull "$BASEIMAGE/$dist" docker pull "$BASEIMAGE/$dist"
docker run -tid --name "$img" --volume "$VOLUME:$BUILDIR" \ docker run -tid --name "$img" --volume "$VOLUME:$BUILDIR" \
--env MAKEFLAGS="-j$(nproc)" --env PACKAGER="$PACKAGER" \ --env PKGDEST="$BUILDIR" --env PACKAGER="$PACKAGER" \
--env BUILDDIR=/tmp/build --env PKGDEST="$BUILDIR" \ --env BUILDDIR=/tmp/build \
--env DIST="$dist" \
"$BASEIMAGE/$dist" "$BASEIMAGE/$dist"
fi fi
@ -77,7 +76,7 @@ build_in_docker_dpkg() {
else else
docker pull "$BASEIMAGE/$dist" docker pull "$BASEIMAGE/$dist"
docker run -tid --name "$img" --volume "$VOLUME:$BUILDIR" \ docker run -tid --name "$img" --volume "$VOLUME:$BUILDIR" \
--env DEBIAN_FRONTEND=noninteractive --env DIST="$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