From 7df33d377a93fe0bb92d4f76596ac2d458c7e70f Mon Sep 17 00:00:00 2001 From: Zang Ruochen Date: Thu, 6 Jun 2019 15:41:47 +0800 Subject: 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 Signed-off-by: Armin Kuster --- recipes-security/bastille/bastille_3.2.1.bb | 4 +--- 1 file changed, 1 insertion(+), 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} -- cgit v1.2.3-54-g00ecf