diff options
author | Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2019-06-06 15:41:47 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2019-06-10 07:38:28 -0700 |
commit | 7df33d377a93fe0bb92d4f76596ac2d458c7e70f (patch) | |
tree | 541cc9ec733a957ec42b15367150658d5e82c4c0 | |
parent | 74dfe37b0914101ca35688e68d3d8a953ef52583 (diff) | |
download | meta-security-7df33d377a93fe0bb92d4f76596ac2d458c7e70f.tar.gz |
bastille: solved the conflict with perl-module-text-wrap and base-files
-Remove the link to perl5 to resolve the conflict with perl-module-text-wrap.
-Remove the operation on /var/lock to resolve the conflict with base-files.
Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | recipes-security/bastille/bastille_3.2.1.bb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/recipes-security/bastille/bastille_3.2.1.bb b/recipes-security/bastille/bastille_3.2.1.bb index 152c03a..e9accb5 100644 --- a/recipes-security/bastille/bastille_3.2.1.bb +++ b/recipes-security/bastille/bastille_3.2.1.bb | |||
@@ -41,8 +41,7 @@ S = "${WORKDIR}/Bastille" | |||
41 | 41 | ||
42 | do_install () { | 42 | do_install () { |
43 | install -d ${D}${sbindir} | 43 | install -d ${D}${sbindir} |
44 | install -d ${D}${libdir}/perl/site_perl/Curses | 44 | install -d ${D}${libdir}/perl5/site_perl/Curses |
45 | ln -sf perl ${D}/${libdir}/perl5 | ||
46 | 45 | ||
47 | install -d ${D}${libdir}/Bastille | 46 | install -d ${D}${libdir}/Bastille |
48 | install -d ${D}${libdir}/Bastille/API | 47 | install -d ${D}${libdir}/Bastille/API |
@@ -51,7 +50,6 @@ do_install () { | |||
51 | install -d ${D}${datadir}/Bastille/OSMap/Modules | 50 | install -d ${D}${datadir}/Bastille/OSMap/Modules |
52 | install -d ${D}${datadir}/Bastille/Questions | 51 | install -d ${D}${datadir}/Bastille/Questions |
53 | install -d ${D}${datadir}/Bastille/FKL/configs/ | 52 | install -d ${D}${datadir}/Bastille/FKL/configs/ |
54 | install -d ${D}${localstatedir}/lock/subsys/bastille | ||
55 | install -d ${D}${localstatedir}/log/Bastille | 53 | install -d ${D}${localstatedir}/log/Bastille |
56 | install -d ${D}${sysconfdir}/Bastille | 54 | install -d ${D}${sysconfdir}/Bastille |
57 | install -m 0755 AutomatedBastille ${D}${sbindir} | 55 | install -m 0755 AutomatedBastille ${D}${sbindir} |