From patchwork Wed Feb 7 11:24:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1896103 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 4TVHpW49mMz23gt for ; Wed, 7 Feb 2024 22:25:07 +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 1rXg2z-0004kF-3C; Wed, 07 Feb 2024 11:24:57 +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 1rXg2s-0004j2-Ey for kernel-team@lists.ubuntu.com; Wed, 07 Feb 2024 11:24:50 +0000 Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.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 E15223FA8A for ; Wed, 7 Feb 2024 11:24:49 +0000 (UTC) Received: by mail-lf1-f69.google.com with SMTP id 2adb3069b0e04-5114c5e286aso366297e87.1 for ; Wed, 07 Feb 2024 03:24:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707305089; x=1707909889; 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=U6l02A1NuqqC+PPyRY+6kwnVuyc1UfkwusJIRY2SFfM=; b=hzA+W8jEmT1fMUKe+CG51l8LNWDr/aq1Gr6JutffTf8pE3T6nEwHgEeK2fu1RTPNAt /1qXAOndcwlh4CytpF7mMy1XtYxguYQn0I/s/Ncg2s7jhT8drEcsv5kcvAFQLaPdfy4n FWCK3qBoKGs/KXJk4DlsTe1/9cYuzqSnI39w7UxpfTy6SYPlR6udrUjlf1P9YRc5thdc I3BGkPqwan3y+F6VmaNHcH/CjevVv/tW7z6/nvvthUdXDsXavlhAvs+C8r6GwFDxzN3r 2gWbbYkO6Kg6LP8q2nUnlrWVOVvRh41k+7HQ3bMliZv16PDXzvjdS4p2+p3YcdBg8rxe mkZA== X-Gm-Message-State: AOJu0YyPGJgt7Nc0a1CI0HOugVcbUWFuiKAcOMzIrVhPwTa22oJZC62D 5m/p+lt8MCf/d9FJ5wE9rIcvwSfNZPMbpQXTi35UQF4CQKfPcJQluV1J9cIcurQ75ZhGlrAlCAM kqXDhUNFDi0EXmJ3yvpCGmQxbqT6arTaAiFZy1f+o/b8UICMI/mZA/FUOxAk2bPaat6nUGALIuL Rixhsdbt5mNw== X-Received: by 2002:a05:6512:4850:b0:511:5756:f54d with SMTP id ep16-20020a056512485000b005115756f54dmr3929736lfb.60.1707305089357; Wed, 07 Feb 2024 03:24:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IGtgmZH4I6APblcaHj7gn/CwuTwLnu+A0G/p8G/OuxamNRZfgIev864BDcSvHgcumc4pRX10A== X-Received: by 2002:a05:6512:4850:b0:511:5756:f54d with SMTP id ep16-20020a056512485000b005115756f54dmr3929720lfb.60.1707305088916; Wed, 07 Feb 2024 03:24:48 -0800 (PST) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id hu23-20020a05600ca29700b0040fdf204fe7sm4829733wmb.38.2024.02.07.03.24.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 03:24:48 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Noble][PATCH 1/2] UBUNTU: [Packaging] Move linux-source package stub to debian/control.d Date: Wed, 7 Feb 2024 12:24:45 +0100 Message-Id: <20240207112446.1986592-2-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240207112446.1986592-1-juerg.haefliger@canonical.com> References: <20240207112446.1986592-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" BugLink: https://bugs.launchpad.net/bugs/2052439 The linux-source- package may only be built for the main linux source package. Similar to linux-libc-dev, move the packaging stub to debian/control.d and only include it if the source package name is indeed 'linux'. Signed-off-by: Juerg Haefliger --- debian.master/control.stub.in | 24 ------------------------ debian/control.d/linux-source.stub | 23 +++++++++++++++++++++++ debian/rules | 1 + 3 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 debian/control.d/linux-source.stub diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 5bc5986172e1..11b996bb40b4 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -57,30 +57,6 @@ Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/=SERIE XS-Testsuite: autopkgtest #XS-Testsuite-Depends: gcc-4.7 binutils -Package: linux-source-PKGVER -Build-Profiles: -Architecture: all -Section: devel -Priority: optional -Provides: linux-source -Depends: ${misc:Depends}, binutils, bzip2, coreutils -Recommends: libc-dev, gcc, make -Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev -Description: Linux kernel source for version PKGVER with Ubuntu patches - This package provides the source code for the Linux kernel version - PKGVER. - . - This package is mainly meant for other packages to use, in order to build - custom flavours. - . - If you wish to use this package to create a custom Linux kernel, then it - is suggested that you investigate the package kernel-package, which has - been designed to ease the task of creating kernel image packages. - . - If you are simply trying to build third-party modules for your kernel, - you do not want this package. Install the appropriate linux-headers - package instead. - Package: SRCPKGNAME-headers-PKGVER-ABINUM Build-Profiles: Architecture: all diff --git a/debian/control.d/linux-source.stub b/debian/control.d/linux-source.stub new file mode 100644 index 000000000000..f2acbfe38624 --- /dev/null +++ b/debian/control.d/linux-source.stub @@ -0,0 +1,23 @@ +Package: linux-source-PKGVER +Build-Profiles: +Architecture: all +Section: devel +Priority: optional +Provides: linux-source +Depends: ${misc:Depends}, binutils, bzip2, coreutils +Recommends: libc-dev, gcc, make +Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-dev +Description: Linux kernel source for version PKGVER with Ubuntu patches + This package provides the source code for the Linux kernel version + PKGVER. + . + This package is mainly meant for other packages to use, in order to build + custom flavours. + . + If you wish to use this package to create a custom Linux kernel, then it + is suggested that you investigate the package kernel-package, which has + been designed to ease the task of creating kernel image packages. + . + If you are simply trying to build third-party modules for your kernel, + you do not want this package. Install the appropriate linux-headers + package instead. diff --git a/debian/rules b/debian/rules index 1974ce518c50..eee65f1ea19e 100755 --- a/debian/rules +++ b/debian/rules @@ -172,6 +172,7 @@ ifeq ($(src_pkg_name),linux) control_files += debian/control.d/linux-tools-common.stub control_files += debian/control.d/linux-cloud-tools-common.stub control_files += debian/control.d/linux-tools-host.stub + control_files += debian/control.d/linux-source.stub endif # Calculate Ubuntu Compatible Signing levels From patchwork Wed Feb 7 11:24: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: 1896102 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 4TVHpW3tPvz23gb for ; Wed, 7 Feb 2024 22:25:07 +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 1rXg2x-0004jr-67; Wed, 07 Feb 2024 11:24: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 1rXg2s-0004j4-Uh for kernel-team@lists.ubuntu.com; Wed, 07 Feb 2024 11:24:51 +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-0.canonical.com (Postfix) with ESMTPS id 98B0A3FA8D for ; Wed, 7 Feb 2024 11:24:50 +0000 (UTC) Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-40f00a86728so2936455e9.2 for ; Wed, 07 Feb 2024 03:24:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707305090; x=1707909890; 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=7TUbK2QycBS16k0K158Wx9lg8J7eOZpuDX5AwkTlE2U=; b=Ajeai7V8dsqs/HimqTNVJIATnvcWoudsxFWw7lRh9F2vXRnEGwbK5x7WXMp2/sK/cX vuXZIZs915BN6iMqsf2etcDI8L//fSERzdXVeBzioICJXVbpxGjYMKV8OaAcw2UXvUYM EZF3nTHpy1b+Nv+t4uE4v007GRb+UMHhGcjuEbmjPwbqOkh3qL+F/fZ8FIK+/MIvy0I7 SLR4ojx+LKECtcwihVrDj1u7Pf6ChSZOZyAJjqvfXnWD5KYv/IAbudogudXG0kh1Qjr0 iO/upbwu80m5/QbJ3StG4JtFuLqWLvXaG+oOU5HHTHhz+42+ONZgkU/TPmb9wKpw+Dl7 SQzA== X-Gm-Message-State: AOJu0YxKi1gTpikDirR97xBUBFRoCO7WQd9brFHtYGqhM8wIWmznjvUx 82BD+v0HZd4ZZxKdQDQrgOAX7Gk9dgJhv01hobZwTbP5oGmQmlCxCBZSv14E7SGWdGTsXp5GEw/ abwjO1X8wCj70q9qFOsx6ashM1+TUs7bA1ynL8/adi9YdjZT4Jic9U1ddjE41xjZytk0KErpeOl e1FuZWjc83tQ== X-Received: by 2002:a05:600c:5250:b0:410:12a3:8c05 with SMTP id fc16-20020a05600c525000b0041012a38c05mr896200wmb.24.1707305090344; Wed, 07 Feb 2024 03:24:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IG9TF2VM+/oL+kdgQziwNv8UYW0yIVolWhM3wBmM+glnAI1UrITSS8zIwtA7A4nonsICc9AcQ== X-Received: by 2002:a05:600c:5250:b0:410:12a3:8c05 with SMTP id fc16-20020a05600c525000b0041012a38c05mr896192wmb.24.1707305090111; Wed, 07 Feb 2024 03:24:50 -0800 (PST) Received: from localhost ([81.221.247.52]) by smtp.gmail.com with ESMTPSA id k5-20020a05600c1c8500b0040fc26183e8sm1791528wms.8.2024.02.07.03.24.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 03:24:49 -0800 (PST) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable/Noble][PATCH 2/2] UBUNTU: [Packaging] Build linux-source package only for the main kernel Date: Wed, 7 Feb 2024 12:24:46 +0100 Message-Id: <20240207112446.1986592-3-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240207112446.1986592-1-juerg.haefliger@canonical.com> References: <20240207112446.1986592-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" BugLink: https://bugs.launchpad.net/bugs/2052439 The linux-source package only makes sense for the main linux kernel. Building it for derivatives is useless and just confuses users. By default it is enabled globally in 0-common-vars.mk so make sure it is turned off afterwards for non-linux source packages. Signed-off-by: Juerg Haefliger --- debian/rules | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/rules b/debian/rules index eee65f1ea19e..123bdf6a3ecc 100755 --- a/debian/rules +++ b/debian/rules @@ -55,6 +55,13 @@ ifeq ($(src_pkg_name),linux) do_tools_host = true endif +# The linux-source package may only be built for the linux source package +# We need to explicitly turn this off here to override any (incorrect) +# statement in any of the above included makefile snippets +ifneq ($(src_pkg_name),linux) + do_source_package = false +endif + # Default settings for DKMS modules. $(foreach _m,$(all_dkms_modules), \ $(eval do_$(_m) ?= $(if $(filter $(_m),$(filter-out $(dkms_exclude),$(dkms_include) $(subst any,$(_m),$(subst $(arch),$(_m),$(dkms_$(_m)_archs))))),true,false)) \