aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZang Ruochen <zangrc.fnst@cn.fujitsu.com>2019-06-06 15:41:47 +0800
committerArmin Kuster <akuster808@gmail.com>2019-06-10 07:35:18 -0700
commit376d34368e92e57e88d441980f1c8f63390e7f71 (patch)
treef1619d118d2bd7c52a0e949fc008fbe6a16fc6d3
parent74445465e3b248bb4df6c6c8985e35de52dbeb36 (diff)
downloadmeta-security-376d34368e92e57e88d441980f1c8f63390e7f71.tar.gz
meta-security-376d34368e92e57e88d441980f1c8f63390e7f71.tar.bz2
meta-security-376d34368e92e57e88d441980f1c8f63390e7f71.zip
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.bb4
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"
do_install () {
install -d ${D}${sbindir}
- install -d ${D}${libdir}/perl/site_perl/Curses
- ln -sf perl ${D}/${libdir}/perl5
+ install -d ${D}${libdir}/perl5/site_perl/Curses
install -d ${D}${libdir}/Bastille
install -d ${D}${libdir}/Bastille/API
@@ -51,7 +50,6 @@ do_install () {
install -d ${D}${datadir}/Bastille/OSMap/Modules
install -d ${D}${datadir}/Bastille/Questions
install -d ${D}${datadir}/Bastille/FKL/configs/
- install -d ${D}${localstatedir}/lock/subsys/bastille
install -d ${D}${localstatedir}/log/Bastille
install -d ${D}${sysconfdir}/Bastille
install -m 0755 AutomatedBastille ${D}${sbindir}