From patchwork Mon Jan 3 10:04:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1574718 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=blVIcCQ9; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JSBDP5ClRz9tk4 for ; Mon, 3 Jan 2022 21:04:20 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1n4KCK-0005ge-EW; Mon, 03 Jan 2022 10:04:12 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1n4KCE-0005g6-8P for kernel-team@lists.ubuntu.com; Mon, 03 Jan 2022 10:04:06 +0000 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id BA0063F1EE for ; Mon, 3 Jan 2022 10:04:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1641204245; bh=tz6PcQkOTGbjvOrVAdci77Tzfv+qsd91f5BbId5Xbbc=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=blVIcCQ940Zu5XwXMq7IAcDCEdP1vrWklolUzRjCxkhukc1or99r3Wgvos8ui0vDG ewvWbOgYQiAyQt5spC0A7DyzCE+p3bDLoa9jAohrVT1fiCdwRTUU3diFaQrMbxkivc vFz0pl/4XrwPt4/U1ErFlO25zHfCDOGWF117DOT5on8x21r3Vc94gL8AI5CtAd5Sm2 g0On+EPtAUUTpeXl8kJxQh9uBDh196if5ap9XT00t32o/MZVg982R+JDX7Ny0BW+Dv f/cc/KXUbm+Uk1RIEFAJw5vlxWBD+YhUPOFZnnGTOsQVqn9ilwYo/mshVxACNBQfG+ uOqQK6iC/N0rw== Received: by mail-wr1-f72.google.com with SMTP id h7-20020adfaa87000000b001885269a937so10162492wrc.17 for ; Mon, 03 Jan 2022 02:04:05 -0800 (PST) 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=tz6PcQkOTGbjvOrVAdci77Tzfv+qsd91f5BbId5Xbbc=; b=Wl/cafhWwZzIetY9CWBaGRb7hgeZ68a7+AbOYxfQfFLPQkm9NP3ie0nNOQzEWtg+l2 dNZeVxLkN4GBVkIiomt2Dldjkd7/at5vY3j1cPtbYwUWigD60DByJEQRCIo8AhJ+YX6J KSjaF0Gxe9W7wCL4/OG7yRUqZ9WOfSkxY+2/0Xtg/TOtsBSL72u7GreSdFRWibW7GTcP vlJplrlEOV5xztTih11EYY03UDxVSCVy6eDtndJmNg/Eb9OiUk+wEkrodaybIun4vCZj +TtkZ6p9qdb0wFLaN1Xwb57Q+oBHmVC/SksPpa1HxRFm2+aIvCdCfv+7gDEIDOQ/HEhS qIxA== X-Gm-Message-State: AOAM531L56lxbd9ILTzGSo6cdsoUS0qynE8ZWBUuZ9BZ5EqDHGNmLL4w 6ETnYpZO5RBIPD214gvzQAvwVYgVhq5pywzqYVcARsWhJPNm9kEtGsMFqvMMTfvF09wyQjvgQ9h N8Z+pl6aTq+y+kZUck8acYSsVzQ6izTGXP2elt+cRzQ== X-Received: by 2002:a5d:64c8:: with SMTP id f8mr41047908wri.158.1641204245452; Mon, 03 Jan 2022 02:04:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJysjwmVy4N/QKtTDkX7r7pAnHd8LX2fo//a5D/B/F4fjzsFhfsCsbmYPNYEiD+CrAu7J3trbw== X-Received: by 2002:a5d:64c8:: with SMTP id f8mr41047899wri.158.1641204245317; Mon, 03 Jan 2022 02:04:05 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id p1sm36570460wrr.75.2022.01.03.02.04.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 02:04:05 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [J][Unstable][PATCH 1/2] UBUNTU: [Packaging] Add list of built-in firmwares to the ABI Date: Mon, 3 Jan 2022 11:04:02 +0100 Message-Id: <20220103100403.232275-2-juergh@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220103100403.232275-1-juergh@canonical.com> References: <20220103100403.232275-1-juergh@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Built-in modules can require firmware so add a new file /fwinfo.builtin to the buildinfo package that contains that list. Signed-off-by: Juerg Haefliger --- debian/rules.d/2-binary-arch.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 996512f9ce0b..071878b97fd6 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -461,6 +461,13 @@ endif /sbin/modinfo $$ko | grep ^firmware || true; \ done | sort -u >$(abidir)/$*.fwinfo + # Build the final ABI built-in firmware information. + if [ -f $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin.modinfo ] ; then \ + cat $(pkgdir)/lib/modules/$(abi_release)-$*/modules.builtin.modinfo | \ + tr '\0' '\n' | sed -n 's/^.*firmware=/firmware: /p' | \ + sort -u > $(abidir)/$*.fwinfo.builtin; \ + fi + # Build the final ABI compiler information. ko=$$(find $(pkgdir_bin) $(pkgdir) $(pkgdir_ex) -name \*.ko | head -1); \ readelf -p .comment "$$ko" | gawk ' \ @@ -499,6 +506,10 @@ endif install -m644 $(abidir)/$*.modules.builtin \ $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/modules.builtin; \ fi + if [ -f $(abidir)/$*.fwinfo.builtin ] ; then \ + install -m644 $(abidir)/$*.fwinfo.builtin \ + $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/fwinfo.builtin; \ + fi ifneq ($(full_build),false) # Clean out this flavours build directory. From patchwork Mon Jan 3 10:04:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1574720 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=mvTOmdGq; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JSBDP4lzhz9tk2 for ; Mon, 3 Jan 2022 21:04:20 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1n4KCL-0005h8-J7; Mon, 03 Jan 2022 10:04:13 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1n4KCE-0005gD-NZ for kernel-team@lists.ubuntu.com; Mon, 03 Jan 2022 10:04:06 +0000 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 531CA3F1EE for ; Mon, 3 Jan 2022 10:04:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1641204246; bh=awc0TPIZRVjryLdjBOzovk0X9tSyORwnO7zUPCLR6z0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mvTOmdGqtCKNhlzYriITd6KzianQ6uOWSR9u9q1Q3cLUNg/r107D1sO1jpiA5A037 /dAHFHkHlBFxUPwvCf1oRlDHztp8GWs52EttkJdlh2ODBtgKr56RqXOaHUJH6ewl2G 1ivxkjJ+PqIFnCwp8fsfRvXS+fsf2MMyR5GBEWe6KXn2K7vrGME8OeDgSbEZFefcaf kCD4rXRYEIiEJ3yh0s1aGv8Agd3lCidghv1JHObtVfmdmxJe0Iyak3mGIQZCHGGkQs W6w7LwKLzJ5aB6dxrdb8HlTSbX6FKuxeJmFyO4bCOrgXu2U1W01DRCZFG+a3TQyhNw fmUUZCRZMk80w== Received: by mail-wr1-f69.google.com with SMTP id v18-20020a5d5912000000b001815910d2c0so10121825wrd.1 for ; Mon, 03 Jan 2022 02:04:06 -0800 (PST) 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=awc0TPIZRVjryLdjBOzovk0X9tSyORwnO7zUPCLR6z0=; b=ASblv9gz2yYY9wx96wycnirVTorxdOG0V7fjlgTdBd+BbTkw6vDi+XNgRxs2c7Q7rr GQ0Ew1L5BEkztKU9AZ3ScRReZX0M4LwSkupH5ufv6FR+Hg4dqFK4hW/hUhT/l1XqPhI6 wCehWFmz+zkP2DaiK9U3a+2qJiJ+Lrckz63YbzU2l/M9LqiNq4ZfAVBYTHS26sDjCnU9 6DqTNaa7P1WrYS5Fm6CnuzGzEBpkwWrFb+pBqVzdh2yURRCKcqd0IfxEoCnIJ1BD+Db5 IDXQmJZ5bePCmBkvQWZ+t0uMWycGu17uDf+aK1BMwErIByhAGjmzRSmlvVK+nBu0EKGM luAg== X-Gm-Message-State: AOAM532Az1qP2s8yyOmAnHRkdxNZ+mRZ3LbIEITjagKn3HIYBQh3+FvG scAg49I+0z7UCNdr19a/BMrkZhDLYkwX2MhPNcRRPkRIHxeXt0mGeXPr6+OVtqbRKHYF4itUbsZ m5dVfVn1bKw47quhyMj+mWoyAav/4X7aQpXkjmEeUkQ== X-Received: by 2002:a05:600c:4e88:: with SMTP id f8mr32212595wmq.45.1641204245981; Mon, 03 Jan 2022 02:04:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJxd3KTX2I+mZNxhmqIzS7P869PE++hciyjkp1lwJJ2fgt6hSe0TVqRlFIzLkSsbT6TzAlUSKw== X-Received: by 2002:a05:600c:4e88:: with SMTP id f8mr32212588wmq.45.1641204245802; Mon, 03 Jan 2022 02:04:05 -0800 (PST) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id p1sm36570460wrr.75.2022.01.03.02.04.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 02:04:05 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [J][Unstable][PATCH 2/2] UBUNTU: [Packaging] getabis: Add fwinfo.builtin to the ABI Date: Mon, 3 Jan 2022 11:04:03 +0100 Message-Id: <20220103100403.232275-3-juergh@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220103100403.232275-1-juergh@canonical.com> References: <20220103100403.232275-1-juergh@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Newer buildinfo packages provide a fwinfo.builtin file. Process that file when downloading the ABIs. Signed-off-by: Juerg Haefliger --- debian/scripts/misc/getabis | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/scripts/misc/getabis b/debian/scripts/misc/getabis index 5c8e005d3415..dcf0b2156cf1 100755 --- a/debian/scripts/misc/getabis +++ b/debian/scripts/misc/getabis @@ -162,6 +162,9 @@ getall_set() mv "$base/$comp" "$abidir/$arch/$sub.$comp" done cat "$base/fwinfo" >>"$fwinfo" + if [ -e "${base}"/fwinfo.builtin ] ; then + cat "${base}"/fwinfo.builtin >> "${fwinfo}".builtin + fi fi rm -rf tmp $filenames echo " done" @@ -197,8 +200,13 @@ if [ "$compilers" != 1 ]; then sort -u $abidir/*/*.compiler | sed 's/^/WARNING: /' 1>&2 fi +# Sort fwinfo files sort < $fwinfo | uniq > fwinfo.tmp mv fwinfo.tmp $fwinfo +if [ -e "${fwinfo}".builtin ] ; then + sort < "${fwinfo}".builtin | uniq > fwinfo.tmp + mv fwinfo.tmp "${fwinfo}".builtin +fi rmdir $tmpdir