From patchwork Thu Jun 1 09:21:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dechesne X-Patchwork-Id: 100861 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp711642qge; Thu, 1 Jun 2017 02:21:38 -0700 (PDT) X-Received: by 10.157.29.235 with SMTP id w40mr320215otw.128.1496308898295; Thu, 01 Jun 2017 02:21:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496308898; cv=none; d=google.com; s=arc-20160816; b=roXGPl4Hyfdnt55RYX29agIFep7hh/yk85H3WQQYVvRg5eKCfwGuk0KHDUeCeoxEaB VYcV+L2Rd/TsPYLBj+HXf+gyxv3a6sw8pWu79Z1LIQkSIOFvwBc8/HRvBSMBw2LVx1F+ EohewGnLi1Tv3HXQyBeEP49Wl1+6ZshKrUhem/wdkHAvX8EiVLklfN4iPQngnnUD9sUI LTSN8ZOPUbqcvXoV09YDg9vJKZNakd91o/UVESEvciTKzqAAINOgOfPzcCqXCgucGrpG VD/BR4ovyuZrVbrRC/SWgmd4Gwth3bb28+KSSkwdhyrZUJ+iMIgsT73lEbYgEF8b5Vay qAPA== 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 :dkim-signature:delivered-to:arc-authentication-results; bh=LgIgHKAlnMjH4Nq+vuGPwMHnEdeSuzz3spHS7ejvEd4=; b=x1nazwJK2/Q0Hoz7KZWRQxxG0xixIlheMEXUOPYSdlCftdC6ejNvgx4LKRVMuB6aws 9sFA6UJvT2Z8G0BmNbcWL+BVonpHDwSJ5kQ4aZUrv0MqtBnLyrUCbkW2+emdllw5JwQL TyQeaJyVXGPOYgfgB7yuGQHoRmKiVyNzSl7zctv7HdwrKm6MO+QCaQRLze1P0XvNKJPe miihbFHbvbquyFdLgDmkclY1J+SeR6hakrTb/J+LA01uvKc+nJ3IzbCO13HVynvUKwiO ENuJ49qBfKEDN+kVzNqIr9JveMjMqKSBbe+hBTD++soD7WuBy318dpwYMZ4MW+tBaXPL zShg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id e26si7840968otc.325.2017.06.01.02.21.37; Thu, 01 Jun 2017 02:21:38 -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; dkim=neutral (body hash did not verify) header.i=@linaro.org; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 002AF77E82; Thu, 1 Jun 2017 09:21:33 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-qt0-f175.google.com (mail-qt0-f175.google.com [209.85.216.175]) by mail.openembedded.org (Postfix) with ESMTP id 7F6F8606A8 for ; Thu, 1 Jun 2017 09:21:31 +0000 (UTC) Received: by mail-qt0-f175.google.com with SMTP id w1so4404016qtg.2 for ; Thu, 01 Jun 2017 02:21:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=ZU+9zhwAh44pyCt+OI4LUgNKOwNfvrZrXqtsUAkwMOI=; b=Z1hcw2Xs3lpYPt6aNC9PKHH12q8L8Ubh4dqvEYKieRaUSEslBQPNEXF6zlk/eJen09 Lnb3udfDRdu9ZR5LYNep2xlb35l5DUUwAZCAfAqklCXU7Iz/LBCTiW+saUwL0viYlhuW TYkKy0s0hY9zmAh4Qioyw0bwzZ68vxF8vglho= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZU+9zhwAh44pyCt+OI4LUgNKOwNfvrZrXqtsUAkwMOI=; b=sBGDwQe6h5yCn4hhHB+HOLkLpXjAOGcuPpiZOlRqMEFMgnq5+M0d8MisbRb8bU8p+e 6hCVzMJFEmXcl60FCDhrunHqURDfo2TSFpyFo+AX25WhVR73HhgMs2S4YB/MW1TuVYw4 AdY96jYm4XVdQx1iLLnSHlgUrFyeHv4EzgsHfhjuahuQB75iZ4q0AZqhJAwEEujH6/gQ qG5xKzys2FCyRYbHBJJE6zoZ1LHaNe1GSoW9ar77eAhDEq8PNXo/iqiqvZ1sNHt7F3+9 ambThRJ7FbH2eEVVVvHw80uHrWOIQdWaMHeEbyM53ZGpHEQsKoQ3oH6NViyTbaW3PDiq x70g== X-Gm-Message-State: AODbwcA7kWoloUQQajruTl8q3t4YVtaE6peGw6mJaAfBGW1UhhjlxmaJ Z8o+3BXtqrWrJ8XLYTW1Og== X-Received: by 10.237.61.134 with SMTP id i6mr425804qtf.241.1496308893002; Thu, 01 Jun 2017 02:21:33 -0700 (PDT) Received: from localhost.localdomain (static.8.26.4.46.clients.your-server.de. [46.4.26.8]) by smtp.gmail.com with ESMTPSA id u51sm12658423qta.56.2017.06.01.02.21.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Jun 2017 02:21:32 -0700 (PDT) From: Nicolas Dechesne To: openembedded-core@lists.openembedded.org Date: Thu, 1 Jun 2017 11:21:08 +0200 Message-Id: <20170601092108.9544-1-nicolas.dechesne@linaro.org> X-Mailer: git-send-email 2.11.0 Cc: Nicolas Dechesne Subject: [OE-core] [PATCH] kernel.bbclass: fix KERNEL_IMAGETYPE(S) for Image.gz 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 KERNEL_IMAGETYPES lists all the kernel images that we want to build. in cb17b6c2a7 (kernel.bbclass: support kernel image type of vmlinux.gz), some logic was added to support vmlinux.gz which is not a target built by kernel makefiles (only vmlinux). It is clear that the goal of this logic is only to support vmlinux.gz and not others compressed format (such as Image.gz) which are valid target for kernel makefiles. For Image.gz we should rely on the kernel makefiles and not do the compression in kernel class. This patch updates the logic used to filter out non supported kernel target from KERNEL_IMAGETYPES, and make vmlinux.gz a 'special case', instead of *.gz. If more special cases are needed in the future, we could add them in a similar way. This patch should be a no-op for anyone using vmlinux or vmlinux.gz, and on top of that it is fixing the build for Image.gz which was not working until now. Signed-off-by: Nicolas Dechesne --- meta/classes/kernel.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 7a134d5c29..459b6d66a3 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -44,7 +44,10 @@ python __anonymous () { types = (alttype + ' ' + types).strip() d.setVar('KERNEL_IMAGETYPES', types) - typeformake = re.sub(r'\.gz', '', 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 = re.sub(r'vmlinux\.gz', 'vmlinux', types) d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake) for type in types.split():