From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 63CDDE00E7D; Wed, 13 Nov 2019 17:50:08 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, * medium trust * [192.103.53.11 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mail5.wrs.com (mail5.windriver.com [192.103.53.11]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 5108CE00E73 for ; Wed, 13 Nov 2019 17:50:03 -0800 (PST) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail5.wrs.com (8.15.2/8.15.2) with ESMTPS id xAE1o1GV017024 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Wed, 13 Nov 2019 17:50:01 -0800 Received: from localhost (128.224.158.241) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.3.468.0; Wed, 13 Nov 2019 17:50:01 -0800 From: Yi Zhao To: , , Date: Thu, 14 Nov 2019 09:48:59 +0800 Message-ID: <20191114014901.22862-18-yi.zhao@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191114014901.22862-1-yi.zhao@windriver.com> References: <20191114014901.22862-1-yi.zhao@windriver.com> MIME-Version: 1.0 X-Originating-IP: [128.224.158.241] Subject: [meta-selinux][PATCH 17/19] selinux-init: fix build error when enable usrmerge feature X-BeenThere: yocto@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Discussion of all things Yocto Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2019 01:50:08 -0000 Content-Type: text/plain Fix the following error when enable usrmerge feature: ERROR: selinux-init-0.1-r0 do_package: QA Issue: selinux-init: Files/directories were installed but not shipped in any package: /usr Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. selinux-init: 1 installed and not shipped files. [installed-vs-shipped] We don't need to install systemd service file when systemd feature is not enabled. Signed-off-by: Yi Zhao --- recipes-security/selinux/selinux-initsh.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes-security/selinux/selinux-initsh.inc b/recipes-security/selinux/selinux-initsh.inc index 8e31cda..f27750d 100644 --- a/recipes-security/selinux/selinux-initsh.inc +++ b/recipes-security/selinux/selinux-initsh.inc @@ -27,10 +27,9 @@ do_install () { -e '/.*HERE$/d' -e '/.*Contents.*sysvinit/d' \ ${D}${sysconfdir}/init.d/${SELINUX_SCRIPT_DST} - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.service ${D}${systemd_unitdir}/system - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.service ${D}${systemd_unitdir}/system install -d ${D}${bindir} install -m 0755 ${WORKDIR}/${SELINUX_SCRIPT_SRC}.sh ${D}${bindir} sed -i -e '/.*HERE$/d' ${D}${bindir}/${SELINUX_SCRIPT_SRC}.sh -- 2.17.1