summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-04-06 20:42:31 +0200
committerArmin Kuster <akuster808@gmail.com>2021-04-10 07:37:40 -0700
commit1cc2e4355053ac47fcd766a98870e130e39c92f9 (patch)
tree4a0914a32e0d65f4fc2fe4585b7275d77c09891d
parent845bd5a5f15bd80cecbf5c0716af3eaca5669632 (diff)
downloadmeta-openembedded-1cc2e4355053ac47fcd766a98870e130e39c92f9.tar.gz
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: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
index 8e00cb3ea4..f86b2b912e 100644
--- a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
+++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
@@ -18,15 +18,14 @@ S = "${WORKDIR}/tools"
18inherit update-alternatives 18inherit update-alternatives
19 19
20do_compile() { 20do_compile() {
21 oe_runmake 21 oe_runmake LIB_DIR=${libdir}/uml
22} 22}
23 23
24do_install() { 24do_install() {
25 oe_runmake install DESTDIR=${D} 25 oe_runmake install DESTDIR=${D}
26} 26}
27 27
28FILES_${PN} += "${exec_prefix}${nonarch_base_libdir}" 28FILES_${PN} += "${libdir}/uml"
29FILES_${PN}-dbg += "${exec_prefix}${nonarch_base_libdir}/uml/.debug"
30 29
31ALTERNATIVE_${PN} = "tunctl" 30ALTERNATIVE_${PN} = "tunctl"
32ALTERNATIVE_LINK_NAME[tunctl] = "${bindir}/tunctl" 31ALTERNATIVE_LINK_NAME[tunctl] = "${bindir}/tunctl"