From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.appriver.com (relay.appriver.com [207.97.230.34]) by mail.openembedded.org (Postfix) with ESMTP id 75B8575D4A for ; Thu, 5 Nov 2015 14:47:45 +0000 (UTC) Received: from [86.30.112.98] (HELO elite.brightsign) by relay.appriver.com (CommuniGate Pro SMTP 6.1.2) with ESMTP id 635311336; Thu, 05 Nov 2015 09:47:45 -0500 Received: from chuckie.brightsign ([172.30.1.25] helo=chuckie) by elite.brightsign with esmtp (Exim 4.84) (envelope-from ) id 1ZuLpH-0009aO-Ux; Thu, 05 Nov 2015 14:47:43 +0000 Received: from mac by chuckie with local (Exim 4.84) (envelope-from ) id 1ZuLpH-0001au-Ty; Thu, 05 Nov 2015 14:47:43 +0000 From: Mike Crowe To: openembedded-core@lists.openembedded.org Date: Thu, 5 Nov 2015 14:47:40 +0000 Message-Id: <1446734860-6091-1-git-send-email-mac@mcrowe.com> X-Mailer: git-send-email 2.1.4 Cc: Mike Crowe Subject: [PATCH] kernel: Permit overriding of KERNEL_IMAGETYPE_FOR_MAKE 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: Thu, 05 Nov 2015 14:47:45 -0000 Commit a1690131691507bbf5853540229b3ad775b836bf removed the ability of recipes to set KERNEL_IMAGETYPE_FOR_MAKE. This can be fixed by only setting KERNEL_IMAGETYPE_FOR_MAKE if it doesn't already have a value. This should hopefully be a good enough approximation to the behaviour prior to that commit to keep such recipes working. Signed-off-by: Mike Crowe --- meta/classes/kernel.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 5e8b6cf..8d780c3 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -21,7 +21,8 @@ python __anonymous () { kerneltype = d.getVar('KERNEL_IMAGETYPE', True) - d.setVar("KERNEL_IMAGETYPE_FOR_MAKE", re.sub(r'\.gz$', '', kerneltype)) + if not d.getVar("KERNEL_IMAGETYPE_FOR_MAKE", False): + d.setVar("KERNEL_IMAGETYPE_FOR_MAKE", re.sub(r'\.gz$', '', kerneltype)) image = d.getVar('INITRAMFS_IMAGE', True) if image: -- 2.1.4