summaryrefslogtreecommitdiff
path: root/meta-security/recipes-mac/AppArmor/files/0001-tests-regression-fix-failure-on-older-versions-of-Ma.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-security/recipes-mac/AppArmor/files/0001-tests-regression-fix-failure-on-older-versions-of-Ma.patch')
-rw-r--r--meta-security/recipes-mac/AppArmor/files/0001-tests-regression-fix-failure-on-older-versions-of-Ma.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/meta-security/recipes-mac/AppArmor/files/0001-tests-regression-fix-failure-on-older-versions-of-Ma.patch b/meta-security/recipes-mac/AppArmor/files/0001-tests-regression-fix-failure-on-older-versions-of-Ma.patch
deleted file mode 100644
index a23d889630..0000000000
--- a/meta-security/recipes-mac/AppArmor/files/0001-tests-regression-fix-failure-on-older-versions-of-Ma.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From bf8c4ca570c27cf58e882e03680b40357223e6e7 Mon Sep 17 00:00:00 2001
-From: John Johansen <john.johansen@canonical.com>
-Date: Wed, 30 Sep 2020 13:36:23 -0700
-Subject: [PATCH] tests regression: fix failure on older versions of Make
-
-Older versions of Make will choke on the # character in the $(shell
-expression, treating it as the beginning of a comment. Resulting in
-the following error
-
-make unterminated call to function 'shell': missing ')'. Stop.
-
-MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/639
-Signed-off-by: John Johansen <john.johansen@canonical.com>
-Acked-by: Steve Beattie <steve.beattie@canonical.com>
-(cherry picked from commit 8cf3534a5b11643c5913e5eb74e491f2f014d792)
-
-Upstream-Status: Backport
-[Minor fixup]
-Signed-off-by: Armin Kuster <akuster808@gmail.com>
----
- tests/regression/apparmor/Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/regression/apparmor/Makefile b/tests/regression/apparmor/Makefile
-index c3d0cfb7..1d55547c 100644
---- a/tests/regression/apparmor/Makefile
-+++ b/tests/regression/apparmor/Makefile
-@@ -69,7 +69,8 @@ endif # USE_SYSTEM
-
- CFLAGS += -g -O0 -Wall -Wstrict-prototypes
-
--USE_SYSCTL:=$(shell echo "#include <sys/sysctl.h>" | cpp -dM >/dev/null 2>/dev/null && echo true)
-+SYSCTL_INCLUDE="\#include <sys/sysctl.h>"
-+USE_SYSCTL:=$(shell echo $(SYSCTL_INCLUDE) | cpp -dM >/dev/null 2>/dev/null && echo true)
-
-
- SRC=access.c \
---
-2.17.1
-