From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mail.openembedded.org (Postfix) with ESMTP id D320E73067 for ; Wed, 22 Feb 2017 08:27:25 +0000 (UTC) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Feb 2017 00:27:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,193,1484035200"; d="scan'208";a="1114017910" Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by fmsmga001.fm.intel.com with ESMTP; 22 Feb 2017 00:27:26 -0800 From: Amarnath Valluri To: openembedded-core@lists.openembedded.org Date: Wed, 22 Feb 2017 10:26:54 +0200 Message-Id: <1487752042-19804-23-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487752042-19804-1-git-send-email-amarnath.valluri@intel.com> References: <1487752042-19804-1-git-send-email-amarnath.valluri@intel.com> In-Reply-To: <1486734151-28331-1-git-send-email-amarnath.valluri@intel.com> References: <1486734151-28331-1-git-send-email-amarnath.valluri@intel.com> Subject: [PATCH v2 23/25] lttng-modules: Replace '/lib' with ${nonarch_base_libdir} X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Feb 2017 08:27:26 -0000 Do not assume '/lib' for kernel modules location, instead use ${nonarch_base_libdir}. Because when 'usrmerge' distro feature is enabled, kernel modules are not located in /lib/modules, instead /usr/lib/modules. Signed-off-by: Amarnath Valluri --- meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb b/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb index e59d6bc..3536f26 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.9.0.bb @@ -22,11 +22,11 @@ EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'" do_install_append() { # Delete empty directories to avoid QA failures if no modules were built - find ${D}/lib -depth -type d -empty -exec rmdir {} \; + find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \; } python do_package_prepend() { - if not os.path.exists(os.path.join(d.getVar('D'), 'lib/modules')): + if not os.path.exists(os.path.join(d.getVar('D'), d.getVar('nonarch_base_libdir')[1:], 'modules')): bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN')) } -- 2.7.4