From patchwork Thu Oct 24 13:05:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 2001716 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 4XZ5l11sQvz1xtp for ; Fri, 25 Oct 2024 00:06:04 +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 1t3xXG-000239-D9; Thu, 24 Oct 2024 13:05:54 +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 1t3xXE-00021j-KR for kernel-team@lists.ubuntu.com; Thu, 24 Oct 2024 13:05:52 +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-0.canonical.com (Postfix) with ESMTPS id 253BF3F287 for ; Thu, 24 Oct 2024 13:05:52 +0000 (UTC) Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4316300bb15so6745105e9.2 for ; Thu, 24 Oct 2024 06:05:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729775151; x=1730379951; 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=MjvrGjB9Caj7IlC1zSo2F3dygv4AvWF6s13Zk7xkyYE=; b=DQy5wttZOOwcF0tz8foYV0vNjXEWb+4LBPq0cQ38ycaDy/hFpXQE8t7w7AjpC5OgHk 3FbCTD10luw7SSaeVD3JGoVR7Z52LhA08FxGwfKn/P1wbUNMmEFsgrw0MXF8KWQC12PH P8exGyiXK9E2FFm8fNLNe5GzU4XgtD15IFZ2ayYGcRWgQKUFEwqCtS9Rw69eeL4kLn1e g2+I8FMjuYejoVOozTdyu/cuBMtYzhI+4uZg+JSgjA6N1KCn0GIKFqYDsHpTmvnq2CoG UofLtA3B6+OJxjYIcV/UQsZOKVDE1WcKuMdsxRvkFizmNs7UNIeuJ7XoAmSSE3EfUJb7 y/LA== X-Gm-Message-State: AOJu0YzA4vYypWXs27LOBDvaFAUK9U1Ak1PsKALidV67LsRS/aZgFraL uDynyy2Czs6CGz2WxcCebgLtLkdiv/cSYn1TtLoFfT6303+eElkjJahLiMPk4wGGrC4GSMXZ2tI P8zgKX/0Xqn1mPMD7TITL6xyqGJ+Hg0kSJ5qA/k5/DpMEL98KJyj5NgsnG/06vntVSeibDrSMr6 gVnpeIzeJlCw== X-Received: by 2002:a05:600c:3ba3:b0:42f:4f6:f8f3 with SMTP id 5b1f17b1804b1-4318c6df936mr16583575e9.7.1729775151629; Thu, 24 Oct 2024 06:05:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFYyFbhiwfkwVNi2g8gKd/dXgXxfBIu4jxuXSY+NQ7BbeolsRgZOmw2MCBws371lbalapoT0A== X-Received: by 2002:a05:600c:3ba3:b0:42f:4f6:f8f3 with SMTP id 5b1f17b1804b1-4318c6df936mr16583415e9.7.1729775151158; Thu, 24 Oct 2024 06:05:51 -0700 (PDT) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a488edsm11280482f8f.31.2024.10.24.06.05.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 06:05:50 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH 1/2] UBUNTU: [Packaging] Sort build dependencies alphabetically Date: Thu, 24 Oct 2024 15:05:46 +0200 Message-ID: <20241024130547.1591256-2-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241024130547.1591256-1-juerg.haefliger@canonical.com> References: <20241024130547.1591256-1-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" 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 Thu Oct 24 13:05:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 2001717 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 4XZ5l130G1z1xxC for ; Fri, 25 Oct 2024 00:06:05 +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 1t3xXH-00024p-UC; Thu, 24 Oct 2024 13:05:55 +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 1t3xXG-00023J-IC for kernel-team@lists.ubuntu.com; Thu, 24 Oct 2024 13:05:54 +0000 Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) (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 4F5123F287 for ; Thu, 24 Oct 2024 13:05:54 +0000 (UTC) Received: by mail-lj1-f198.google.com with SMTP id 38308e7fff4ca-2fc969f6e27so6330071fa.3 for ; Thu, 24 Oct 2024 06:05:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729775153; x=1730379953; 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=RsGWa0XDxE7Q/rZMrR7e/C+CuM/GjiRqieTa00sGonw=; b=Be8ggQCK9Xd219WDhdDOLM3tMwj6Rx4+9tmVjJwzq17r78cEpGTYUmzYM0VA00Zr3d +euFtW5P1BFOGw1EjYiMSesoOg6z+jBhL8logNiCbUO6L0ghMwmQdGKdSbHGhugT5I5k i2Pc6hA30DOo1xdDJn3zRCjaUmLJXsfYGZftB8FIU4U1707SOX8A/JlOnPJb4Uke1fye cvXZFIWyT8raRCbQU+l5mBlz1fFlQSyy12Vo7/snKgOJt55e4MAnxoTtGHtTTDVUooY3 1c+pUC0xxNADdchUsNZa/arg1njda2RNdETgO1Sbr+wjygbIMuvYlTrJ4kPsAbh/k0LV /3Lw== X-Gm-Message-State: AOJu0YyJLgDUOpfKF+Djcx2QhvxNx8266cSseEALXO+R8fXLxufpUo12 huQYcLy2uHvhIKTmJhuo2lDA2rd+EQHZ3/lW4BFYR/oVWp9QlqGrIQzcSza2kIK2A676EF6Myon 8M25buNU+vFwHiHAJDuDwF3ZNzO1zkaZtgI8kNRuevIwRRPfT3en/Gyn/2d3I601Nb57GZqTuh7 4CMfASCobUXw== X-Received: by 2002:a05:6512:3053:b0:539:f7a2:65ac with SMTP id 2adb3069b0e04-53b23e25304mr1188430e87.35.1729775153538; Thu, 24 Oct 2024 06:05:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHeLXnVVVqNs5HDp6HPzYMCnNAh8vVqcMfgBWrqppYzb3tjKjVjD0vUUAwofuhS+sCuHm120g== X-Received: by 2002:a05:6512:3053:b0:539:f7a2:65ac with SMTP id 2adb3069b0e04-53b23e25304mr1188400e87.35.1729775152849; Thu, 24 Oct 2024 06:05:52 -0700 (PDT) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4317d03b8b4sm70456375e9.0.2024.10.24.06.05.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 06:05:52 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH 2/2] UBUNTU: [Packaging] Add list of used source files to buildinfo package Date: Thu, 24 Oct 2024 15:05:47 +0200 Message-ID: <20241024130547.1591256-3-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241024130547.1591256-1-juerg.haefliger@canonical.com> References: <20241024130547.1591256-1-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" 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 d825644602f7..435c70df686f 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 {} \;