From 3706b96fa273481572209dd3d6bf0baae49fdc31 Mon Sep 17 00:00:00 2001 From: Alexandre Pujol Date: Wed, 19 Apr 2023 18:58:50 +0100 Subject: [PATCH] build: minor improvment. --- Makefile | 3 ++- PKGBUILD | 3 +-- tests/packer/src/aa-update | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1bc3478f..68eb6d8f 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ DESTDIR ?= / BUILD := .build PKGNAME := apparmor.d VERSION := 0.$(shell git rev-list --count HEAD)-1 -P = $(notdir $(wildcard ${BUILD}/apparmor.d/*)) +P = $(filter-out dpkg,$(notdir $(wildcard ${BUILD}/apparmor.d/*))) .PHONY: all build enforce full install local $(P) pkg dpkg rpm lint clean @@ -85,6 +85,7 @@ rpm: lint: @shellcheck --shell=bash \ PKGBUILD configure dists/build.sh \ + tests/packer/src/init.sh tests/packer/src/aa-update tests/packer/init/clean.sh \ debian/${PKGNAME}.postinst debian/${PKGNAME}.postrm clean: diff --git a/PKGBUILD b/PKGBUILD index 328a5496..6d39f88e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,7 @@ # Maintainer: Alexandre Pujol # shellcheck disable=SC2034,SC2154,SC2164 -# Warning: for development only, use https://aur.archlinux.org/packages/apparmor.d-git -# for production use. +# Warning: for development only, use https://aur.archlinux.org/packages/apparmor.d-git for production use. pkgname=apparmor.d pkgver=0.001 diff --git a/tests/packer/src/aa-update b/tests/packer/src/aa-update index d082827e..e2128923 100644 --- a/tests/packer/src/aa-update +++ b/tests/packer/src/aa-update @@ -8,6 +8,6 @@ cd "$HOME/Projects/apparmor.d" case "$DISTRIBUTION" in arch) make pkg ;; debian | ubuntu | whonix) make dpkg ;; -opensuse-tumbleweed) make rpm ;; +opensuse*) make rpm ;; *) ;; esac \ No newline at end of file