From patchwork Thu Aug 16 01:22:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 144297 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1476755ljj; Wed, 15 Aug 2018 18:22:51 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxre4pUodFtM5D4GftqKhsrWcgX1JfRYG8yGYlD5CsUIMdpXEQPNv9p4dMtuWFyvUWYVJAL X-Received: by 2002:a63:4506:: with SMTP id s6-v6mr27768774pga.422.1534382571126; Wed, 15 Aug 2018 18:22:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534382571; cv=none; d=google.com; s=arc-20160816; b=gu+oTKeSdRa0JStnDB8GXWZ0zj4orGiBoqv2HIng8wxlPJ6pEYjLg7gRMFSE69zNKj Yt5XLthBXDivhBHYNZ75twuCtW256UYMoWSo7I3MdCM66ul5fxOshCQQQSv18aCDBeL3 34uUCViWm6LwUnMPxdYqxToNSCNO48a9oPlAYfwCYiuluM+UA+Z12LWU7Q1P+/WsnY8u pUC6TY02VQFqrfR1M/iXDt2z+VGxb8PdYfmgTvz0zIBOWFL3gbRacJdOb5m4FA5DCB4h NxVkIeeiebfHeIYizIYeHxVDBjH+NYBcp+fsE2KxGDlwODfhr58IOM4cMFA8ZN2va42S Nkrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from:delivered-to :arc-authentication-results; bh=1YwC8WXJHWZEOaJjT1MtpzjboTIg/GCph9HR8xJOp10=; b=C5aFwsQ4VLRvmhiZfXSESKIFAdKIw9qUlYmMpkhvMn13DJzJ6EUcIDcQed0NlMCg37 mTF1eU+XsQJET2Q2zQzzfiNQjJlbt0VlOodscUMV45fUUm4gl3FQOSLAFMn3i+O0juNh gJysAte+Wx6d2suxpt15qL1vGiJW3BhigoKtaMFLbiubypdMtLqC9d/D3mmxK+n2TZ6J ZhSp6eRi5n020HREhOiCWW3W/0yGsFzpivZFxmjMgcjn+i4vF2jTbpBvAhAXuOOV6mEY u/4FS6LlvzpYU/Z/Q3MyKL6kU+ZnH/MfMZVGmQ3L8ix9GWyL/JY+kdNgw6FtyUTmY5km MWjQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s126-v6si28372031pfc.222.2018.08.15.18.22.50; Wed, 15 Aug 2018 18:22:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B466979241; Thu, 16 Aug 2018 01:22:48 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.17]) by mail.openembedded.org (Postfix) with ESMTP id DA3247923B for ; Thu, 16 Aug 2018 01:22:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id B57A020C46; Thu, 16 Aug 2018 01:22:47 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo03-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uDlVS6MAKipt; Thu, 16 Aug 2018 01:22:47 +0000 (UTC) Received: from mail.denix.org (pool-100-15-91-218.washdc.fios.verizon.net [100.15.91.218]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 676972014D; Thu, 16 Aug 2018 01:22:42 +0000 (UTC) Received: from gimli.denix (gimli [192.168.0.6]) by mail.denix.org (Postfix) with ESMTP id E30EF16358C; Wed, 15 Aug 2018 21:22:41 -0400 (EDT) From: Denys Dmytriyenko To: openembedded-core@lists.openembedded.org Date: Wed, 15 Aug 2018 21:22:27 -0400 Message-Id: <1534382547-55346-1-git-send-email-denis@denix.org> X-Mailer: git-send-email 2.7.4 Cc: Bruce Ashfield , Denys Dmytriyenko Subject: [OE-core] [rocko][PATCH] module-base.bbclass: fix out-of-tree module builds with custom EXTRA_OEMAKE 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org From: Denys Dmytriyenko Commit d2aa88a6a92985f21414fceea2dc0facbf7f8779 was meant to backport build dependencies on bc-native and openssl-native, but it also changed execution of do_make_scripts() from calling make directly to using oe_runmake. That change was made in master/sumo as part of a separate make-mod-scripts recipe. Unfortunately, that doesn't work here in rocko in the context of module-base class, as it gets executed inside out-of-tree module environment. Quite often those out-of-tree modules provide own Makefile with custom EXTRA_OEMAKE var defined. But do_make_scripts() gets executed within STAGING_KERNEL_DIR and cannot simply use custom EXTRA_OEMAKE set by a module. Move back to calling make and passing HOSTCC/HOSTCPP directly w/o using EXTRA_OEMAKE. For more details please see: http://lists.openembedded.org/pipermail/openembedded-core/2018-August/154189.html Signed-off-by: Denys Dmytriyenko Cc: Bruce Ashfield Cc: Richard Purdie Cc: Anuj Mittal Cc: Armin Kuster --- meta/classes/module-base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass index 9f3465e..c1fa3ad 100644 --- a/meta/classes/module-base.bbclass +++ b/meta/classes/module-base.bbclass @@ -13,7 +13,6 @@ export CROSS_COMPILE = "${TARGET_PREFIX}" export KBUILD_OUTPUT = "${STAGING_KERNEL_BUILDDIR}" DEPENDS += "bc-native" -EXTRA_OEMAKE += " HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}"" export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_BUILDDIR}/kernel-abiversion')}" KERNEL_OBJECT_SUFFIX = ".ko" @@ -25,6 +24,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" # be called before do_compile. See module.bbclass for an example. do_make_scripts() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ + make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \ + HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" \ -C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} scripts prepare }