apparmor: fix issue with older use of shell in make
PATCH 1/2 apparmor: fix issue with older use of shell in make
Signed-off-by Armin Kuster <[email protected]>
--- recipes-mac/AppArmor/apparmor_2.13.4.bb | 1 + ...-fix-failure-on-older-versions-of-Ma.patch | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 recipes-mac/AppArmor/files/0001-tests-regression-fix-failure-on-older-versions-of-Ma.patch
recipes-mac/AppArmor/apparmor_2.13.4.bb +1 -0
@@ -24,6 +24,7 @@ SRC_URI = " \ file://0001-Makefile.am-suppress-perllocal.pod.patch \ file://run-ptest \ file://0001-regression-tests-Don-t-build-syscall_sysctl-if-missi.patch \ + file://0001-tests-regression-fix-failure-on-older-versions-of-Ma.patch \ " SRCREV = "df0ac742f7a1146181d8734d03334494f2015134"
recipes-mac/AppArmor/files/0001-tests-regression-fix-failure-on-older-versions-of-Ma.patch new file +40 -0
@@ -0,0 +1,40 @@ +From bf8c4ca570c27cf58e882e03680b40357223e6e7 Mon Sep 17 00:00:00 2001 +From: John Johansen <[email protected]> +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 <[email protected]> +Acked-by: Steve Beattie <[email protected]> +(cherry picked from commit 8cf3534a5b11643c5913e5eb74e491f2f014d792) + +Upstream-Status: Backport +[Minor fixup] +Signed-off-by: Armin Kuster <[email protected]> +--- + 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 +
Signature · 1 line
2.17.1
PATCH 2/2 apparmor: fix QA warning with systemd enabled
ERROR: apparmor-2.13.4-r0 do_package: QA Issue: apparmor: Files/directories were installed but not shipped in any package:
/usr/lib/systemd
/usr/lib/systemd/system
/usr/lib/systemd/system/apparmor.service
Signed-off-by Armin Kuster <[email protected]>
--- recipes-mac/AppArmor/apparmor_2.13.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-mac/AppArmor/apparmor_2.13.4.bb +1 -1
@@ -190,7 +190,7 @@ SYSTEMD_AUTO_ENABLE ?= "enable" PACKAGES += "mod-${PN}" -FILES_${PN} += "/lib/apparmor/ ${sysconfdir}/apparmor ${PYTHON_SITEPACKAGES_DIR}" +FILES_${PN} += "/lib/apparmor/ ${systemd_system_unitdir} ${sysconfdir}/apparmor ${PYTHON_SITEPACKAGES_DIR}" FILES_mod-${PN} = "${libdir}/apache2/modules/*" # Add coreutils and findutils only if sysvinit scripts are in use
Signature · 1 line
2.17.1