mirrors/apparmor.d
1
0
Fork 0
mirror of https://github.com/roddhjav/apparmor.d.git synced 2024-11-14 23:43:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: fix pkg outpout directory.

Browse Source
This commit is contained in:
Alexandre Pujol 2024-03-17 23:20:05 +00:00
parent 8290c74e66
commit 1f3da81d5a
No known key found for this signature in database
GPG Key ID: C5469996F0DF68EC
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -5,6 +5,7 @@
DESTDIR ?= / DESTDIR ?= /
BUILD := .build BUILD := .build
PKGDEST := /tmp/pkg
PKGNAME := apparmor.d PKGNAME := apparmor.d
P = $(filter-out dpkg,$(notdir $(wildcard ${BUILD}/apparmor.d/*))) P = $(filter-out dpkg,$(notdir $(wildcard ${BUILD}/apparmor.d/*)))
@ -74,11 +75,11 @@ pkg:
dpkg: dpkg:
@bash dists/build.sh dpkg @bash dists/build.sh dpkg
@sudo dpkg -i ${PKGNAME}_*.deb @sudo dpkg -i ${PKGDEST}/${PKGNAME}_*.deb
rpm: rpm:
@bash dists/build.sh rpm @bash dists/build.sh rpm
@sudo rpm -ivh --force ${PKGNAME}-*.rpm @sudo rpm -ivh --force ${PKGDEST}/${PKGNAME}-*.rpm
tests: tests:
@go test ./cmd/... -v -cover -coverprofile=coverage.out @go test ./cmd/... -v -cover -coverprofile=coverage.out

3
dists/build.sh
View File

@ -8,8 +8,7 @@
set -eu -o pipefail set -eu -o pipefail
readonly COMMAND="$1" readonly COMMAND="$1"
readonly OUTPUT="$PWD" readonly OUTPUT="${PKGDEST:-$PWD}"
readonly PKGDEST="${PKGDEST:-$PWD}"
readonly PKGNAME=apparmor.d readonly PKGNAME=apparmor.d
VERSION="0.$(git rev-list --count HEAD)" VERSION="0.$(git rev-list --count HEAD)"
readonly VERSION readonly VERSION

3
tests/packer/src/aa-update
View File

@ -23,6 +23,3 @@ debian | ubuntu | whonix)
opensuse*) make rpm ;; opensuse*) make rpm ;;
*) ;; *) ;;
esac esac
sudo rm -rf /etc/apparmor/earlypolicy/
sudo systemctl restart apparmor || sudo systemctl status apparmor