From patchwork Tue Nov 5 07:15:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 2006735 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 4XjKP461Wcz1xyD for ; Tue, 5 Nov 2024 18:15:36 +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 1t8Dmg-0006HP-UL; Tue, 05 Nov 2024 07:15:26 +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 1t8Dmc-00065g-Ah for kernel-team@lists.ubuntu.com; Tue, 05 Nov 2024 07:15:22 +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-0.canonical.com (Postfix) with ESMTPS id 8C49E3F516 for ; Tue, 5 Nov 2024 07:15:21 +0000 (UTC) Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-37d537292d7so3460564f8f.2 for ; Mon, 04 Nov 2024 23:15:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730790921; x=1731395721; 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=Ra3WKYZQn7u2BBx6I4TSZvuvJmmKPTjIPb06niFGvVU=; b=wGMVUasHPV+HZjcmGCRCpYTcQ4B3YJOhQEf1wIR0l/c86HEK5VYP3PQ3ZqVBtpJzrI L8u1XuTxg8PxVQZswA5fboKbwous/3/240HBUSZ0MbsrFXNX4dL8PWAnjy4PYOMsQ5s6 9rG6xlcPVmYVZHQ7J47+CpvM6SjPyI0y6+vS8UGegCLcic/IftVvBg/pSVLrjUUO5v9s RWbUHfn93RwCjZh7B2WU3gDQEG1b8lEtz7YSzM7mzIdNBVfgL0vGE1faHurpjKjSLWsr HdcX+BspCZe9VfGloIAp9zNDMt6k++loJoLSH8ZGypQz/W4iGOMqR2KlgLb3JoySzGc8 RCtg== X-Gm-Message-State: AOJu0YzRjsEubL7rSB9FoYOt7FwkUjBBRqhQeCcN5m/Zfk7nIMSusjGP Yo0KsGPW6XIrGEE2sf4PICSOf+E4S+/8e45TNLspq0Yc5eN5bjyj4vdjtcmrh3KJkKKiSJAbeYo 6v7LBtGQrmR01uVAfVcaZkkU0XXmnOpa+w0XBF7XguQhAscFRsr5iDSagDW67H8+M7tzFlaeogK 3RlijkiCQRCQ== X-Received: by 2002:a05:6000:782:b0:37d:542a:7995 with SMTP id ffacd0b85a97d-381c7a6d37amr16052506f8f.34.1730790921115; Mon, 04 Nov 2024 23:15:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IGBST9S9C/wNYSmj8GiofdRfs0jS7U35xadr9GgPdQ9nli7rOGxwkY8c7nziDp+u8Iz+czY+A== X-Received: by 2002:a05:6000:782:b0:37d:542a:7995 with SMTP id ffacd0b85a97d-381c7a6d37amr16052488f8f.34.1730790920751; Mon, 04 Nov 2024 23:15:20 -0800 (PST) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381c10ea7a1sm15070046f8f.62.2024.11.04.23.15.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 23:15:20 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][O][PATCH 1/2] UBUNTU: [Packaging] Sort build dependencies alphabetically Date: Tue, 5 Nov 2024 08:15:03 +0100 Message-ID: <8278d3767db31201cab2f32996742088e6720267.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 No functional changes, just reordering. Signed-off-by: Juerg Haefliger --- debian.master/control.stub.in | 68 +++++++++++++++++------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 64001ad7a17f..81730f7a22a4 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -5,56 +5,56 @@ Maintainer: Ubuntu Kernel Team Rules-Requires-Root: no Standards-Version: 3.9.4.0 Build-Depends: - debhelper-compat (= 10), + autoconf , + automake , + bc , + bindgen [amd64 arm64 armhf ppc64el riscv64 s390x], + bison , + clang-18 [amd64 arm64 armhf ppc64el riscv64 s390x], 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 [!i386] , - libdw-dev , - libpci-dev , - pkg-config , - python3 , - python3-dev , - python3-setuptools, - 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 , + libstdc++-dev, libtool , - uuid-dev , - libnuma-dev [amd64 arm64 ppc64el s390x] , libtraceevent-dev [amd64 arm64 armhf ppc64el s390x riscv64] , libtracefs-dev [amd64 arm64 armhf ppc64el s390x riscv64] , - dkms , - curl , - zstd , + 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] , - clang-18 [amd64 arm64 armhf ppc64el riscv64 s390x], - rustc [amd64 arm64 armhf ppc64el riscv64 s390x], + pkg-config , + python3 , + python3-dev , + python3-setuptools, + rsync [!i386] , rust-src [amd64 arm64 armhf ppc64el riscv64 s390x], + rustc [amd64 arm64 armhf ppc64el riscv64 s390x], rustfmt [amd64 arm64 armhf ppc64el riscv64 s390x], - bindgen [amd64 arm64 armhf ppc64el riscv64 s390x], - libstdc++-dev, + uuid-dev , + zstd , Build-Depends-Indep: - xmlto , - bzip2 , - sharutils , asciidoc , + bzip2 , python3-docutils , + 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:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 2006737 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 4XjKP74Z9hz1xyD for ; Tue, 5 Nov 2024 18:15:39 +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 1t8Dmj-0006OA-Ba; Tue, 05 Nov 2024 07:15:29 +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 1t8Dmh-0006Hq-MY for kernel-team@lists.ubuntu.com; Tue, 05 Nov 2024 07:15:27 +0000 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.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-1.canonical.com (Postfix) with ESMTPS id F108B3F0BE for ; Tue, 5 Nov 2024 07:15:26 +0000 (UTC) Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-431518e6d8fso33897655e9.0 for ; Mon, 04 Nov 2024 23:15:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730790926; x=1731395726; 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=aKz8Qgl9BOYgtCbyc5UFH9qTBUnaSYhNgluKpA8dnxs=; b=GUnoaMT8D++IpHEmNRNwfPwTjDjS1gAiMG4yKTiPy/BCoN6KSoMBQRDdCjtORjxa4t +kjn581l8S6m+bEVlsKT9YU7TUmlkcv3WJypD/RK8mdG0HUoTU0dLkMnLqjSaoILCEn4 XSb1fZ8+dRCYMOfx7GYJmgSEMgtsLsSG5yeTSBVpc7NvcnNr2NMVqpO8Hb+tJW+GyTOP FZ6dwyj3vnd/6CnEFKLBLa8tJdZjrpzrLsFtxANXXmYhhwalsMSdSx0c2vPotf+OLRY+ BjVBfuJG4kx2JbhKs09gfd/ItKO/QbEik3rQ01f4hGi9YEU29sdcBPmek6D4HBNjy87M uTcA== X-Gm-Message-State: AOJu0Yzt/YBA8sa8PU2QZqIH7aFS/TKby+PxSbctaGxlYztF7oKz4yIe E8wZXJ3wuEQc7OhzIS5WZjflktUeg3gY+6IjobSlKZgR4SLK8oXiRgQT3sI4xsENS7uPh2uvhDH EFhqgtflZIIA/1ELNE6Ccp9ekCDc88SEkG9cfAh0ht8g0EoWLMMaVJzeHXVFZ+SYjlvMCPE73PE Gbk/61Ui+Epw== X-Received: by 2002:a05:600c:35cf:b0:431:3b53:105e with SMTP id 5b1f17b1804b1-43283244e02mr132135025e9.9.1730790926578; Mon, 04 Nov 2024 23:15:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IHBLCe24J/yIt+bxIrb27en0SCFvIBBGv1TlWEvhqEUoh/HMImAvharTOIJii763iwr8Nsynw== X-Received: by 2002:a05:600c:35cf:b0:431:3b53:105e with SMTP id 5b1f17b1804b1-43283244e02mr132134865e9.9.1730790926160; Mon, 04 Nov 2024 23:15:26 -0800 (PST) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4327d5c65absm174228015e9.16.2024.11.04.23.15.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 23:15:25 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][O][PATCH 2/2] UBUNTU: [Packaging] Add list of used source files to buildinfo package Date: Tue, 5 Nov 2024 08:15:07 +0100 Message-ID: <8e08dcfccbaa3440edd066db33ad122e2fd361cc.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 | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 81730f7a22a4..744dce7bb70e 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -16,6 +16,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 137d975f0424..7864f764d76a 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -43,6 +43,14 @@ ifeq ($(do_dbgsym_package),true) $(kmake) O=$(builddir)/build-$* $(conc_level) scripts_gdb ; \ 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 + $(stamp) define build_dkms_sign = @@ -479,6 +487,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 # Get rid of .o and .cmd artifacts in headers find $(hdrdir) -name \*.o -or -name \*.cmd -exec rm -f {} \;