From patchwork Tue Nov 5 07:15:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 2006730 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XjKNy4ndMz1xyD for ; Tue, 5 Nov 2024 18:15:30 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1t8Dmb-00063o-45; Tue, 05 Nov 2024 07:15:21 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1t8DmY-00061I-2N for kernel-team@lists.ubuntu.com; Tue, 05 Nov 2024 07:15:18 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.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 6CC333F135 for ; Tue, 5 Nov 2024 07:15:17 +0000 (UTC) Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4327bd6bd60so34093225e9.1 for ; Mon, 04 Nov 2024 23:15:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730790917; x=1731395717; 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=fgapVbxVr0YJCkvY4JcIbSoElAhhXFhxIoHrns3MtmQ=; b=fucRB1qua+HG8U0TFNyc6K1Pc/tYFobqGbFpaWeaJkHS8UOdkIsvIxZ1VqgcxhWjhd XwdhvU2lw/qq2EjfYHz27+1x5RLx8vdonUT5h8CytyFCWz6vshVtFyjyJnyQCW17TipT n3iFpEyZOyXjYUTInrw2viGKGXmj1I+V+Sr69eGsM5OhUe5AK2bi2wWTxhCzDDMSZUPz ppen9fmaW3jXRHJL40lTBRSAJuc3MvHSIqXEA0jscZ++EKJ4aO8cs75fIu8xZwAPswZI 2wTUOqrHzwWOIPBNvFrpwk5Hmb2bDpTT8HLZI1wujGGaHu/rOAsVAigSwzKc72C7LzBb Z24w== X-Gm-Message-State: AOJu0Yy7ju5NYAA+CRGjhRZ8YdWP3kyaoNevz6/GqZZF5iuRN1k9wNt6 m5p7LP7v0pvITRCS1fcBEUmTlAKAth7axGCDwrYdG8DhbrVKZFIRrpYfpeK3YkEiesiDmQdJOGN 0LlI6pYk15hOJYAMHcuFZCPIrFxiM5LA7Uo3eVG9XqbxkH8rTyswtIRFIVakNTBnLilJYfx26kE +/uXCrzEm/rg== X-Received: by 2002:a05:600c:5118:b0:426:627e:37af with SMTP id 5b1f17b1804b1-4319ac7065emr319210295e9.3.1730790916974; Mon, 04 Nov 2024 23:15:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IFe4lH4pv8+pIzjRvJsgJ7tfQN6hkgUVz5XNjcxnTqku++b4R3PP+9akK+VC83Gdny1w4J6Nw== X-Received: by 2002:a05:600c:5118:b0:426:627e:37af with SMTP id 5b1f17b1804b1-4319ac7065emr319210095e9.3.1730790916558; Mon, 04 Nov 2024 23:15:16 -0800 (PST) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-431bd9a99d3sm207790015e9.38.2024.11.04.23.15.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 23:15:16 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 1/2] UBUNTU: [Packaging] Sort build dependencies alphabetically Date: Tue, 5 Nov 2024 08:15:00 +0100 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: <4bc7ee1854ca4c9a58068e98fb14670270f7d9a0.1730725508.git.juerg.haefliger@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" BugLink: https://bugs.launchpad.net/bugs/2086606 No functional changes, just reordering. Signed-off-by: Juerg Haefliger --- debian.master/control.stub.in | 62 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index a597bcaa4d7d..fde63ed40e17 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -4,53 +4,53 @@ Priority: optional Maintainer: Ubuntu Kernel Team Standards-Version: 3.9.4.0 Build-Depends: + autoconf , + automake , + bc , + bison , + cpio, + curl , debhelper (>= 9), + default-jdk-headless , dh-systemd, - cpio, + dkms , + dwarves [amd64 arm64 armhf ppc64el s390x] , + flex , + gawk , + java-common , kernel-wedge, kmod , - makedumpfile [amd64] , + libaudit-dev , libcap-dev , + libdw-dev , libelf-dev , - libnewt-dev , libiberty-dev , - default-jdk-headless , - java-common , - rsync , - libdw-dev , - libpci-dev , - pkg-config , - flex , - bison , - libunwind8-dev [amd64 arm64 armhf ppc64el] , liblzma-dev , - openssl , + libnewt-dev , + libnuma-dev [amd64 arm64 ppc64el s390x] , + libpci-dev , libssl-dev , - libaudit-dev , - bc , - gawk , - libudev-dev , - autoconf , - automake , libtool , - uuid-dev , - libnuma-dev [amd64 arm64 ppc64el s390x] , - dkms , - curl , + libudev-dev , + libunwind8-dev [amd64 arm64 armhf ppc64el] , lz4 [amd64 s390x] , - dwarves [amd64 arm64 armhf ppc64el s390x] , + makedumpfile [amd64] , + openssl , + pkg-config , + rsync , + uuid-dev , Build-Depends-Indep: - xmlto , + asciidoc , + bzip2 , docbook-utils , - ghostscript , fig2dev , - bzip2 , - sharutils , - asciidoc , - python3-sphinx , - python3-sphinx-rtd-theme , fontconfig , + ghostscript , python3-docutils , + python3-sphinx , + python3-sphinx-rtd-theme , + sharutils , + xmlto , Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/=SERIES= XS-Testsuite: autopkgtest #XS-Testsuite-Depends: gcc-4.7 binutils From patchwork Tue Nov 5 07:15:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 2006734 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XjKP302HYz1xyD for ; Tue, 5 Nov 2024 18:15:34 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1t8Dmf-0006C6-F6; Tue, 05 Nov 2024 07:15:25 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1t8Dmd-00067K-F2 for kernel-team@lists.ubuntu.com; Tue, 05 Nov 2024 07:15:23 +0000 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (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-1.canonical.com (Postfix) with ESMTPS id DA0483F0BE for ; Tue, 5 Nov 2024 07:15:22 +0000 (UTC) Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-37d5116f0a6so2602001f8f.0 for ; Mon, 04 Nov 2024 23:15:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730790922; x=1731395722; 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=GBPDv0uRvfoH1VMApT5w/GR8eR0WHXjXYAmIE2gSLOI=; b=epaWBgouZkfBt9BoLEVy6ALC7n9uzkSNacaLWXJyvGZlKSUtElzDzP0k7mP6w6yzMP nVeHc/Bm4GOcYagGuqPPpXmbdP/9vDfRUshacDOyIhfj07C+aC0bHDqQZTfuWCWeaGWL vD+a/nsX6Gz8ys5N7bNg9xbVJrSLDK+zI+5qvzcDFn3mZ+Xm47nAwQeTNjuQ/CgDcyo5 FMPglqGdiZ45VhcteLmHupN2QnXZ017R/1BISHSTrH1OeLxLn4lCpLX8y+eJ6B5zXmO6 cKvtAQk+I6vbJWdHchZBDVhV7PtQtyyrUvLaUBGHrYRyXEPFjoZUF5aF4Q5nlORwpe+r 54QQ== X-Gm-Message-State: AOJu0YzMF4Y11DoP4jLk0qqb3CI5jFPz1N/HN5ezkaoGYfOO6vuYUgzf BV9M6o4q5mEyUIssk51KK8kSwv3x4myBCkMq9i1TI5fZiXBmnZ1JEHZa8R2GhdB7kA9i6JKdrcq geg7H8RdNugDz7mSNZIDoNjm3IMYYM7JowqUxMFuvO71TVdau8YI06OwvWn3Sx3gjuhRiRpZF48 O9yPtHL4dEPw== X-Received: by 2002:a05:6000:69b:b0:37d:377f:51e6 with SMTP id ffacd0b85a97d-381c7ac8331mr14559729f8f.56.1730790922427; Mon, 04 Nov 2024 23:15:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IHD2qHToYdqbkl0FLUGiLyVNWhp2c/gYGQQHtKpILPM7w+BRkAKeqChkSjJMNr4lDRM9oAXXA== X-Received: by 2002:a05:6000:69b:b0:37d:377f:51e6 with SMTP id ffacd0b85a97d-381c7ac8331mr14559710f8f.56.1730790922090; Mon, 04 Nov 2024 23:15:22 -0800 (PST) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381c1167f20sm15149667f8f.90.2024.11.04.23.15.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 23:15:21 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][F][PATCH 2/2] UBUNTU: [Packaging] Add list of used source files to buildinfo package Date: Tue, 5 Nov 2024 08:15:04 +0100 Message-ID: <879df71632cb220e880ec5176e84c527df01d634.1730725508.git.juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: <4bc7ee1854ca4c9a58068e98fb14670270f7d9a0.1730725508.git.juerg.haefliger@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" BugLink: https://bugs.launchpad.net/bugs/2086606 For CVE triaging, it's helpful to have a list of all the kernel source files used for a particular build. Generate the list and add it to the buildinfo package. Signed-off-by: Juerg Haefliger --- debian.master/control.stub.in | 1 + debian/rules.d/2-binary-arch.mk | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index fde63ed40e17..c4a5f98adced 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -14,6 +14,7 @@ Build-Depends: default-jdk-headless , dh-systemd, dkms , + dwarfdump , dwarves [amd64 arm64 armhf ppc64el s390x] , flex , gawk , diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index ea54ffc2fd14..d9eaafaa6abd 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -57,6 +57,13 @@ $(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-% @echo Debug: $@ build_image $(build_image) bldimg $(bldimg) $(build_cd) $(kmake) $(build_O) $(conc_level) $(bldimg) modules $(if $(filter true,$(do_dtbs)),dtbs) + # Collect the list of kernel source files used for this build. Need to do this early + # before modules are stripped. Fail if the resulting file is empty. + find $(builddir)/build-$* -name vmlinux -o -name \*.ko -exec dwarfdump -i {} \; | \ + grep -E 'DW_AT_(call|decl)_file' | sed -n 's|.*\s/|/|p' | sort -u > \ + $(builddir)/build-$*/sources.list + test -s $(builddir)/build-$*/sources.list + @touch $@ define build_dkms_sign = @@ -511,6 +518,8 @@ endif $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/compiler install -m644 $(DROOT)/canonical-certs.pem $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/canonical-certs.pem install -m644 $(DROOT)/canonical-revoked-certs.pem $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/canonical-revoked-certs.pem + # List of source files used for this build + install -m644 $(builddir)/build-$*/sources.list $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/sources headers_tmp := $(CURDIR)/debian/tmp-headers headers_dir := $(CURDIR)/debian/linux-libc-dev