diff options
author | Naveen Saini <naveen.kumar.saini@intel.com> | 2019-09-23 10:17:16 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2019-09-29 16:13:37 -0700 |
commit | 86ba098074c70a9b1209db980d4da410c25f61aa (patch) | |
tree | 67123732890f4e3cdad54e8a7e419c26a526ec1d | |
parent | 46549c0ea509a8544f775cfefc7a2854f4c87ff2 (diff) | |
download | meta-security-86ba098074c70a9b1209db980d4da410c25f61aa.tar.gz |
apparmor: suppress appending of installation to perllocal.pod
perl modules when gets installed can produce a perllocal.pod
file for documenting a list of locally installed perl modules.
This can conflict if multiple packages generate the file.
Hits the conflict with apparmor & rrdtool packages.
Error: Transaction check error:
file /usr/lib/perl5/5.30.0/x86_64-linux/perllocal.pod conflicts between attempted installs of rrdtool-1.7.2-r0.corei7_64 and apparmor-2.13.3-r0.corei7_64
perllocal.pod files are for documentation purpose, so
disabling does not harm. Generating perllocal.pod for perl
module is disabled by passing NO_PERLLOCAL=1
with ExtUtils::MakeMaker utility.
https://perldoc.perl.org/5.30.0/ExtUtils/MakeMaker.html#Using-Attributes-and-Parameters
[YOCTO #13491]
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-mac/AppArmor/apparmor_2.13.3.bb | 1 | ||||
-rw-r--r-- | recipes-mac/AppArmor/files/0001-Makefile.am-suppress-perllocal.pod.patch | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/recipes-mac/AppArmor/apparmor_2.13.3.bb b/recipes-mac/AppArmor/apparmor_2.13.3.bb index 8484404..2e5d221 100644 --- a/recipes-mac/AppArmor/apparmor_2.13.3.bb +++ b/recipes-mac/AppArmor/apparmor_2.13.3.bb | |||
@@ -21,6 +21,7 @@ SRC_URI = " \ | |||
21 | file://functions \ | 21 | file://functions \ |
22 | file://apparmor \ | 22 | file://apparmor \ |
23 | file://apparmor.service \ | 23 | file://apparmor.service \ |
24 | file://0001-Makefile.am-suppress-perllocal.pod.patch \ | ||
24 | file://run-ptest \ | 25 | file://run-ptest \ |
25 | " | 26 | " |
26 | 27 | ||
diff --git a/recipes-mac/AppArmor/files/0001-Makefile.am-suppress-perllocal.pod.patch b/recipes-mac/AppArmor/files/0001-Makefile.am-suppress-perllocal.pod.patch new file mode 100644 index 0000000..9807be1 --- /dev/null +++ b/recipes-mac/AppArmor/files/0001-Makefile.am-suppress-perllocal.pod.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 9f9cfbf07214ac68a55372a3c2777192765cbeb9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Naveen Saini <naveen.kumar.saini@intel.com> | ||
3 | Date: Fri, 20 Sep 2019 18:53:53 +0800 | ||
4 | Subject: [PATCH] Makefile.am: suppress perllocal.pod | ||
5 | |||
6 | Upstream-Status: Inappropriate [OE-Specific] | ||
7 | |||
8 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
9 | --- | ||
10 | libraries/libapparmor/swig/perl/Makefile.am | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/libraries/libapparmor/swig/perl/Makefile.am b/libraries/libapparmor/swig/perl/Makefile.am | ||
14 | index 6ae4e30c..be00dc7f 100644 | ||
15 | --- a/libraries/libapparmor/swig/perl/Makefile.am | ||
16 | +++ b/libraries/libapparmor/swig/perl/Makefile.am | ||
17 | @@ -11,7 +11,7 @@ MOSTLYCLEANFILES=libapparmor_wrap.c LibAppArmor.pm | ||
18 | LibAppArmor.pm: libapparmor_wrap.c | ||
19 | |||
20 | Makefile.perl: Makefile.PL LibAppArmor.pm | ||
21 | - $(PERL) $< PREFIX=$(prefix) MAKEFILE=$@ | ||
22 | + $(PERL) $< PREFIX=$(prefix) MAKEFILE=$@ NO_PERLLOCAL=1 | ||
23 | sed -ie 's/LD_RUN_PATH="\x24(LD_RUN_PATH)"//g' Makefile.perl | ||
24 | sed -ie 's/^LD_RUN_PATH.*//g' Makefile.perl | ||
25 | |||
26 | -- | ||
27 | 2.17.1 | ||
28 | |||