From 70fa10d2a39e7e1ab79e289e2d7339152ef02894 Mon Sep 17 00:00:00 2001 From: Alexandre Pujol Date: Sat, 3 Apr 2021 23:51:57 +0100 Subject: [PATCH] Fix CI build. --- .gitlab-ci.yml | 2 +- PKGBUILD | 4 +--- configure | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index efef3119..3c3f43c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ debian: script: - VERSION="$(date +%y.%m%d)-1" - mkdir -p "$PKGDEST" - - sudo apt-get update -q && sudo apt-get install -y config-package-dev dh-apparmor + - sudo apt-get update -q && sudo apt-get install -y config-package-dev rsync - dch --newversion=$VERSION --urgency=medium --distribution=stable --controlmaint "Release $VERSION" - dpkg-buildpackage -b -d --no-sign - mv ../*.deb $PKGDEST/ diff --git a/PKGBUILD b/PKGBUILD index e59fd77e..c39a777d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,15 +9,13 @@ arch=("any") url="https://gitlab.com/archlex/hardening/$pkgname" license=('GPL2') depends=('apparmor') -source=("git+file://$PWD?signed") -sha512sums=('SKIP') -validpgpkeys=("06A26D531D56C42D66805049C5469996F0DF68EC") pkgver() { date +%y.%m%d } prepare() { + git clone "$startdir" "$srcdir/$pkgname" cd "$srcdir/$pkgname" ./configure --distribution=archlinux --flavor=desktop diff --git a/configure b/configure index 437ce9fa..bd79eb63 100755 --- a/configure +++ b/configure @@ -83,7 +83,7 @@ generate() { [[ "$profile" =~ ^\# ]] && continue path="${ROOT:?}/apparmor.d/profiles/$profile" - if [[ -f "$path" ]]; then + if [[ ! -f "$path" ]]; then [[ "$DISTRIBUTION" == debian ]] && continue _die "Profile $profile not found" fi