From patchwork Tue Jun 21 23:28:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9469 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 65C80C43334 for ; Tue, 21 Jun 2022 23:29:28 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web10.1195.1655854165125221770 for ; Tue, 21 Jun 2022 16:29:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=oyyNbLe7; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id f16so13033175pjj.1 for ; Tue, 21 Jun 2022 16:29:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ZckK9x+2GYGeZaSzAFKxjNF/U+gRT7wwhV6F9nePaxU=; b=oyyNbLe7GerR1HVaXYHwSNd2McnX7SqBYrf6oZ1F3kuOwj75/gdTwXGaNa59ppmtTu SKbKbVfNu61X7nifEkr4Gai/QlkXTco97hn31zcUpxSoRxe4CeQQBjBTECyNLibGd5Vx mu7ZcCiEZfx2ZDdKyxQaTZcPqdXL+GKiUNfjY8dvwwc6slmFgujaqr1CKf9zabrlkZX9 F6oxsr2pF5w1obvTALYA/xuVK9MyV5PjCQxHpgGgjhfLcISt+BD3X8rqCi08BjYl3PMe g160KDQz9QuP1iYnS6FC6b56FSbezPp0pZQXzDDdiGFtrTi6MvAcsH0FS5/wGy2zlQCD bqOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZckK9x+2GYGeZaSzAFKxjNF/U+gRT7wwhV6F9nePaxU=; b=m/KiMaknTn43MRbCP/vVUWF3wRW2L9kLKEaT9fqCGgjE/hZl4FcI+rBPe7cI/4cNa6 lDXP79vINjCwDTvc3P8U+5bXhk/BuDe3K1sVseqTcXbjjQmOp2wJVjpCpdAgrZ9bOYKI Gu+tB95/cVpCpXzm48z6Gyb0IirwcDBkLuUyFj61T55PsxYAJRao13Jw/gmiXTZBXtb9 9i2Xf8Oa0l03M3vCpMR75id4vsVKEhToF+xnkIZ6/WcKbX/YXi9HWVUu6JXyWVbufFzv e8/gs2ysvNnPXLQbGaoQ1hJ37VLCjkHRNLAQMS+QBIM3TDxXOAf7PjBv9JZvSj9kK7m6 Nr5Q== X-Gm-Message-State: AJIora83Ee5F7JXmNb5r8zuOD5/uvelYEDSMYoLwPN2MHAdx3WePhgSV nRqqJbLVI16OuFIkecbbceXCICLDySWKyIls X-Google-Smtp-Source: AGRyM1uh6e1oHieudYfc5BODMbM9j15psV3EU0d0Un9waf0CuiCMkYKv4xJnx/BGPNaNddlW+hk9xA== X-Received: by 2002:a17:902:b192:b0:16a:afe:3c76 with SMTP id s18-20020a170902b19200b0016a0afe3c76mr22730855plr.134.1655854164144; Tue, 21 Jun 2022 16:29:24 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f25-20020a637559000000b0040cf934a1a0sm2041614pgn.28.2022.06.21.16.29.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 16:29:23 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 1/6] python-pip: CVE-2021-3572 Incorrect handling of unicode separators in git references Date: Tue, 21 Jun 2022 13:28:58 -1000 Message-Id: <841a8fb5b6351f79a4d756232a544d1a6480c562.1655836866.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 ; Tue, 21 Jun 2022 23:29:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167205 From: Hitendra Prajapati Source: https://github.com/pypa/pip MR: 113864 Type: Security Fix Disposition: Backport from https://github.com/pypa/pip/commit/e46bdda9711392fec0c45c1175bae6db847cb30b ChangeID: 717948e217d6219d1f03afb4d984342d7dea4636 Description: CVE-2021-3572 python-pip: Incorrect handling of unicode separators in git references. Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../python/python3-pip/CVE-2021-3572.patch | 48 +++++++++++++++++++ .../python/python3-pip_20.0.2.bb | 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-pip/CVE-2021-3572.patch diff --git a/meta/recipes-devtools/python/python3-pip/CVE-2021-3572.patch b/meta/recipes-devtools/python/python3-pip/CVE-2021-3572.patch new file mode 100644 index 0000000000..a38ab57bc6 --- /dev/null +++ b/meta/recipes-devtools/python/python3-pip/CVE-2021-3572.patch @@ -0,0 +1,48 @@ +From c4fd13410b9a219f77fc30775d4a0ac9f69725bd Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Thu, 16 Jun 2022 09:52:43 +0530 +Subject: [PATCH] CVE-2021-3572 + +Upstream-Status: Backport [https://github.com/pypa/pip/commit/e46bdda9711392fec0c45c1175bae6db847cb30b] +CVE: CVE-2021-3572 +Signed-off-by: Hitendra Prajapati +--- + news/9827.bugfix.rst | 3 +++ + src/pip/_internal/vcs/git.py | 10 ++++++++-- + 2 files changed, 11 insertions(+), 2 deletions(-) + create mode 100644 news/9827.bugfix.rst + +diff --git a/news/9827.bugfix.rst b/news/9827.bugfix.rst +new file mode 100644 +index 0000000..e0d27c3 +--- /dev/null ++++ b/news/9827.bugfix.rst +@@ -0,0 +1,3 @@ ++**SECURITY**: Stop splitting on unicode separators in git references, ++which could be maliciously used to install a different revision on the ++repository. +diff --git a/src/pip/_internal/vcs/git.py b/src/pip/_internal/vcs/git.py +index 7483303..1b895f6 100644 +--- a/src/pip/_internal/vcs/git.py ++++ b/src/pip/_internal/vcs/git.py +@@ -137,9 +137,15 @@ class Git(VersionControl): + output = cls.run_command(['show-ref', rev], cwd=dest, + show_stdout=False, on_returncode='ignore') + refs = {} +- for line in output.strip().splitlines(): ++ # NOTE: We do not use splitlines here since that would split on other ++ # unicode separators, which can be maliciously used to install a ++ # different revision. ++ for line in output.strip().split("\n"): ++ line = line.rstrip("\r") ++ if not line: ++ continue + try: +- sha, ref = line.split() ++ ref_sha, ref_name = line.split(" ", maxsplit=2) + except ValueError: + # Include the offending line to simplify troubleshooting if + # this error ever occurs. +-- +2.25.1 + diff --git a/meta/recipes-devtools/python/python3-pip_20.0.2.bb b/meta/recipes-devtools/python/python3-pip_20.0.2.bb index 08738fb2f9..e24c6f4477 100644 --- a/meta/recipes-devtools/python/python3-pip_20.0.2.bb +++ b/meta/recipes-devtools/python/python3-pip_20.0.2.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8ba06d529c955048e5ddd7c45459eb2e" DEPENDS += "python3 python3-setuptools-native" +SRC_URI = "file://CVE-2021-3572.patch " SRC_URI[md5sum] = "7d42ba49b809604f0df3d55df1c3fd86" SRC_URI[sha256sum] = "7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f" From patchwork Tue Jun 21 23:28:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9472 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 64FA4C43334 for ; Tue, 21 Jun 2022 23:29:38 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web08.1223.1655854171960070698 for ; Tue, 21 Jun 2022 16:29:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Hd98wMam; spf=softfail (domain: sakoman.com, ip: 209.85.215.169, mailfrom: steve@sakoman.com) Received: by mail-pg1-f169.google.com with SMTP id s185so8757417pgs.3 for ; Tue, 21 Jun 2022 16:29:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=XsaUSxjltIiiTIRAFyzAPOEWUF5qP/NDLmYKCGtFOMw=; b=Hd98wMambEBMb6wVAqeWRYTYBsi3YFXW45R1GMzEGPR3xr/h+af61yhRTd7caSCCZJ EMYRQMGuyLV68BRSGkCRFfEJzfrmiyT2N++N2xLCRq6ZdM5h5Oi4B3Y13bNb36dQzyVs nlh95DfaTPlHnRMdcjLrAqgN975Bu12fHHrT+W2fT3N6cFlvvjiglcYbt2/ofNxqeaHj 82NkWKKCvlLdNSmgm6SdS3xqdek8+FI/RV9IJSgpxjSyFblgXs5dAe43jzfVYmAi0xN/ lFlBV4xk7nn1oOxmhjoX3fb4N4pT0mmTU6CEE0GIrfLH47xn4v0rl/Q5hN4snUSmzuhh Xrsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XsaUSxjltIiiTIRAFyzAPOEWUF5qP/NDLmYKCGtFOMw=; b=CyS0/VeeSHUhBwdilC01gO4mNKDym9NVnLUoNQLGzqN4LpjNP1W/bBYO6bX5obzxWE WVZPHM+7la/9MZg8Pyh1WcsHTegqp+xVKgXgRJF8MG6KyRMDFMM/UOeHp8vvfvMjERxU Ogm+lIRQivaG5rdSNiaPcQPmrU3qb/XzjYOtHRJ8xkuo3xU7UNfgXmGtKrr6QXofOrRf YQLT8G8VCbjYOMMBDY3oLvdly1Iaqc0ZyDN4rUHU5gu9GlqaA4+RbKQPfFTvZcbf9QQO UBE9+Ax39m58mmV26GItLsrvYEQUsY3rAVXEAec8ZvrIkyAPgyuyrb4rLiC8bEWbIaHC 8Xig== X-Gm-Message-State: AJIora8VJWvAVdezDpyXvoS+Ce5RjXNnOvOV7o2Itjo/qNfvpm8ggMlT sONs2diLfhjjYSrqFGKxv9I7WgtH1qTQDVaV X-Google-Smtp-Source: AGRyM1u3m+ci8GbcAh5L7xhWcoOi5RRqWCogs8X/0qADQxxCZMW9PJKiQdgQAIKx/9PmjuMtAIoiKw== X-Received: by 2002:a62:1687:0:b0:50d:3364:46d4 with SMTP id 129-20020a621687000000b0050d336446d4mr32500342pfw.74.1655854170945; Tue, 21 Jun 2022 16:29:30 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f25-20020a637559000000b0040cf934a1a0sm2041614pgn.28.2022.06.21.16.29.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 16:29:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 2/6] golang: CVE-2021-44717 syscall: don't close fd 0 on ForkExec error Date: Tue, 21 Jun 2022 13:28:59 -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 ; Tue, 21 Jun 2022 23:29:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167206 From: Hitendra Prajapati Source: https://github.com/golang/go MR: 114884 Type: Security Fix Disposition: Backport from https://github.com/golang/go/commit/44a3fb49 ChangeID: 7b28553d4e23828b20c3357b1cca79ee3ca18058 Description: CVE-2021-44717 golang: syscall: don't close fd 0 on ForkExec error. Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/go-1.14.inc | 1 + .../go/go-1.14/CVE-2021-44717.patch | 83 +++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2021-44717.patch diff --git a/meta/recipes-devtools/go/go-1.14.inc b/meta/recipes-devtools/go/go-1.14.inc index 08d547a837..4827c6adfa 100644 --- a/meta/recipes-devtools/go/go-1.14.inc +++ b/meta/recipes-devtools/go/go-1.14.inc @@ -22,6 +22,7 @@ SRC_URI += "\ file://CVE-2021-38297.patch \ file://CVE-2022-23806.patch \ file://CVE-2022-23772.patch \ + file://CVE-2021-44717.patch \ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" diff --git a/meta/recipes-devtools/go/go-1.14/CVE-2021-44717.patch b/meta/recipes-devtools/go/go-1.14/CVE-2021-44717.patch new file mode 100644 index 0000000000..17cac7a5ba --- /dev/null +++ b/meta/recipes-devtools/go/go-1.14/CVE-2021-44717.patch @@ -0,0 +1,83 @@ +From 9171c664e7af479aa26bc72f2e7cf4e69d8e0a6f Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Fri, 17 Jun 2022 10:22:47 +0530 +Subject: [PATCH] CVE-2021-44717 + +Upstream-Status: Backport [https://github.com/golang/go/commit/44a3fb49] +CVE: CVE-2021-44717 +Signed-off-by: Hitendra Prajapati + +syscall: fix ForkLock spurious close(0) on pipe failure +Pipe (and therefore forkLockPipe) does not make any guarantees +about the state of p after a failed Pipe(p). Avoid that assumption +and the too-clever goto, so that we don't accidentally Close a real fd +if the failed pipe leaves p[0] or p[1] set >= 0. + +Updates #50057 +Fixes CVE-2021-44717 + +Change-Id: Iff8e19a6efbba0c73cc8b13ecfae381c87600bb4 +Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1291270 +Reviewed-by: Ian Lance Taylor +Reviewed-on: https://go-review.googlesource.com/c/go/+/370514 +Trust: Filippo Valsorda +Run-TryBot: Filippo Valsorda +TryBot-Result: Gopher Robot +Reviewed-by: Alex Rakoczy +--- + src/syscall/exec_unix.go | 20 ++++++-------------- + 1 file changed, 6 insertions(+), 14 deletions(-) + +diff --git a/src/syscall/exec_unix.go b/src/syscall/exec_unix.go +index b3798b6..b73782c 100644 +--- a/src/syscall/exec_unix.go ++++ b/src/syscall/exec_unix.go +@@ -151,9 +151,6 @@ func forkExec(argv0 string, argv []string, attr *ProcAttr) (pid int, err error) + sys = &zeroSysProcAttr + } + +- p[0] = -1 +- p[1] = -1 +- + // Convert args to C form. + argv0p, err := BytePtrFromString(argv0) + if err != nil { +@@ -194,14 +191,17 @@ func forkExec(argv0 string, argv []string, attr *ProcAttr) (pid int, err error) + + // Allocate child status pipe close on exec. + if err = forkExecPipe(p[:]); err != nil { +- goto error ++ ForkLock.Unlock() ++ return 0, err + } + + // Kick off child. + pid, err1 = forkAndExecInChild(argv0p, argvp, envvp, chroot, dir, attr, sys, p[1]) + if err1 != 0 { +- err = Errno(err1) +- goto error ++ Close(p[0]) ++ Close(p[1]) ++ ForkLock.Unlock() ++ return 0, Errno(err1) + } + ForkLock.Unlock() + +@@ -228,14 +228,6 @@ func forkExec(argv0 string, argv []string, attr *ProcAttr) (pid int, err error) + + // Read got EOF, so pipe closed on exec, so exec succeeded. + return pid, nil +- +-error: +- if p[0] >= 0 { +- Close(p[0]) +- Close(p[1]) +- } +- ForkLock.Unlock() +- return 0, err + } + + // Combination of fork and exec, careful to be thread safe. +-- +2.25.1 + From patchwork Tue Jun 21 23:29:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9470 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 64F74C433EF for ; Tue, 21 Jun 2022 23:29:38 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web08.1225.1655854174070415486 for ; Tue, 21 Jun 2022 16:29:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=RoIkak0d; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id x4so8147257pfq.2 for ; Tue, 21 Jun 2022 16:29:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=SqMj5yU58mpyEZwcpTPNFITuymGXTaSGK+TENz7/wPI=; b=RoIkak0dE9k1/JUK8A8QU23Fe12n+jiwf/dX2R9B9J3XzTiVo0KZ0bV09WYwlBZYI3 MchY5Gpf+Gun7RCziXtjQJMaEHBy9jroCKUc45bDSCJIXV5AQKMe0AE6zSzEpBHpWfIx NaR68wHj3xwe/26IV0R14oevE/80EWXLQIe8psOPrmEGG+f2MExlNbRDzorK8ZsvsvuE tGsx75OGz8OGheACPiYpMDKCLeDRzBwlTOFASvYj1ADlnHhU9MBIwAASHQtZOBc9B2P5 ykEfBpfgnVlrFnr8IQncRE5ElwV2qzLgu/Hu/XghSz93HKRSV2ON+F5X+Tpwv3go9G8h ardg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SqMj5yU58mpyEZwcpTPNFITuymGXTaSGK+TENz7/wPI=; b=UwqKp4SNAqB7eL4K/tjHbk+kCz3t/WM/5rPrqDUqIqwIWL7qjiyqZLvU/U03P/v+vo air7fEyW8YwWh+Az8vKd4jIlmr0GlAxAytV8maNrYdfFaA3BS1s2oGkIOvZcAxJ5boBy +gQ9fR1s3T0Kj7suIqsj/Og1p/RRc5b5pZykZ52QdpMHJ3VtslY7pveHbxEG60zaOjht zHBWsUmX+ZtdB2v5mlpbNHnnnlWgerAFHE9xK43sTAOD/vebjzHU9qQyQ/rYySoz+ycR +tCvKEDvfCmaug7i+eAOv8yzrO0HmE5pgdig5cRjQNoX1M8zIsAriWfikJ8cvoSW9Pjv rFQA== X-Gm-Message-State: AJIora/Kf4FXAfzA+1A4s3hmqNXcsUNFiTvTx45MTU9W8/Yhem9muiNQ dUVJf0s1U6TM8DixLlFAQotefCMrJ+0TPZ2/ X-Google-Smtp-Source: AGRyM1vpFKEUYaqKE/MzLbYbkavwxs3lbj3IP1geAf2d1hFltTEi7H4iS7VUKGNKpfoCS05R1PK81g== X-Received: by 2002:a05:6a00:2402:b0:4e1:46ca:68bd with SMTP id z2-20020a056a00240200b004e146ca68bdmr32236412pfh.70.1655854173125; Tue, 21 Jun 2022 16:29:33 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f25-20020a637559000000b0040cf934a1a0sm2041614pgn.28.2022.06.21.16.29.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 16:29:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 3/6] dpkg: update to 1.19.8 Date: Tue, 21 Jun 2022 13:29:00 -1000 Message-Id: <12169c1104adbfd9f5196fdbdab16536e98fd43f.1655836866.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 ; Tue, 21 Jun 2022 23:29:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167207 From: Chee Yang Lee update include fixes for CVE-2022-1664. Signed-off-by: Chee Yang Lee Signed-off-by: Steve Sakoman --- meta/recipes-devtools/dpkg/{dpkg_1.19.7.bb => dpkg_1.19.8.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/dpkg/{dpkg_1.19.7.bb => dpkg_1.19.8.bb} (86%) diff --git a/meta/recipes-devtools/dpkg/dpkg_1.19.7.bb b/meta/recipes-devtools/dpkg/dpkg_1.19.8.bb similarity index 86% rename from meta/recipes-devtools/dpkg/dpkg_1.19.7.bb rename to meta/recipes-devtools/dpkg/dpkg_1.19.8.bb index e9dec337b3..9e6e9f2464 100644 --- a/meta/recipes-devtools/dpkg/dpkg_1.19.7.bb +++ b/meta/recipes-devtools/dpkg/dpkg_1.19.8.bb @@ -18,5 +18,5 @@ SRC_URI_append_class-native = " \ file://tweak-options-require-tar-1.27.patch \ " -SRC_URI[md5sum] = "60f57c5494e6dfa177504d47bfa0e383" -SRC_URI[sha256sum] = "4c27fededf620c0aa522fff1a48577ba08144445341257502e7730f2b1a296e8" +SRC_URI[md5sum] = "9d170c8baa1aa36b09698c909f304508" +SRC_URI[sha256sum] = "2632c00b0cf0ea19ed7bd6700e6ec5faca93f0045af629d356dc03ad74ae6f10" From patchwork Tue Jun 21 23:29:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9471 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 6B02ACCA473 for ; Tue, 21 Jun 2022 23:29:38 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web12.1277.1655854176430592266 for ; Tue, 21 Jun 2022 16:29:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=jJkBQ6sl; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id c205so7751306pfc.7 for ; Tue, 21 Jun 2022 16:29:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=BRLdEtAvYhq2D9sQgzr1Aspx1dCROKWBHv47w7KfzHc=; b=jJkBQ6slYHvYydJRIBws1sjSxT6mPdao7OA+0+oPmfQFNEDsrYPDXaoqcEYnq6bS04 QePg4MNNPCgCJXAdsxdRGk4MpUqbbDunoVgTqzZeod54qyZL9Clb1Wk/L4kOSmnH/4ZN W+skgOCRnMrhfSsC4FbWWGiGKZ8WIR/PGLqT+CGXjbyV7Vd7a/BbRAj09XA65gDjEJ69 xr7lkpxvitjmEPXmNF64PL8bmO0qbVr7CMH7DymmYQLXie3K4UFZ2df5Li3kux9HXbOq tYmM52Cz+9MtSENC1uYH0zsukCsRTjygHa7jXV4IkGXn3xgsFAyBuX4G6A9INR3m3+02 /QHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BRLdEtAvYhq2D9sQgzr1Aspx1dCROKWBHv47w7KfzHc=; b=sbkIDBCn9L1BF+htF8Jd7+/gwCFWuEctFvN7PasFzxa+jrYRaDBG+pdO5E1bZ72lwO 6RabrTkHMph3EIdoLCrebWENR9NfKCP7zuXv67UjC8pzcz2BpcWKCksdV5/MfprOeHTp c2s10wen3n/3p8SR3ukZ2w93eOEZMSrplH9Vfpak7CAr8wK7R3UqvDIO1VFH4NVWkKuB Weoo6MWQCqfxndC3sGemLXdP/Rtib7R4xJVCwsZPVDW99InZk8r0SGSJPaRD+YD2BINM a1gjgGikWWcTwpL86q5ZLXeov4lO0VHaCuAb2WP6+HOM1+wLEmuACVUsuBOMVAtzEx8g mu8Q== X-Gm-Message-State: AJIora9VRRho0uK7vQ6pFR0JJ4ZJF+8RU/ArW9Vx55Jc0IlhwPkAzf7k bLzIIfAGzp9Pgpb7AAHxuZSiGBw+tliWD9vF X-Google-Smtp-Source: AGRyM1vMqVmfwz7VbDFhWtOXE00/3aMC2F6IuM07J6DG2H2tq54RDnkMagENAmpx6ar7u7S+0oztWQ== X-Received: by 2002:a63:a55:0:b0:3fd:e492:354e with SMTP id z21-20020a630a55000000b003fde492354emr367067pgk.416.1655854175424; Tue, 21 Jun 2022 16:29:35 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f25-20020a637559000000b0040cf934a1a0sm2041614pgn.28.2022.06.21.16.29.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 16:29:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 4/6] systemd: systemd-systemctl: Support instance conf files during enable Date: Tue, 21 Jun 2022 13:29:01 -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 ; Tue, 21 Jun 2022 23:29:38 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167208 From: Nick Potenski Add ability to parse instance-specific conf files when enabling an instance of a templated unit during postinstall. Signed-off-by: Nick Potenski Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit baa0ecf3271008cf60cd830c54a71f191aebb81c) Signed-off-by: Steve Sakoman --- .../systemd/systemd-systemctl/systemctl | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl index 990de1ab39..6aa2e20465 100755 --- a/meta/recipes-core/systemd/systemd-systemctl/systemctl +++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl @@ -11,6 +11,7 @@ import re import sys from collections import namedtuple +from itertools import chain from pathlib import Path version = 1.0 @@ -25,12 +26,16 @@ locations = list() class SystemdFile(): """Class representing a single systemd configuration file""" - def __init__(self, root, path): + def __init__(self, root, path, instance_unit_name): self.sections = dict() self._parse(root, path) dirname = os.path.basename(path.name) + ".d" for location in locations: - for path2 in sorted((root / location / "system" / dirname).glob("*.conf")): + files = (root / location / "system" / dirname).glob("*.conf") + if instance_unit_name: + inst_dirname = instance_unit_name + ".d" + files = chain(files, (root / location / "system" / inst_dirname).glob("*.conf")) + for path2 in sorted(files): self._parse(root, path2) def _parse(self, root, path): @@ -193,8 +198,11 @@ class SystemdUnit(): # if we're enabling an instance, first extract the actual instance # then figure out what the template unit is template = re.match(r"[^@]+@(?P[^\.]*)\.", self.unit) + instance_unit_name = None if template: instance = template.group('instance') + if instance != "": + instance_unit_name = self.unit unit = re.sub(r"@[^\.]*\.", "@.", self.unit, 1) else: instance = None @@ -206,7 +214,7 @@ class SystemdUnit(): # ignore aliases return - config = SystemdFile(self.root, path) + config = SystemdFile(self.root, path, instance_unit_name) if instance == "": try: default_instance = config.get('Install', 'DefaultInstance')[0] From patchwork Tue Jun 21 23:29:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9473 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 6AEF8C433EF for ; Tue, 21 Jun 2022 23:29:48 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web10.1198.1655854178529839621 for ; Tue, 21 Jun 2022 16:29:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=smPV9HD/; spf=softfail (domain: sakoman.com, ip: 209.85.216.47, mailfrom: steve@sakoman.com) Received: by mail-pj1-f47.google.com with SMTP id x1-20020a17090abc8100b001ec7f8a51f5so11075120pjr.0 for ; Tue, 21 Jun 2022 16:29:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=swi7c35LDRCmgDHDk7RiWoNHUMrHMlctRudLqBUeMsY=; b=smPV9HD/HUBrKjijBhH6uwns18toIgPuC3oRt30RjJ63o7vIv0j3ZBRz1ABOjuhl1N CKGJT41fA/SJaCzB/b9zydLOzUI6Xgyl3W8bHryf/7XdFMfENvYDKlOoNZVRAD8RKIBo s3IWG9Tb6tAP/YcXC1tajnmNjjB+a8qIu3Qt8pSfJkwbnY31uk7PmvlUpM++UArlTSS/ dYCLq+UYgHcl/U536XM3sciFPuQqwZwwK4CAl4m9jT2EQW6kUU3uVA7XbbmIDxryXQQr 0NGG+ZbiEsJaWuJEyfQ6JGOf0eqYqipczymESatFKaxgrSrBxSbcGehGxvsp/udgoJkS e1BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=swi7c35LDRCmgDHDk7RiWoNHUMrHMlctRudLqBUeMsY=; b=CPZ+FH5vagGkEG/D3hcd9ALEEpBt6gE131HFb4SKYAvbe+sWr8gbbwqFqa0tYsYMhH Oa5ZwGTP6UonWliwqXX9qBZYJOi8G9mzFHb1TENtz/XPsgFOBCKC1phHzfJZPJd4UkZm bnwgbTrcEtOuvkPEz7xuu1KhQx9p0G17hITmXJZ984qiwGHJPZGeGRpjOATtuA8laZNe FCkjT2EoPGfABFzGtcFtFBOBheaV9PYSIX/XKR6PfJIZ80BHnJaWeDnY1SGnIkA/PgM1 Xud4cUUDSGxbk/ky0loRdeNU9pAO+S4J4dZpGEFRrIaO/h3TSkDxBRChTJC4+O5uJ9tv JWuw== X-Gm-Message-State: AJIora88wl/6/RksAaZDG7LLXNeirCTAFHmcdR82QlilpISFbx/hKspD guvduKWvmRxbjfDY10ueeOXxvbtUayOQQXJL X-Google-Smtp-Source: AGRyM1t+/cGw1raE7wCc/55FNIFFgSgJy7hjVedCrKL190lYdtADHdxJpAkUFlpBeGzKjVgzoWujCA== X-Received: by 2002:a17:902:ed02:b0:169:e40a:7bed with SMTP id b2-20020a170902ed0200b00169e40a7bedmr25900001pld.167.1655854177579; Tue, 21 Jun 2022 16:29:37 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f25-20020a637559000000b0040cf934a1a0sm2041614pgn.28.2022.06.21.16.29.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 16:29:37 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 5/6] linux-firmware: add support for building snapshots Date: Tue, 21 Jun 2022 13:29:02 -1000 Message-Id: <6654baf267003ac62bc886901e5197fc211239f4.1655836866.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 ; Tue, 21 Jun 2022 23:29:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167209 From: Dmitry Baryshkov In some cases it is useful to be able to test the snapshot of linux-firmware (e.g. to test if the updated firmware works on the particular hardware). Allow building the linux-firmware snapshots. To switch to the most recent branch, add the following lines to the local.conf file: PREFERRED_VERSION_linux-firmware = "1:20220509+git%" SRCREV:class-devupstream = "${AUTOREV}" WHENCE_CHKSUM:class-devupstream:pn-linux-firmware = "4288aad55d189fa225d492526b8406d5" Signed-off-by: Dmitry Baryshkov Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit b023570ae1d239de14b50a0e827582d0e84ddf81) Signed-off-by: Steve Sakoman --- .../linux-firmware/linux-firmware_20220509.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb index ec92cae2fa..b6b4043002 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb @@ -69,6 +69,7 @@ LICENSE = "\ & WHENCE \ " +WHENCE_CHKSUM = "d3eb82686904888f8bbbe8d865371404" LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ @@ -132,7 +133,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=d3eb82686904888f8bbbe8d865371404 \ + file://WHENCE;md5=${WHENCE_CHKSUM} \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -208,6 +209,11 @@ SRC_URI = "\ file://0001-Makefile-replace-mkdir-by-install.patch \ " +BBCLASSEXTEND = "devupstream:target" +SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=https;branch=main" +# Pin this to the 20220509 release, override this in local.conf +SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" + SRC_URI[sha256sum] = "376e0b3d7b4f8aaa2abf7f5ab74803dcf14b06b94e3d841b1467cd9a2848255e" inherit allarch From patchwork Tue Jun 21 23:29:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9474 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 6B086C43334 for ; Tue, 21 Jun 2022 23:29:48 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web08.1227.1655854181710360747 for ; Tue, 21 Jun 2022 16:29:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=M9tzAXle; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id q18so2417168pld.13 for ; Tue, 21 Jun 2022 16:29:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=iJGKayaftGnc7ERl2MGIDw2A4bUC5wYM3CF5nAEsdYI=; b=M9tzAXleyPdjgIt+sIVB6eaRHyw4p/WP694oluGnMPvgA9DdCRuGC/lqtnNafQkv/8 XTpbIphdJ+PZUk3o/Msdf5o9roe7Y7FgA/oq3koCXKiX+VmjC1rFmh2bLQHcLZoP72ZA Cu1WsnypjtW/8ORxMOZY3aj13voGJL3cJ6bHfaehxvGfIzG5DhW3J81fhY5fhz8Zrxbw mlCiQGfHeU3uInpCMs7Afkgt+T1GheqPkqKk2m9hK77/OQ8Qe62tdvDDNXGPfGgf5Jod hrzW7h8L0fgdelp9ap+bXi1CUXAERkD3kXS1QSZmQlQixZkL+6ViCgDOy+SPU/2lFnTc A6nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iJGKayaftGnc7ERl2MGIDw2A4bUC5wYM3CF5nAEsdYI=; b=ivXfZ+p8lP+0C9/fWJbBFpMNsF00DcV71CC4GgdqAnNnw5muMTdpseOOS1mZeqisWg WQMo8X3LCtIGmgMC8XAMCtOjj15ydh7u/6EmgKipfSt3RZ98bsc6SdM8CNZhrLHkyK3P ML2PaDcJ1P+sN4Yxp87frq/AieP7X1kt/S9zt4QMwiDZVbkS4f6vz6gwwU/KWcFehsUu OkqOaF7bpsvUoz3lM1ZiAgcgS0ZDaIZueR3uGZ4WpxDqG3WxmgA1/Xw/L8nestm+jjuX uJWM5fHd/SxFzLtxCS+wuTAjkR9JCe+TDnHWz6xYVeMkYLfnp7o0J7YccpeZItGW65oh 0AHQ== X-Gm-Message-State: AJIora+t04kcrJ2sRE1HE6wljpXshdyGODkdUUIIi4uEpXtmSHr7zjVt D8lHlY1TT416QEj9iLyQl8ugMSaPJLjJ3fc0 X-Google-Smtp-Source: AGRyM1txI2/X1G4uaDqLcBpOsq/Ea0RA6PJ7fZ/BUZ8XNBl1q4phOBUhMPYsnR7UVLNzztE4n8aePw== X-Received: by 2002:a17:902:ef92:b0:16a:1ef1:22db with SMTP id iz18-20020a170902ef9200b0016a1ef122dbmr14512623plb.2.1655854180723; Tue, 21 Jun 2022 16:29:40 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f25-20020a637559000000b0040cf934a1a0sm2041614pgn.28.2022.06.21.16.29.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 16:29:39 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 6/6] linux-firmware: upgrade 20220509 -> 20220610 Date: Tue, 21 Jun 2022 13:29:03 -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 ; Tue, 21 Jun 2022 23:29:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167210 From: Dmitry Baryshkov Drop 0001-Makefile-replace-mkdir-by-install.patch merged upstream. License-Update: additional files Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 91cd99267157e860a108282aee13e162e8c10572) Signed-off-by: Steve Sakoman (cherry picked from commit bcc5a22cd2b25c777315fe9d677fc0338ae2ab68) Signed-off-by: Steve Sakoman --- ...01-Makefile-replace-mkdir-by-install.patch | 84 ------------------- ...20220509.bb => linux-firmware_20220610.bb} | 5 +- 2 files changed, 2 insertions(+), 87 deletions(-) delete mode 100644 meta/recipes-kernel/linux-firmware/files/0001-Makefile-replace-mkdir-by-install.patch rename meta/recipes-kernel/linux-firmware/{linux-firmware_20220509.bb => linux-firmware_20220610.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/files/0001-Makefile-replace-mkdir-by-install.patch b/meta/recipes-kernel/linux-firmware/files/0001-Makefile-replace-mkdir-by-install.patch deleted file mode 100644 index b1ac5a16ab..0000000000 --- a/meta/recipes-kernel/linux-firmware/files/0001-Makefile-replace-mkdir-by-install.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 71514e74f35f2b51ca24062573d6d913525b30db Mon Sep 17 00:00:00 2001 -From: Konrad Weihmann -Date: Mon, 9 May 2022 12:57:57 +0200 -Subject: [PATCH] Makefile: replace mkdir by install - -mkdir -p creates paths that are bound to user's settings and therefore -can lead to different file mode bits of the base paths accross different -machines. -Use install instead, as this tool is not prone to such behavior. - -Signed-off-by: Konrad Weihmann -Upstream-Status: Submitted [https://lore.kernel.org/linux-firmware/PR2PR09MB310088EA719E6D7CA5C268F1A8C69@PR2PR09MB3100.eurprd09.prod.outlook.com/] ---- - Makefile | 2 +- - carl9170fw/toolchain/Makefile | 4 ++-- - copy-firmware.sh | 6 +++--- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index e1c362f..83a0ec6 100644 ---- a/Makefile -+++ b/Makefile -@@ -9,5 +9,5 @@ check: - @./check_whence.py - - install: -- mkdir -p $(DESTDIR)$(FIRMWAREDIR) -+ install -d $(DESTDIR)$(FIRMWAREDIR) - ./copy-firmware.sh $(DESTDIR)$(FIRMWAREDIR) -diff --git a/carl9170fw/toolchain/Makefile b/carl9170fw/toolchain/Makefile -index 2b25ffe..aaea8e8 100644 ---- a/carl9170fw/toolchain/Makefile -+++ b/carl9170fw/toolchain/Makefile -@@ -46,14 +46,14 @@ src/gcc-$(GCC_VER): src/$(GCC_TAR) src/newlib-$(NEWLIB_VER) - ln -s $(BASEDIR)/src/newlib-$(NEWLIB_VER)/libgloss $@ - - binutils: src/binutils-$(BINUTILS_VER) -- mkdir -p build/binutils -+ install -d build/binutils - cd build/binutils; \ - $(BASEDIR)/$ //g' | while read f d; d - if test -L "$f"; then - test -f "$destdir/$f" && continue - $verbose "copying link $f" -- mkdir -p $destdir/$(dirname "$f") -+ install -d $destdir/$(dirname "$f") - cp -d "$f" $destdir/"$f" - - if test "x$d" != "x"; then -@@ -63,7 +63,7 @@ grep -E '^Link:' WHENCE | sed -e's/^Link: *//g' -e's/-> //g' | while read f d; d - fi - else - $verbose "creating link $f -> $d" -- mkdir -p $destdir/$(dirname "$f") -+ install -d $destdir/$(dirname "$f") - ln -sf "$d" "$destdir/$f" - fi - done --- -2.25.1 - diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20220610.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20220610.bb index b6b4043002..0fd9305e3c 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20220509.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20220610.bb @@ -69,7 +69,7 @@ LICENSE = "\ & WHENCE \ " -WHENCE_CHKSUM = "d3eb82686904888f8bbbe8d865371404" +WHENCE_CHKSUM = "385947b278a6646ae4c3d39ba8c9b1bb" LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ @@ -206,7 +206,6 @@ PE = "1" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz \ - file://0001-Makefile-replace-mkdir-by-install.patch \ " BBCLASSEXTEND = "devupstream:target" @@ -214,7 +213,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] = "376e0b3d7b4f8aaa2abf7f5ab74803dcf14b06b94e3d841b1467cd9a2848255e" +SRC_URI[sha256sum] = "faf3aedf89530e61f4fa1e8c7303dead9127cc24416945647797d079feb12837" inherit allarch