meta-virtualization.lists.yoctoproject.org archive mirror
 help / color / mirror / Atom feed
From: leimaohui@fujitsu.com
To: meta-virtualization@lists.yoctoproject.org
Cc: Lei Maohui <leimaohui@fujitsu.com>
Subject: [meta-virtualization] [meta-cloud-services][PATCH] open-iscsi-user: Fix do_package error after usrmerge was enabled.
Date: Fri,  8 Sep 2023 10:42:43 +0800	[thread overview]
Message-ID: <20230908024243.222363-1-leimaohui@fujitsu.com> (raw)

From: Lei Maohui <leimaohui@fujitsu.com>

ERROR: open-iscsi-user-2.1.7-r1 do_package: QA Issue: open-iscsi-user: Files/directories were installed but not shipped in any package:
  /lib
  /sbin/iscsiuio
  /sbin/brcm_iscsiuio
  /lib/systemd
  /lib/systemd/system-generators
  /lib/systemd/system
  /lib/systemd/system-generators/ibft-rule-generator
  /lib/systemd/system/iscsi-init.service
  /lib/systemd/system/iscsi.service
  /lib/systemd/system/iscsid.service
  /lib/systemd/system/iscsid.socket
  /lib/systemd/system/iscsiuio.socket
  /lib/systemd/system/iscsiuio.service
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
open-iscsi-user: 13 installed and not shipped files. [installed-vs-shipped]

Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
---
 .../open-iscsi/open-iscsi-user_2.1.7.bb                | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb
index 8cedff4..1f84508 100644
--- a/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb
+++ b/meta-openstack/recipes-connectivity/open-iscsi/open-iscsi-user_2.1.7.bb
@@ -44,12 +44,6 @@ FILES:${PN} += " \
     ${systemd_unitdir}/system-generators/ibft-rule-generator \
 "
 
-do_install:append() {
-    rm -rf ${D}${systemd_unitdir}/
-
-    install -d ${D}${systemd_unitdir}/system
-    install -d ${D}${systemd_unitdir}/system-generators
-    install -m 0644 ${S}/etc/systemd/*.service ${D}${systemd_unitdir}/system/
-    install -m 0644 ${S}/etc/systemd/*.socket ${D}${systemd_unitdir}/system/
-    install -m 0644 ${S}/etc/systemd/ibft-rule-generator ${D}${systemd_unitdir}/system-generators/
+do_install() {
+    oe_runmake install DESTDIR=${D} prefix=${exec_prefix} LIBDIR=${libdir} sbindir=${sbindir} SBINDIR=${sbindir} systemddir=${systemd_unitdir}
 }
-- 
2.34.1



             reply	other threads:[~2023-09-08  2:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-08  2:42 leimaohui [this message]
2023-09-08 20:07 ` [meta-virtualization] [meta-cloud-services][PATCH] open-iscsi-user: Fix do_package error after usrmerge was enabled Bruce Ashfield

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230908024243.222363-1-leimaohui@fujitsu.com \
    --to=leimaohui@fujitsu.com \
    --cc=meta-virtualization@lists.yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).