From e04d5631d3907c90b67f73c50d33fe941a3722be Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 30 May 2023 16:16:09 +0200 Subject: switchtec-user: fix installed-vs-shipped with multilib * fixes: ERROR: QA Issue: switchtec-user: Files/directories were installed but not shipped in any package: /usr/lib/libswitchtec.a /usr/lib/libswitchtec.so /usr/lib/libswitchtec.so.4.0 Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. switchtec-user: 3 installed and not shipped files. [installed-vs-shipped] when libdir is e.g. /usr/lib64 The Makefile.in defines default LIBDIR with DESTDIR: LIBDIR ?= $(DESTDIR)$(PREFIX)/lib so include ${D} here as well * use 4 spaces for indentation and ' instead of " so that it doesn't need backslashes Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- meta-oe/recipes-support/switchtec-user/switchtec-user_4.1.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta-oe/recipes-support/switchtec-user/switchtec-user_4.1.bb b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.1.bb index 6d5c9f1a67..443e5bc493 100644 --- a/meta-oe/recipes-support/switchtec-user/switchtec-user_4.1.bb +++ b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.1.bb @@ -3,12 +3,13 @@ HOMEPAGE = "https://github.com/Microsemi/switchtec-user" SECTION = "console/utils" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3d6b07c89629cff2990d2e8e1f4c2382" + DEPENDS = "ncurses openssl" -SRCREV = "762ba441d2c02685f98e5f56e984db033bab279a" +SRCREV = "762ba441d2c02685f98e5f56e984db033bab279a" SRC_URI = " \ - git://github.com/Microsemi/switchtec-user.git;protocol=https;branch=master \ - file://0001-cli-Fix-format-security-warning.patch \ + git://github.com/Microsemi/switchtec-user.git;protocol=https;branch=master \ + file://0001-cli-Fix-format-security-warning.patch \ " SRC_URI[sha256sum] = "f98c1fe23e1d7a11fb23e8bcf9b563929fc805ea669191a7fd525ad16519f655" @@ -16,8 +17,8 @@ S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig -EXTRA_OEMAKE = "DESTDIR=\"${D}\" PREFIX=\"${prefix}\" LDCONFIG=\"true\"" +EXTRA_OEMAKE = "DESTDIR='${D}' PREFIX='${prefix}' LDCONFIG='true' LIBDIR='${D}${libdir}'" do_install () { - oe_runmake install + oe_runmake install } -- cgit v1.2.3-54-g00ecf