From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.appriver.com (relay101b.appriver.com [207.97.230.15]) by mail.openembedded.org (Postfix) with ESMTP id 23C1F747FB for ; Wed, 2 May 2018 16:02:45 +0000 (UTC) X-Note: This Email was scanned by AppRiver SecureTide X-Note-AR-ScanTimeLocal: 05/02/2018 12:02:42 PM X-Note: SecureTide Build: 1/19/2018 4:03:46 PM UTC (2.6.29.0) X-Note: Filtered by 10.238.11.162 X-Note-AR-Scan: None - PIPE Received: by relay.appriver.com (CommuniGate Pro PIPE 6.2.1) with PIPE id 373193388; Wed, 02 May 2018 12:02:42 -0400 Received: from [213.210.30.29] (HELO elite.brightsign) by relay.appriver.com (CommuniGate Pro SMTP 6.2.1) with ESMTPS id 373193351; Wed, 02 May 2018 12:02:39 -0400 Received: from [fd44:d8b8:cab5:cb01::58] (helo=scoop.brightsign) by elite.brightsign with esmtp (Exim 4.89) (envelope-from ) id 1fDuDL-000GU4-8N; Wed, 02 May 2018 17:02:43 +0100 Received: from mac by scoop.brightsign with local (Exim 4.89) (envelope-from ) id 1fDuDL-0001Cb-5o; Wed, 02 May 2018 17:02:43 +0100 From: Mike Crowe To: openembedded-core@lists.openembedded.org Date: Wed, 2 May 2018 17:02:34 +0100 Message-Id: <20180502160234.4313-1-mac@mcrowe.com> X-Mailer: git-send-email 2.11.0 X-Note: This Email was scanned by AppRiver SecureTide X-Note-AR-ScanTimeLocal: 05/02/2018 12:02:39 PM X-Note: SecureTide Build: 1/19/2018 4:03:46 PM UTC (2.6.29.0) X-Note: Filtered by 10.238.11.162 X-Policy: brightsign.biz X-Primary: brightsign.biz@brightsign.biz X-Virus-Scan: V- X-Note: ICH-CT/SI:0-0/SG:1 1/1/0001 12:00:00 AM X-Note-SnifferID: 0 X-Note: TCH-CT/SI:0-50/SG:1 5/2/2018 12:01:50 PM X-GBUdb-Analysis: 0, 213.210.30.29, Ugly c=0.49162 p=-1 Source Normal X-Signature-Violations: 0-0-0-4879-c X-Note: Spam Tests Failed: X-Country-Path: ->->United Kingdom->United States X-Note-Sending-IP: 213.210.30.29 X-Note-Reverse-DNS: elite.brightsigndigital.co.uk X-Note-Return-Path: mcrowe@brightsign.biz X-Note: User Rule Hits: X-Note: Global Rule Hits: G335 G336 G337 G338 G342 G343 G475 X-Note: Encrypt Rule Hits: X-Note: Mail Class: VALID 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: Wed, 02 May 2018 16:02:46 -0000 Commit a1690131691507bbf5853540229b3ad775b836bf removed the ability of recipes to set KERNEL_IMAGETYPE_FOR_MAKE. Fix that by letting recipes continue to set their own KERNEL_IMAGETYPE_FOR_MAKE if they so wish. They may have been doing so for a while, and don't want to have their carefully-selected value trampled on by kernel.bbclass. This may be required if the recipe itself wants to build one type of kernel, but post-process it into a different type, rather like the vmlinux->vmlinux.gz support provided by kernel.bbclass. Signed-off-by: Mike Crowe --- A similar change was originally submitted 2.5 years ago as https://patchwork.openembedded.org/patch/106849/ but fell through the cracks. meta/classes/kernel.bbclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 78d6c30b07..6595a04fb1 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -69,11 +69,12 @@ python __anonymous () { types = (alttype + ' ' + types).strip() d.setVar('KERNEL_IMAGETYPES', types) - # some commonly used kernel images aren't generated by the kernel build system, such as vmlinux.gz - # typeformake lists only valid kernel make targets, and post processing can be done after the kernel - # is built (such as using gzip to compress vmlinux) - typeformake = types.replace('vmlinux.gz', 'vmlinux') - d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake) + if not d.getVar('KERNEL_IMAGETYPE_FOR_MAKE'): + # some commonly used kernel images aren't generated by the kernel build system, such as vmlinux.gz + # typeformake lists only valid kernel make targets, and post processing can be done after the kernel + # is built (such as using gzip to compress vmlinux) + typeformake = types.replace('vmlinux.gz', 'vmlinux') + d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake) for type in types.split(): typelower = type.lower() -- 2.11.0