From patchwork Tue Nov 5 07:15:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 2006732 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 4XjKP01NmBz1xyD for ; Tue, 5 Nov 2024 18:15:32 +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 1t8Dmc-00065t-Ev; Tue, 05 Nov 2024 07:15:22 +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 1t8Dma-00062f-0o for kernel-team@lists.ubuntu.com; Tue, 05 Nov 2024 07:15:20 +0000 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.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 841EA3F0BE for ; Tue, 5 Nov 2024 07:15:19 +0000 (UTC) Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4317391101aso33805485e9.2 for ; Mon, 04 Nov 2024 23:15:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730790918; x=1731395718; 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=M3Z3Omb2dm9xpU7y/KJoUA78yNV/pJPOWyKcAZ2OZD4=; b=Al2txHOwckHTG9cW3otkJz/ogDTcUiJKCrEbX7tJP6wRphl5hNN6ijVR3CjJJXsCpN HDLDqQLl7he+V1B2mNTIrel1OgRmDP+yNjQsz5SNrk5YlGnufGlPBINcPKN2lEAgaBnQ wslIFhlF61qh77Y8tz9rHSXFYBBeq0AMbgdKyX/c5a7KTFVD5jNnkNpfVy50qisWCLdf hrAWK0WV4vakyf99tTmRA/J8TTb+7lOHGZx5H3T32RV9My7q/T17WtApRo3yZp2s006A 5SdQtkuCeeIwIPhzzSZ4rdIU3YoX63JtHHGySOG02jqsuMcnbpMXw0XVPxYZjNn0UBhX sSOw== X-Gm-Message-State: AOJu0YwVd0P7iI+0WpNesoq5gGnaaw2IdJY+x4a1CrY13Tqu3o5hfoPP p0xlJ8xOyPXC6lZYkwPtEVBVgoj/Src8VEpRkMV/ub0XeQ/26pL6I4Zo81NQ5crpO20TmqUqx/x oFaPU5K84omJbZ/DFp0aANeEksgA2LV3ShMiB10bmGkCmVs/s1gmQjO37fzevP6SDUVM4264KVI V/QvTh/uaiLQ== X-Received: by 2002:a05:600c:54c8:b0:431:5bb1:f088 with SMTP id 5b1f17b1804b1-43285649f9cmr123970565e9.29.1730790918324; Mon, 04 Nov 2024 23:15:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IGtNDNwsbOzW10bFYUGpn1mv5sGZoot/n6heBoMSz4AQV3U267qdd+/7eDhqOsz+VIr/bAi5g== X-Received: by 2002:a05:600c:54c8:b0:431:5bb1:f088 with SMTP id 5b1f17b1804b1-43285649f9cmr123970375e9.29.1730790917955; Mon, 04 Nov 2024 23:15:17 -0800 (PST) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-431bd9403bfsm206405335e9.21.2024.11.04.23.15.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 23:15:17 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][J][PATCH 1/2] UBUNTU: [Packaging] Sort build dependencies alphabetically Date: Tue, 5 Nov 2024 08:15:01 +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 | 70 +++++++++++++++++------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 0f474f79b889..f6c1db0f098e 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -4,58 +4,58 @@ Priority: optional Maintainer: Ubuntu Kernel Team Standards-Version: 3.9.4.0 Build-Depends: - debhelper-compat (= 10), + autoconf , + automake , + bc , + bison , cpio, + curl , + debhelper-compat (= 10), + default-jdk-headless , + dkms , + flex , + gawk , + java-common , 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 , - python3-dev , - 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 , + libudev-dev , + libunwind8-dev [amd64 arm64 armhf ppc64el] , + makedumpfile [amd64] , + openssl , + pahole [amd64 arm64 armhf ppc64el s390x riscv64] | dwarves (>= 1.21) [amd64 arm64 armhf ppc64el s390x riscv64] , + pkg-config , + python3-dev , + rsync , uuid-dev , - libnuma-dev [amd64 arm64 ppc64el s390x] , - dkms , - curl , zstd [amd64 s390x] , - pahole [amd64 arm64 armhf ppc64el s390x riscv64] | dwarves (>= 1.21) [amd64 arm64 armhf ppc64el s390x riscv64] , Build-Depends-Indep: - xmlto , + asciidoc , + bzip2 , docbook-utils , - ghostscript , + dvipng , fig2dev , - bzip2 , - sharutils , - asciidoc , - python3-sphinx , - python3-sphinx-rtd-theme , fontconfig , - python3-docutils , - imagemagick , - graphviz , - dvipng , fonts-noto-cjk , + ghostscript , + graphviz , + imagemagick , latexmk , librsvg2-bin , + 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:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 2006736 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 4XjKP542ntz1xyP for ; Tue, 5 Nov 2024 18:15:37 +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 1t8Dmi-0006KQ-6g; Tue, 05 Nov 2024 07:15:28 +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 1t8Dmh-0006Fp-6u for kernel-team@lists.ubuntu.com; Tue, 05 Nov 2024 07:15:27 +0000 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (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 8EDBA3F516 for ; Tue, 5 Nov 2024 07:15:24 +0000 (UTC) Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4315af466d9so34534535e9.3 for ; Mon, 04 Nov 2024 23:15:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730790924; x=1731395724; 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=ZbtKXBZ4dMKGAsva6PEZs3AAbkGtbhEtXn50GS0/kv8=; b=GB1i1/zNRvPnMaHhj1O9JMbbUhFGqGfU1rx2lj8zw1cgyHZwP7K+Of1BcqZBrByykJ gU/kO5SB7Qp27578GjEax4/OUY1h2qjXvJF4Ur2hu2MuSaVsa2GFryBC+dDAB5UX/hZ0 a0qvkx0X86HAk5zTxl0xXGjhbp1iMNXT4NghSsZicvctUgRgzACs8bEM+9JVvv2/hy/I Tuzh8m7SpADPaShGiUFB0pEk/89Br5ev86TY0XdLgZ7OaKPTlDYMcmX52jE/n2je991T /pWSAkvXESvKPYPsO9Ths/C16LHmyUBvmJcMm9t3hG6kmX6rep6kXnDjnDhMmZ5wkI2+ Q37Q== X-Gm-Message-State: AOJu0YwT6Wy8kXIZsiBUVtpVO4oFInnGR6y+sksN/uwdaRwr9RHKv5Jv qpZJghvFfTZMEvxy46u6dzD0gbi4ClEsQLOuocZpqqJwdiSbkD0JSfF1rAJe+EHiaNXPV+cdpHY MYa2QHfKc+Rc/a/iJ7TrhFd9H6LTB94M0oib6nCyXT5ErLaCK0nkoJ0ljuki2tbu3oz5gtT7AuR sf8SBQcRB9JA== X-Received: by 2002:a05:6000:693:b0:37d:39c8:ecca with SMTP id ffacd0b85a97d-381c7ab3097mr12705316f8f.55.1730790923844; Mon, 04 Nov 2024 23:15:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IHHHcsq57siAnrL5B9MuZlVhTW58MZLO8lrcYhOJ+niiqkPWMp3WHT97AVh7+8YBUTST3eA2A== X-Received: by 2002:a05:6000:693:b0:37d:39c8:ecca with SMTP id ffacd0b85a97d-381c7ab3097mr12705297f8f.55.1730790923485; Mon, 04 Nov 2024 23:15:23 -0800 (PST) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381c10b7a9esm15169548f8f.21.2024.11.04.23.15.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 23:15:22 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][J][PATCH 2/2] UBUNTU: [Packaging] Add list of used source files to buildinfo package Date: Tue, 5 Nov 2024 08:15:05 +0100 Message-ID: <28ff0d9deac6b02bc3924c34ebf1062fd876ad24.1730725509.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 f6c1db0f098e..cf57ba9be5ca 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -13,6 +13,7 @@ Build-Depends: debhelper-compat (= 10), default-jdk-headless , dkms , + dwarfdump , flex , gawk , java-common , diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 02e65da7b604..ff6a26e91599 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -64,6 +64,13 @@ ifneq ($(skipdbg),true) fi endif + # 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 = @@ -540,6 +547,8 @@ endif fi 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 ifneq ($(full_build),false) # Clean out this flavours build directory.