open-iscsi-user: Fix do_package error after usrmerge was enabled.

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>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files 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}
 }