From c1b4548322c7ea35a8a1c49fdffb6448fe2815d1 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Tue, 9 Oct 2018 07:42:20 +0000 Subject: crda: Fix usrmerge install path Set UDEV_RULE_DIR so we follow usrmerge paths, fixing: ERROR: QA Issue: crda package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge] Signed-off-by: Alex Kiernan Signed-off-by: Khem Raj --- meta-networking/recipes-connectivity/crda/crda_3.18.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb index 853a52346d..d5d2ab68c6 100644 --- a/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ b/meta-networking/recipes-connectivity/crda/crda_3.18.bb @@ -27,7 +27,8 @@ inherit python-dir pythonnative siteinfo DEFAULT_CRYPT ??= "gcrypt" # Recursive make problem -EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D} LIBDIR=${libdir}/crda LDLIBREG='-Wl,-rpath,${libdir}/crda -lreg'" +EXTRA_OEMAKE = "MAKEFLAGS= DESTDIR=${D} LIBDIR=${libdir}/crda LDLIBREG='-Wl,-rpath,${libdir}/crda -lreg' \ + UDEV_RULE_DIR=${nonarch_libdir}/udev/rules.d/" EXTRA_OEMAKE_append = " ${@oe.utils.conditional("DEFAULT_CRYPT", "openssl", "USE_OPENSSL=1", "", d)}" TARGET_BITS = "${SITEINFO_BITS}" export TARGET_BITS -- cgit v1.2.3-54-g00ecf