From patchwork Tue Jun 21 23:27:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9456 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 6311CC433EF for ; Tue, 21 Jun 2022 23:28:28 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web11.1185.1655854105991423279 for ; Tue, 21 Jun 2022 16:28:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=dRq0n8xI; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 68so9059441pgb.10 for ; Tue, 21 Jun 2022 16:28: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=hzPNjiAn5AYj97du5o94yUNEy9sr3b7fMWgdmJPxu/0=; b=dRq0n8xIZ22MyauBpctzJRdrCZE9JyZhVeXoVb1ngghz/ZHtkCEBHzlNZx62P9dnK5 dQrBX4AfpWdUUZzq5Wtjvx03oVPTTPE3bkiHRvt5pG7BnTP/zEm+bYWvPDLy2Q9MpTA9 FNZwJ+XUr6yw6UjFtNY0p1M3PCNR1rOtMTn/A/y/5OUkoyOJkqFHB3If9M94imLLEDe/ W09nF5Cwe9bq792dDIP1Ywus2C1Wa+7pv1X002Q6+9HhLY8MfB6QI6/QroG0E8miiXjx NumrHh56mSu8q5LbXRjh/7Ym3CJGzXBw5YY4JYtVPL+xgg1CX1dgS2RgC3DXbCPZuFKs w/UQ== 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=hzPNjiAn5AYj97du5o94yUNEy9sr3b7fMWgdmJPxu/0=; b=cDve6TuJDMbKvp4BsvwopJTraxjBP4YKUuGVkInB8xv+CRORG+os8wZxKmsROKnMMT W81wmss3L9fYDh7N36P0RrF7q3cJljrRoc2vGnLBa6sw8Z25XSNeW19GXWAAm4UbL42M J+jcudKM9OsjBahPlXb8t+S9f650PVDA66CdYyKmv/7MwS01JLTZ5TB6l1yaoo9u4teh rv1TMpLsIKYBKYVJL7nQpIIoz/pYY4z4k0GkMLenKpaGsidaY6LcBDumeL/NfgiEUMH8 FC+UpC3H4y5rAg5p8ImXNPix4YVUjo2cyjc+BlRnBQ3PofOKz4HBF+9pjfg8/YctPfoT TlUQ== X-Gm-Message-State: AJIora9oK5EivnqA0K8udcNpSLupSHcKMQPLkL+L2UWLMho+vfYdoV85 1IluunE697CKSVzHNLaKzIArFiH9ytguoHHN X-Google-Smtp-Source: AGRyM1uDlwTGAyh6FbThTPzefMwvhC08CkBe02q8MRqrenNpM746US6jlOcsAwxkofllV5WBOlifdg== X-Received: by 2002:a05:6a00:84d:b0:525:3ce6:9c33 with SMTP id q13-20020a056a00084d00b005253ce69c33mr3540767pfk.47.1655854104828; Tue, 21 Jun 2022 16:28: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 z9-20020a1709027e8900b0015e8d4eb209sm11323565pla.83.2022.06.21.16.28.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 16:28:24 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/13] linux-firmware: upgrade 20220509 -> 20220610 Date: Tue, 21 Jun 2022 13:27:50 -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:28:28 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167194 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 --- ...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 10a7036a19..78b38df461 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