uml-utilities: fix installed-vs-shipped with usrmerge

* fixes:
  ERROR: uml-utilities-20040406-r1 do_package: QA Issue: uml-utilities: Files/directories were installed but not shipped in any package:
    /usr/lib/uml/port-helper
  Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
  uml-utilities: 1 installed and not shipped files. [installed-vs-shipped]

* pass LIB_DIR instead of using default value from Makefile:
  $ grep LIB_DIR.*= tools/port-helper/Makefile
  LIB_DIR ?= /usr/lib/uml

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit ccba1eb6a8)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Martin Jansa
2021-04-04 01:03:27 +02:00
committed by Armin Kuster
parent 02a8f97cb6
commit e516ff377b
@@ -18,15 +18,14 @@ S = "${WORKDIR}/tools"
inherit update-alternatives inherit update-alternatives
do_compile() { do_compile() {
oe_runmake oe_runmake LIB_DIR=${libdir}/uml
} }
do_install() { do_install() {
oe_runmake install DESTDIR=${D} oe_runmake install DESTDIR=${D}
} }
FILES_${PN} += "${exec_prefix}${nonarch_base_libdir}" FILES_${PN} += "${libdir}/uml"
FILES_${PN}-dbg += "${exec_prefix}${nonarch_base_libdir}/uml/.debug"
ALTERNATIVE_${PN} = "tunctl" ALTERNATIVE_${PN} = "tunctl"
ALTERNATIVE_LINK_NAME[tunctl] = "${bindir}/tunctl" ALTERNATIVE_LINK_NAME[tunctl] = "${bindir}/tunctl"