From patchwork Thu Dec 1 15:25:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16289 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6A6BC47089 for ; Thu, 1 Dec 2022 15:25:42 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web11.46683.1669908337895714543 for ; Thu, 01 Dec 2022 07:25:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=TnrwZvp8; spf=softfail (domain: sakoman.com, ip: 209.85.216.53, mailfrom: steve@sakoman.com) Received: by mail-pj1-f53.google.com with SMTP id hd14-20020a17090b458e00b0021909875bccso4368930pjb.1 for ; Thu, 01 Dec 2022 07:25:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4kg3+v19znbO28+g/pFzy4If2kfBicC0jh1kPXmKgeE=; b=TnrwZvp8/wRSJh02x0Hv0b730apr3VE/kjEWvYJMMFAL+BrqJusB07jFePKxodifdt 5tEReGZLoQRdRrp0BuduhNWnNCWLa6YzcBc+A600Ne6BiMTdbQyaYSLCMAEPgCv9dfih 7kG56HPwvnXnXKuGmaoxfwNAHSNQC41Z0GVavepMWjVwNb7ub3/BPP5xL6hPt+7BvnZL tTOH8IPpM4EPw48sg/FkK+39iToqi1YmL6GIPqF0j0wrlACBpwy4ua0oTjmJCGYkx8pw LEly3rNvDTtz0E53RPZ++sREU7GIctotfkYua23aZoUCkYoWD6FmGXWKrviKQr00ObYk x9Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4kg3+v19znbO28+g/pFzy4If2kfBicC0jh1kPXmKgeE=; b=RAWdwIUc7r2j4eJkZvJkvZnXZv/Ff21SX/TN3GgGUEV2W9Xij6s3suhdxpn0mbq2Bq HJDhfNbV2ZgpnTQWQiO6WcqpS3TAqLSzMrYaPGma3Sm5DMihubJKn2Ax7KzKfZ9Cum25 hKptER8vQyqx2Ej0PTpjDoZ2M1kesNwO8is1K0dYFiQTgARfTlFGR0/c11Rj6meIWzhg veB+enTGXucGSZLcWE8y7HeFIu2ewudgnXHubaiyU/MOIu5/YEwL6B7sYntlM2ntDUVU 69w35uhJZS3qDxosWNZLopkvLJa05BMr8nEal/cp0G5oadWMyrHeJvnnuCWzE5HmnB9U NTUg== X-Gm-Message-State: ANoB5pkkdsZrGUNhi0XcyDE0LeEEK7Zo0h2WW0wDkAKSBqsmRYfiHGo/ vJ6DsMgT7ZalodBmORvl6AgRf5NL7NnR2vRIfC4= X-Google-Smtp-Source: AA0mqf6PrDIcT22PUjpfkLORBNf2RGejSB77pe5PKCtENB5WoSn0Cd/XCkC4pRWQbOILlbewlfZjow== X-Received: by 2002:a17:902:d349:b0:189:324:27cc with SMTP id l9-20020a170902d34900b00189032427ccmr47550477plk.70.1669908336672; Thu, 01 Dec 2022 07:25:36 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id jc18-20020a17090325d200b001891a17bd93sm3812769plb.43.2022.12.01.07.25.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 07:25:36 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 1/7] pixman: backport fix for CVE-2022-44638 Date: Thu, 1 Dec 2022 05:25:15 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 Dec 2022 15:25:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174114 From: Ross Burton (From OE-Core rev: 1d2e131d9ba55626354264d454b2808e84751600) Signed-off-by: Ross Burton Signed-off-by: Steve Sakoman (cherry picked from commit 23df4760ebc153c484d467e51b414910c570a6f8) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie (cherry picked from commit 37595eeddfb01110d8cdc628be76a8bf6bde483a) Signed-off-by: Bhabu Bindu Signed-off-by: Steve Sakoman --- .../xorg-lib/pixman/CVE-2022-44638.patch | 34 +++++++++++++++++++ .../xorg-lib/pixman_0.38.4.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-graphics/xorg-lib/pixman/CVE-2022-44638.patch diff --git a/meta/recipes-graphics/xorg-lib/pixman/CVE-2022-44638.patch b/meta/recipes-graphics/xorg-lib/pixman/CVE-2022-44638.patch new file mode 100644 index 0000000000..d54ae16b33 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/pixman/CVE-2022-44638.patch @@ -0,0 +1,34 @@ +CVE: CVE-2022-44638 +Upstream-Status: Backport +Signed-off-by: Ross Burton +Signed-off-by:Bhabu Bindu + +From a1f88e842e0216a5b4df1ab023caebe33c101395 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Wed, 2 Nov 2022 12:07:32 -0400 +Subject: [PATCH] Avoid integer overflow leading to out-of-bounds write + +Thanks to Maddie Stone and Google's Project Zero for discovering this +issue, providing a proof-of-concept, and a great analysis. + +Closes: https://gitlab.freedesktop.org/pixman/pixman/-/issues/63 +--- + pixman/pixman-trap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pixman/pixman-trap.c b/pixman/pixman-trap.c +index 91766fd..7560405 100644 +--- a/pixman/pixman-trap.c ++++ b/pixman/pixman-trap.c +@@ -74,7 +74,7 @@ pixman_sample_floor_y (pixman_fixed_t y, + + if (f < Y_FRAC_FIRST (n)) + { +- if (pixman_fixed_to_int (i) == 0x8000) ++ if (pixman_fixed_to_int (i) == 0xffff8000) + { + f = 0; /* saturate */ + } +-- +GitLab + diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb b/meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb index 22e19ba069..5873c19bab 100644 --- a/meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb +++ b/meta/recipes-graphics/xorg-lib/pixman_0.38.4.bb @@ -10,6 +10,7 @@ DEPENDS = "zlib" SRC_URI = "https://www.cairographics.org/releases/${BP}.tar.gz \ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \ + file://CVE-2022-44638.patch \ " SRC_URI[md5sum] = "267a7af290f93f643a1bc74490d9fdd1" SRC_URI[sha256sum] = "da66d6fd6e40aee70f7bd02e4f8f76fc3f006ec879d346bae6a723025cfbdde7" From patchwork Thu Dec 1 15:25:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16287 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2DBBC4321E for ; Thu, 1 Dec 2022 15:25:42 +0000 (UTC) Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by mx.groups.io with SMTP id smtpd.web10.46613.1669908339739228776 for ; Thu, 01 Dec 2022 07:25:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=0s+U/rjq; spf=softfail (domain: sakoman.com, ip: 209.85.215.175, mailfrom: steve@sakoman.com) Received: by mail-pg1-f175.google.com with SMTP id w37so1950342pga.5 for ; Thu, 01 Dec 2022 07:25:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=abF55vm8vv7I1KGn6J1eja3q2cgksRZGSHDKYFE+PIQ=; b=0s+U/rjq0rHyvx9WFKBtqlm1RCkoS51+v2H/NYUQoZxSRrQ3lwawd4wCOgem3c1vDE WPJ5KXWd1JMGOorl68/9POeGAV3A1zo+l3K+H+8dUY8gmNK2AlHKAXFyBS1l/FCxXGX1 wGLF5Qwe+3cNVBx9E0yvRFodMABKo8jFuGBwkZWQkPwW0cQHLVjd00yOq5juBiCqBqYN h3ickoKEcpV1OYNlgvI3gOkJCYwjGWbkW8ATNxc9E2FmfmsEPvXvkK1LmCB565ko/IzN K3gq4Sc1uwwbUOq8a2WG7rQK8eh0v5HZ8lJrHAJjyrQY0YvvWckxNxhLC9E65b/XxUSL 5txg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=abF55vm8vv7I1KGn6J1eja3q2cgksRZGSHDKYFE+PIQ=; b=tpo3Ti9FLZteaLpkhdOSzHHIjm4ZegdFu6vxcJKMxS1BL1TG7N46U9XO9jL0TxLJ5O 4Hq4reOrMTYJGGGMbXouj62XiTw8hYV9ovvD0cGYKLiJotdBo98zMiT1N/rymt5NdT1S 3kJL2gMLf4B4YxcntqnLyS67fmJvh1VntwH89flQwSLWo64F63H+N79NVPZadovVoH+3 Nq8+FGj83xL+QjTVAR5C6TKy8CrvQiSR5TJn2Z/pCSozwd3t/BMunpRhcJWZkaXXX7uT EWq6XZv6/JTz+P6PKEKPxGeDwbtD9Nm2WcnkoHmOS2rwu/49BeUo3Xu2Kz1KFXanZbqG CSvg== X-Gm-Message-State: ANoB5pmsx37/2OhzbQDyzn+YLKWok+nBq3I6+i6DMh1qiWKOSajrKN4V 51EEMjklYuUlsO6BdFozisEAlLZdC+iBRjua3d0= X-Google-Smtp-Source: AA0mqf46WPiSHTPJci6i99PqhknZn5uQcyPIrzoklJtxEAxDMgw1O8DPwrlppQrhNzMKvpiRZvSDMg== X-Received: by 2002:a63:cf14:0:b0:478:22cb:f05d with SMTP id j20-20020a63cf14000000b0047822cbf05dmr17930719pgg.456.1669908338562; Thu, 01 Dec 2022 07:25:38 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id jc18-20020a17090325d200b001891a17bd93sm3812769plb.43.2022.12.01.07.25.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 07:25:38 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 2/7] qemu: fix CVE-2021-20196 block fdc null pointer dereference may lead to guest crash Date: Thu, 1 Dec 2022 05:25:16 -1000 Message-Id: <1523fcbb6fef60d30c07377673fca265c5c9781c.1669908167.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 Dec 2022 15:25:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174115 From: Vivek Kumbhar Upstream-Status: Backport [https://gitlab.com/qemu-project/qemu/-/commit/1ab95af033a419e7a64e2d58e67dd96b20af5233] Signed-off-by: Vivek Kumbhar Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2021-20196.patch | 62 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-20196.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 764f948a28..a915b54c1a 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -113,6 +113,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2022-0216-2.patch \ file://CVE-2021-3750.patch \ file://CVE-2021-3638.patch \ + file://CVE-2021-20196.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-20196.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-20196.patch new file mode 100644 index 0000000000..e9b815740f --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-20196.patch @@ -0,0 +1,62 @@ +From 94608c59045791dfd35102bc59b792e96f2cfa30 Mon Sep 17 00:00:00 2001 +From: Vivek Kumbhar +Date: Tue, 29 Nov 2022 15:57:13 +0530 +Subject: [PATCH] CVE-2021-20196 + +Upstream-Status: Backport [https://gitlab.com/qemu-project/qemu/-/commit/1ab95af033a419e7a64e2d58e67dd96b20af5233] +CVE: CVE-2021-20196 +Signed-off-by: Vivek Kumbhar + +hw/block/fdc: Kludge missing floppy drive to fix CVE-2021-20196 + +Guest might select another drive on the bus by setting the +DRIVE_SEL bit of the DIGITAL OUTPUT REGISTER (DOR). +The current controller model doesn't expect a BlockBackend +to be NULL. A simple way to fix CVE-2021-20196 is to create +an empty BlockBackend when it is missing. All further +accesses will be safely handled, and the controller state +machines keep behaving correctly. +--- + hw/block/fdc.c | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) + +diff --git a/hw/block/fdc.c b/hw/block/fdc.c +index ac5d31e8..e128e975 100644 +--- a/hw/block/fdc.c ++++ b/hw/block/fdc.c +@@ -58,6 +58,11 @@ + } \ + } while (0) + ++/* Anonymous BlockBackend for empty drive */ ++static BlockBackend *blk_create_empty_drive(void) ++{ ++ return blk_new(qemu_get_aio_context(), 0, BLK_PERM_ALL); ++} + + /********************************************************/ + /* qdev floppy bus */ +@@ -1356,7 +1361,19 @@ static FDrive *get_drv(FDCtrl *fdctrl, int unit) + + static FDrive *get_cur_drv(FDCtrl *fdctrl) + { +- return get_drv(fdctrl, fdctrl->cur_drv); ++ FDrive *cur_drv = get_drv(fdctrl, fdctrl->cur_drv); ++ ++ if (!cur_drv->blk) { ++ /* ++ * Kludge: empty drive line selected. Create an anonymous ++ * BlockBackend to avoid NULL deref with various BlockBackend ++ * API calls within this model (CVE-2021-20196). ++ * Due to the controller QOM model limitations, we don't ++ * attach the created to the controller device. ++ */ ++ cur_drv->blk = blk_create_empty_drive(); ++ } ++ return cur_drv; + } + + /* Status A register : 0x00 (read-only) */ +-- +2.25.1 + From patchwork Thu Dec 1 15:25:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16286 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C47FDC4708D for ; Thu, 1 Dec 2022 15:25:42 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web11.46687.1669908341446099679 for ; Thu, 01 Dec 2022 07:25:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=00oeQjf5; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id t11-20020a17090a024b00b0021932afece4so5534137pje.5 for ; Thu, 01 Dec 2022 07:25:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ButB0kHTY8APGv5Ep2aZ55LoDO7XFVhrEarhsEWTQsA=; b=00oeQjf57obF0xRS/3IoSBOpU1Ck1pMtmDS5FCBBctnHJV2HTAwzG3H0zMlp9jiF3W 6z5thdDMAQcMHmB7rE8w9apsf29FzBr7CMkRMk3ip/+ElRTYlnmVHgrErucQP0XlQaWh dx3eTQAWIA6pOgeu3ZpnzsLS/88Sr0bSa2AoWA6ZJm/rcBZU2g611WHU5kvWAhcHrKGB RhLxOa/MX6C9YJcnjW40n10lNPxgXC/rv8vRVwKsnO80qgZ0LDGmTFgI7Q187OGrTSWE ip9Mf0kHT3TFSwyd3GOhnFnf2JDiV5bt2bTiSiQnWg3YPyoIY/0k1tpvDq9HiwhqIUHt vJRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ButB0kHTY8APGv5Ep2aZ55LoDO7XFVhrEarhsEWTQsA=; b=4AWSpVun+FX7QktwNzUxPE8JPUxurgLrF/WY8KntDEIgK//9jya2YWp+XqjWMzVraY fdSuGla04iy3ceg6QfxagVkbuCtkEVX//W4oPTyrIhx1IaB2rr1zGeRerguNDIVy7bQr pMfDoJKRppXCr+toHFVrAuClsn9NYx/Hm4QsqmQ/eG8WWOPxkrR7lkoiQPPxZjAb6g5e pDvd4N7vbg5PbpBvDbeEKswVrQkSGNdssQ7OOVY/5hINwZ08hq48N+hXWIt4AjRcAf+A C1axvT/ntRYMqKLe9gcaBJSmoFn1Y/UVfMHad7FB+adlpDzluKsN6o2ByhLYqzcrbPDp 8JOA== X-Gm-Message-State: ANoB5pksiNQBrQIdzczCi0GWoZ2y/1j5iUuZ8Sswug7e1mZlokLCgG0D j1Kk4iSYPde9NhO2E9GDC4G1zmJ0nEaWBrK5Ca4= X-Google-Smtp-Source: AA0mqf7+YZ2Gq93f5eWeuT5FJv0+YW/Li/0r60iTFEIUKMmuIH3AGpRyak8EsrntcmlBCc2yjJUNeg== X-Received: by 2002:a17:903:2c2:b0:182:631a:ef28 with SMTP id s2-20020a17090302c200b00182631aef28mr46677431plk.46.1669908340372; Thu, 01 Dec 2022 07:25:40 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id jc18-20020a17090325d200b001891a17bd93sm3812769plb.43.2022.12.01.07.25.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 07:25:39 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 3/7] linux-firmware: upgrade 20220913 -> 20221012 Date: Thu, 1 Dec 2022 05:25:17 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 Dec 2022 15:25:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174116 From: Alexander Kanavin License-Update: copyright years, additional firmwares Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 9f658c724b6635e5745f30b25601bcc51a004be4) Signed-off-by: Steve Sakoman --- ...inux-firmware_20220913.bb => linux-firmware_20221012.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20220913.bb => linux-firmware_20221012.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20220913.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20221012.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20220913.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20221012.bb index 2baf4bbe49..0a684ba874 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20220913.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20221012.bb @@ -71,7 +71,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ file://LICENSE.amdgpu;md5=44c1166d052226cb2d6c8d7400090203 \ - file://LICENSE.amd-ucode;md5=3c5399dc9148d7f0e1f41e34b69cf14f \ + file://LICENSE.amd-ucode;md5=6ca90c57f7b248de1e25c7f68ffc4698 \ file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ file://LICENSE.atmel;md5=aa74ac0c60595dee4d4e239107ea77a3 \ @@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ " # WHENCE checksum is defined separately to ease overriding it if # class-devupstream is selected. -WHENCE_CHKSUM = "98ecc3d3223df7ebdc23b0ec56aafb20" +WHENCE_CHKSUM = "d6d9d74a344a78028e6b0f1df80db14b" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source @@ -209,7 +209,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw # Pin this to the 20220509 release, override this in local.conf SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" -SRC_URI[sha256sum] = "26fd00f2d8e96c4af6f44269a6b893eb857253044f75ad28ef6706a2250cd8e9" +SRC_URI[sha256sum] = "e9d174af729511c8cccb60ec4e0b223b3c44b67d813b42d1ab9813acfa667fa5" inherit allarch From patchwork Thu Dec 1 15:25:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16292 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A401BC4321E for ; Thu, 1 Dec 2022 15:25:52 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web11.46689.1669908343181933027 for ; Thu, 01 Dec 2022 07:25:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=4y68hgMe; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id 124so2226246pfy.0 for ; Thu, 01 Dec 2022 07:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7AMfe/0BhP3+NWA/mLoYZcm0Tn6VGOGgBT9ySZvKnXo=; b=4y68hgMeMobA3tuCejEC0aPdI/dkjBjo88TOzdyoRSrDNmZw9WPQoSuKZABgwy0qMe paka7/veT8Wmj/tVnJztDJtIenRsYc7Bpat99Vynl5YP30Y0C14Fjl8+484bBei1dXXu z5dk92E8GuwU5MbGy5Hr8FShM7x1qRyUn1pexQCQmG3U9FdaPUFRLe0kV+or+TRXVnhy MKv6vg6ayvodDJ3wh3Rk36sFbC+lchXZrFhdJx6aJDimten9Z6wjutkLLGTxbmAoU6wV dbtrHSjC9CD+ehWfJyhkBgDin4AXn6znLqm6l8GR8v4gHWIaJcwBeGmgr5eh/iG1IXtv OMjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7AMfe/0BhP3+NWA/mLoYZcm0Tn6VGOGgBT9ySZvKnXo=; b=f0asfyqZ7qLLmNCKV5fZ18WUgqOUymbF6vNYbGgvimnIjlTealfVRg6kHSRv9J5HLm 7+2Of6F00JAkSQq9LkqQP/LdpN+Qe3eZqwvGkbxt3roHLGH0e9rnsml0bmaGTq7bsXKY 5s9QEPl2AI8pPKqf4wzYkG2jcbzbyjH1gdpZ9QTLyOiOh7bo7m49weakErCsQqyPj/A8 jY50axQDHOArfv46c7Ltk9RNk1Ur6rm+cUUFWBbFUaI5Tugf+f+IMOTN314W5UeX+gyb ZIY8/mK0lv9qiBJEitWcla1m+L+m7TJ8SYSN6ottYi4rVeOywn0zkQ6kPiLuDHjuhyWS V1ow== X-Gm-Message-State: ANoB5pmva5nogD/TDTsyVGhLdg5BgaycWFDAV7476WAeWs54v/o8wDMp 6L4KcycGMjrXXGu1Sfv7jsTA0/eXhN6htK4gqBI= X-Google-Smtp-Source: AA0mqf4dte7cCAQug2HyemovT/wooZtOCtHIDypSiGgHMYvnkYleX0o9rDiMejhkPGhyIC4mcIRJTg== X-Received: by 2002:a63:5016:0:b0:478:538a:aec6 with SMTP id e22-20020a635016000000b00478538aaec6mr10080807pgb.290.1669908342205; Thu, 01 Dec 2022 07:25:42 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id jc18-20020a17090325d200b001891a17bd93sm3812769plb.43.2022.12.01.07.25.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 07:25:41 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 4/7] linux-firmware: upgrade 20221012 -> 20221109 Date: Thu, 1 Dec 2022 05:25:18 -1000 Message-Id: <922deb4ec740163ba98b3a47419ca6b3fe5eaef1.1669908167.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 Dec 2022 15:25:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174117 From: Dmitry Baryshkov License-Update: additional files Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni (cherry picked from commit 6940f297243a66bd58d6adee7d690bcee9b9ccb2) Signed-off-by: Steve Sakoman --- ...{linux-firmware_20221012.bb => linux-firmware_20221109.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20221012.bb => linux-firmware_20221109.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20221012.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20221109.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20221012.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20221109.bb index 0a684ba874..8c132c8f34 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20221012.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20221109.bb @@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ " # WHENCE checksum is defined separately to ease overriding it if # class-devupstream is selected. -WHENCE_CHKSUM = "d6d9d74a344a78028e6b0f1df80db14b" +WHENCE_CHKSUM = "ab4ba608dc4b757716871f9be033f0f1" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source @@ -209,7 +209,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw # Pin this to the 20220509 release, override this in local.conf SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" -SRC_URI[sha256sum] = "e9d174af729511c8cccb60ec4e0b223b3c44b67d813b42d1ab9813acfa667fa5" +SRC_URI[sha256sum] = "c0ddffbbcf30f2e015bddd5c6d3ce1f13976b906aceabda4a57e3c41a3190701" inherit allarch From patchwork Thu Dec 1 15:25:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16293 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B03CBC4708D for ; Thu, 1 Dec 2022 15:25:52 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web10.46615.1669908345045663368 for ; Thu, 01 Dec 2022 07:25:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=TSLtyNc1; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id b11so2181904pjp.2 for ; Thu, 01 Dec 2022 07:25:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SPOnO1FfISBXbUDAJ+IoLb1CN10Psf2/InEhTnxQDq4=; b=TSLtyNc1w7W71B0CKm1AbIMm7uSgSIBgJQkKvXuTrbiYtZ0mmtTl5jgQn1HEBMGH42 LCN23dvrkoVVRKI7qoOcAcMUu+0bAJNLHIXOz2f6cXaV6TTga0lNYoCLuNrqeC8bKtRT 2Kqc5fDKp3K44GBTJo/upqfC5U4sahDn/uBsf1Xu1MLbuuD5Ceouv8wfp/EIAWvSyguN dG/5NsuLl90D6hg4aUqwgAkw7P6adSSe62s31mu/yT4e6DTqXxLwrB/YVIaEcWNTX9/1 wuqtMoSDwxR/660U8EtmRr79lEfUH15Fl7b74A3VcUQlZ2NXAY2cXaHjzhfK/VzZbyQu vNxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SPOnO1FfISBXbUDAJ+IoLb1CN10Psf2/InEhTnxQDq4=; b=aBuIoeH5IM1eKU4662aSLkITsp4zWJv7PJaXvW5Tl7Vh4ZwSGY9wzgGjaZSo124Eig WINB5BfS79TvOPu0kkICDKxaFWx6VevFU7zroQdrePyfJd5eCEUMV8AK3PnxEc65NHMZ 6fUlsrqswieCkrzXgiCP2UVnfmk93S8x7X18sRFkxMI04DbS2cA+6U2zy2DlOOatWu6l X66+GIzvCM8oMMx3MnuIaiDYuhwygo2QtbSSTt+WQodLHjGy/oQIhy3EwXyWR4j24jzQ 7OF8RJ51t7r+qH2YcO2T5oEYOGKJytuJW0cPUJqwOtgxgLdbMzCnpbs1n8Si7Vr+lMjI m+MA== X-Gm-Message-State: ANoB5pn+RVcRZw1pMpgyzhNe7oGLV/vIKAFIvbIa/VSSJh+LGWXaglXm ievHgKVHUb2zXnbD2P1iAqY2/lkZ2WVoEDshR8Q= X-Google-Smtp-Source: AA0mqf6hc/CnxQa2mEg6Z04U9w8W96fDjJKk4aMDZcLfLtzjO10lQ+cBUiPTDzhcRWQ5IyKbJMGgUQ== X-Received: by 2002:a17:903:2112:b0:183:9254:cc70 with SMTP id o18-20020a170903211200b001839254cc70mr49052157ple.18.1669908344053; Thu, 01 Dec 2022 07:25:44 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id jc18-20020a17090325d200b001891a17bd93sm3812769plb.43.2022.12.01.07.25.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 07:25:43 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 5/7] mobile-broadband-provider-info: upgrade 20220725 -> 20221107 Date: Thu, 1 Dec 2022 05:25:19 -1000 Message-Id: <13b1c5ed032951f9ad11f226850320ed0ae623f8.1669908167.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 Dec 2022 15:25:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174118 From: Wang Mingyu Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 7e12fa1e6250fc358ba159a6b626458d871f7ccf) Signed-off-by: Steve Sakoman --- .../mobile-broadband-provider-info_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb index 2cc92b7b47..e802bcee18 100644 --- a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb +++ b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bb @@ -5,8 +5,8 @@ SECTION = "network" LICENSE = "PD" LIC_FILES_CHKSUM = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04" -SRCREV = "fe19892a8168bf19d81e3bc4ee319bf7f9f058f5" -PV = "20220725" +SRCREV = "22a5de3ef637990ce03141f786fbdb327e9c5a3f" +PV = "20221107" PE = "1" SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=main" From patchwork Thu Dec 1 15:25:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16291 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3FEAC43217 for ; Thu, 1 Dec 2022 15:25:52 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web11.46692.1669908346922220572 for ; Thu, 01 Dec 2022 07:25:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=MFT0pDe0; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id q12so2155261pfn.10 for ; Thu, 01 Dec 2022 07:25:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=H5U/KEeTxFxmK/sYb0ng2XDh1Q4iHbyOwF8fdiiY78I=; b=MFT0pDe0gGYae1IlM/Q7SrqcS+4eLrCZhB5DXcxBEjwrh132iIDNY1RUWYsBmzGkcS MczIUkD1YMPd7XsIc46bPGMEHFM/+GnVK72PT+EFtCP3T1r6T8/VwwlDSK2Dh+QkJ28U QA6PVaayYqqtucmbckPs+lDFQx07/Nbx7jTbwJhlMzZoH/i8U0FmGzDkJ7i39xtmYtXy 2nFgsDrS3IZkiIAhO8qfwr9yOOtG5CPhb7etg1zVqQ2MYhYHPEc4T+gUcDSqdONWs3vQ LHkU2gjei31ZhZIYwP8+3DY5cCOJFJxifIdkoJ8k2nO1vg0IWmkIiHsiI7Vdv5wbmW9U 3CBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H5U/KEeTxFxmK/sYb0ng2XDh1Q4iHbyOwF8fdiiY78I=; b=VGvWh/OSIKSUme4Du5vUZOWRFSMFNxD6KPFBRs5Ws77xEHeJ8MMqMoNXaJSMgaGiKT B0aSLdaniMBWAlIqviBcOBapnnpKycEgeNiwfDkEuNr3DjkUUhUrvqPEpZhtPR5GhivQ fnM9zK+rOKp+anwP7B3OtMP+mLqpVSLEM9Y+xLYACRuzVDJhrIELdEAj5dDm4HEHi2nX FK2bkcGFLNGepPo+TCrWHX+WLX2iRVMxu4ihQgBOFKH4X/imE5oiYXt/rw+RAQgNYLmG X9tfHMZplKKBlwh/W6qlHd704q0eBN+uynX3RLFnTAQE7FQeqfL5CRBc67Xa4/zh3Q9N UNeg== X-Gm-Message-State: ANoB5pnzDUp6UEnTZsHfcBNUw+19+XmN7dG1EZCJ1igZ4wNManX+k9lK DTwCERAF/qXVB6cHYsecR7T/wIiNlpHxKyLNong= X-Google-Smtp-Source: AA0mqf5fCpffNsorJh974izO9ByOQkDQXAk8zPOZuIMKFXsXxWwAy2IKqEI4mElh4qYfnkb0oGq1IA== X-Received: by 2002:a65:5601:0:b0:43c:4eef:bac7 with SMTP id l1-20020a655601000000b0043c4eefbac7mr42009849pgs.356.1669908345808; Thu, 01 Dec 2022 07:25:45 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id jc18-20020a17090325d200b001891a17bd93sm3812769plb.43.2022.12.01.07.25.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 07:25:45 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 6/7] kernel: improve transformation from KERNEL_IMAGETYPE_FOR_MAKE Date: Thu, 1 Dec 2022 05:25:20 -1000 Message-Id: <8e6e5d8a9f0cb26caa109bd49f2165313de7ae8f.1669908167.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 Dec 2022 15:25:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174119 From: Mike Crowe In 526bdd88ccd758204452579333ba188e29270bde the imageType loop in kernel_do_deploy was changed to use KERNEL_IMAGETYPE_FOR_MAKE rather than KERNEL_IMAGETYPES. This broke the special handling for fitImage immediately below because KERNEL_IMAGETYPE_FOR_MAKE never contains fitImage. It has always been my understanding that KERNEL_IMAGETYPE_FOR_MAKE controlled what was passed to make, but KERNEL_IMAGETYPE controlled what was installed/deployed. When the two are different then it's the responsibility of whoever set KERNEL_IMAGETYPE_FOR_MAKE to ensure that whatever comes out of the kernel build system has been transformed in to the requested form by the time of installation. This is what happens for kernel.bbclass's own support for vmlinux.gz. I think this means that for KERNEL_IMAGETYPE vmlinux.gz, kernel.bbclass is responsible for generating vmlinux.gz.initramfs[1] so that kernel_do_deploy can deploy it. This means that the change in 526bdd88ccd758204452579333ba188e29270bde can be reverted, fixing KERNEL_IMAGETYPE = "fitImage". In addition, it ought to be possible for recipes and other classes that use kernel.bbclass to hook into this mechanism by setting KERNEL_IMAGETYPE_FOR_MAKE and performing their own transformations. do_bundle_initramfs calls kernel_do_compile and we don't want it to transform vmlinux to vmlinux.gz at that point, since it will fight against the careful renaming and preserving that do_bundle_initramfs does. Let's separate the transformation out of kernel_do_compile to a new do_transform_kernel task that can be run at the right time. This means that it's also logical to perform the equivalent translation for the kernel with the initramfs in a separate do_transform_bundled_initramfs task too. This leaves two clear customisation points for recipes and other classes to hook into the process and perform their transformations: do_transform_kernel and do_transform_bundled_initramfs. (I care about this because our recipes that use kernel.bbclass also set KERNEL_IMAGETYPE_FOR_MAKE and transform vmlinux into a form suitable for our bootloader after do_compile and do_bundle_initramfs into the format matching KERNEL_IMAGETYPE. I'm unable to successfully bundle an initramfs after 526bdd88ccd758204452579333ba188e29270bde, but I didn't want to just revert that change to reintroduce the bug that it was fixing.) I can't say that I'm entirely happy with this change, but I'm unsure what to do to improve it. I find the way that both the bare kernel and the one with the initramfs both get deployed to be confusing, and a waste of build time. I would like to not actually generate a publishable kernel image at all during do_compile when an initramfs is in use, but I suspect that this would affect valid use cases that I'm not aware of. Signed-off-by: Mike Crowe [1] It could be argued that this should be vmlinux.initramfs.gz, but that would require another special case in kernel_do_deploy and the filename is only visible within this class and the recipes that use it anyway. Signed-off-by: Alexandre Belloni (cherry picked from commit 10a4a132e87e835726bf5da81a60f6f509b90765) Signed-off-by: Steve Sakoman --- meta/classes/kernel.bbclass | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 2a3cb21fc0..a965e187e4 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -75,7 +75,7 @@ python __anonymous () { # KERNEL_IMAGETYPES may contain a mixture of image types supported directly # by the kernel build system and types which are created by post-processing # the output of the kernel build system (e.g. compressing vmlinux -> - # vmlinux.gz in kernel_do_compile()). + # vmlinux.gz in kernel_do_transform_kernel()). # KERNEL_IMAGETYPE_FOR_MAKE should contain only image types supported # directly by the kernel build system. if not d.getVar('KERNEL_IMAGETYPE_FOR_MAKE'): @@ -106,6 +106,8 @@ python __anonymous () { # standalone for use by wic and other tools. if image: d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete') + if image and bb.utils.to_boolean(d.getVar('INITRAMFS_IMAGE_BUNDLE')): + bb.build.addtask('do_transform_bundled_initramfs', 'do_deploy', 'do_bundle_initramfs', d) # NOTE: setting INITRAMFS_TASK is for backward compatibility # The preferred method is to set INITRAMFS_IMAGE, because @@ -280,6 +282,14 @@ do_bundle_initramfs () { } do_bundle_initramfs[dirs] = "${B}" +kernel_do_transform_bundled_initramfs() { + # vmlinux.gz is not built by kernel + if (echo "${KERNEL_IMAGETYPES}" | grep -wq "vmlinux\.gz"); then + gzip -9cn < ${KERNEL_OUTPUT_DIR}/vmlinux.initramfs > ${KERNEL_OUTPUT_DIR}/vmlinux.gz.initramfs + fi +} +do_transform_bundled_initramfs[dirs] = "${B}" + python do_devshell_prepend () { os.environ["LDFLAGS"] = '' } @@ -329,12 +339,17 @@ kernel_do_compile() { for typeformake in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do oe_runmake ${typeformake} CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} $use_alternate_initrd done +} + +kernel_do_transform_kernel() { # vmlinux.gz is not built by kernel if (echo "${KERNEL_IMAGETYPES}" | grep -wq "vmlinux\.gz"); then mkdir -p "${KERNEL_OUTPUT_DIR}" gzip -9cn < ${B}/vmlinux > "${KERNEL_OUTPUT_DIR}/vmlinux.gz" fi } +do_transform_kernel[dirs] = "${B}" +addtask transform_kernel after do_compile before do_install do_compile_kernelmodules() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE @@ -576,7 +591,7 @@ inherit cml1 KCONFIG_CONFIG_COMMAND_append = " LD='${KERNEL_LD}' HOSTLDFLAGS='${BUILD_LDFLAGS}'" -EXPORT_FUNCTIONS do_compile do_install do_configure +EXPORT_FUNCTIONS do_compile do_transform_kernel do_transform_bundled_initramfs do_install do_configure # kernel-base becomes kernel-${KERNEL_VERSION} # kernel-image becomes kernel-image-${KERNEL_VERSION} @@ -721,7 +736,7 @@ kernel_do_deploy() { fi if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then - for imageType in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do + for imageType in ${KERNEL_IMAGETYPES} ; do if [ "$imageType" = "fitImage" ] ; then continue fi From patchwork Thu Dec 1 15:25:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 16290 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A945AC47089 for ; Thu, 1 Dec 2022 15:25:52 +0000 (UTC) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web10.46618.1669908348699038296 for ; Thu, 01 Dec 2022 07:25:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=0ul+S8T9; spf=softfail (domain: sakoman.com, ip: 209.85.215.177, mailfrom: steve@sakoman.com) Received: by mail-pg1-f177.google.com with SMTP id f9so1943792pgf.7 for ; Thu, 01 Dec 2022 07:25:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=b+sdXukAkDZrExt8ijaY+Nt5YPzQTX55rkpceZ31j10=; b=0ul+S8T9FzjJF7cLI+6CxSZ0a/wTac54NMuN+Tm/s6fGKNnvKeAtuG09mRr7j/lr2p /a3cdXy0+kb4SmMYTn0uCc7EAkjq2JjgGKtCU/42ofgsOIiLtyemjG/jIQB5n5Bs5Rsg GV2tsk/SeKWlwbOtwZG5F8QNSLZHDeivINAHTL0l9GTqJ6d/7wihYXMrp6Kt6htL5fX2 +W9baptZi+D2SFfxDIrhSHM1Ej1x2KE04U2azNpo2JXvPEV1gRPm4PAmR4/+t1w6ah+o GDxcAAMFFxdS6k0Vjqu1fAmGGpy+sIcH3jEYUMbns/pbGnVftHmcQFO9gfyeuyo2WGbT Ru9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b+sdXukAkDZrExt8ijaY+Nt5YPzQTX55rkpceZ31j10=; b=I+7A4sHnkgKSDEg4IZFeGCPnN54yTdJiu++Pnkhgu6HiHXN8NFISr5nNxfcINjHzyE DFmR2K2jHOsqQU+ctEhsemo1PqoAnQu0B0RnEumUTijrghUhrjDMe5snmeP44N/K64vR ShP0iKZ2YxZvhvhDxCUVp3Jr1OkfXqWouzqP8qeWZz8bqBwasJ+Na01340S05sqie/jP ahNMlZI8R/zMILr9/AxswTdInDPuoBne/XIA8jaV8vyC33iw/UYgkSg+r09PVtiS7Vq8 9cfgiNNCYpcUqFt7QW/HvM91++dh+Xj54lX5JoeZ+Qfdl3/pkcptz63T8xFRvldnrSnd N+kA== X-Gm-Message-State: ANoB5pn01Sudt1shHTFBvJpjIihUdR0kOczRpy/DN8oZlH8i7LLEsmgL pFEs5i/QUc4loK5ZqMRTU2NMwSvAqGkdgImW6E4= X-Google-Smtp-Source: AA0mqf7LXFkJGzIrh98URTyosiQchvB6HV9I22fkBjghEPiQ69U23f81EBes3rLztDN4WW5TKPwjlw== X-Received: by 2002:a63:dd13:0:b0:46e:ccbd:b136 with SMTP id t19-20020a63dd13000000b0046eccbdb136mr45567329pgg.515.1669908347626; Thu, 01 Dec 2022 07:25:47 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id jc18-20020a17090325d200b001891a17bd93sm3812769plb.43.2022.12.01.07.25.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 07:25:47 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 7/7] kernel.bbclass: make KERNEL_DEBUG_TIMESTAMPS work at rebuild Date: Thu, 1 Dec 2022 05:25:21 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 Dec 2022 15:25:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/174120 From: Chen Qi Currently, the KERNEL_DEBUG_TIMESTAMPS is not working as expected at rebuild. That is, even if we set it to "1", the kernel build time is not changed. The problem could be reproduced by the following steps. 1. bitbake core-image-minimal; start image and check `uname -a` output. 2. set in local.conf: KERNEL_DEBUG_TIMESTAMPS = "1" 3. bitbake core-image-minimal; start image and check `uname -a` output. It's expected that after enabling KERNEL_DEBUG_TIMESTAMPS, the kernel build time will be set to current date. But it's not. This is because the compile.h was not re-generated when do_compile task was re-executed. In mkcompile_h, we have: """ # Only replace the real compile.h if the new one is different, # in order to preserve the timestamp and avoid unnecessary # recompilations. # We don't consider the file changed if only the date/time changed, # unless KBUILD_BUILD_TIMESTAMP was explicitly set (e.g. for # reproducible builds with that value referring to a commit timestamp). # A kernel config change will increase the generation number, thus # causing compile.h to be updated (including date/time) due to the # changed comment in the # first line. """ It has made it very clear that it will not be re-generated unless we have KBUILD_BUILD_TIMESTAMP set explicitly. So we set this variable explicitly in do_compile to fix this issue. Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni (cherry picked from commit 1b68c2d2d385013a1c535ef81172494302a36d74) Signed-off-by: Steve Sakoman --- meta/classes/kernel.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index a965e187e4..8b89360991 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -321,6 +321,10 @@ kernel_do_compile() { export KBUILD_BUILD_TIMESTAMP="$ts" export KCONFIG_NOTIMESTAMP=1 bbnote "KBUILD_BUILD_TIMESTAMP: $ts" + else + ts=`LC_ALL=C date` + export KBUILD_BUILD_TIMESTAMP="$ts" + bbnote "KBUILD_BUILD_TIMESTAMP: $ts" fi # The $use_alternate_initrd is only set from # do_bundle_initramfs() This variable is specifically for the @@ -367,6 +371,10 @@ do_compile_kernelmodules() { export KBUILD_BUILD_TIMESTAMP="$ts" export KCONFIG_NOTIMESTAMP=1 bbnote "KBUILD_BUILD_TIMESTAMP: $ts" + else + ts=`LC_ALL=C date` + export KBUILD_BUILD_TIMESTAMP="$ts" + bbnote "KBUILD_BUILD_TIMESTAMP: $ts" fi if (grep -q -i -e '^CONFIG_MODULES=y$' ${B}/.config); then cc_extra=$(get_cc_option)