From patchwork Wed Mar 6 22:12:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1909035 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 4Tqmrv0Ps7z1yX0 for ; Thu, 7 Mar 2024 09:12:46 +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 1rhzUt-0001wR-4e; Wed, 06 Mar 2024 22:12:23 +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 1rhzUm-0001vx-My for kernel-team@lists.ubuntu.com; Wed, 06 Mar 2024 22:12:16 +0000 Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) (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 505403F6B1 for ; Wed, 6 Mar 2024 22:12:16 +0000 (UTC) Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2d2d59be640so1068111fa.0 for ; Wed, 06 Mar 2024 14:12:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709763135; x=1710367935; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nhIYZyL0YvyT4dgUEJqTaZlGWKq2FgM9gxyoS/qGm9g=; b=LDNtuhZOxUDKz/wsM9hjcz4oaVxL/OAPt86/FtN7lMtzxV6Vl0y2cV3MpZRe+lPcD/ B8oFQo8Fcei5qTBQADg6jum0AhtMkiOT+cjQ9FFToejf1L5G8MQsZJQvMQqJ7XukaDk/ NY+DcoUiI/92Hxa9IpNr+RzsMU8lUbGJ8TxYa/szeCwY4VxQ6BgPd95SPOOTcKXobg6L /UX119bWiKy6CRSrWBoE+oPQANAi2PzE3Kj2/MSfmhNqoiN3zc7yBPL2ceTcWbVE08+7 qdT2JxKucc1kdeFAgr6krRgbq5NmISvgSgKavvO294FoSQAk/XVVCG9Iz0EhUD6s4aMy 29YA== X-Gm-Message-State: AOJu0YzwsJRSWlwoFKsPjuviW5QFjDd4vaFN9AN//2YnpNSLOfWKUsTz Yv9s5Yng3tHjuZalp9YQSC00dIF7uGXCK9twqQI8i0YgBjjm0QK061OAkuBcO+rJ61EthIbxzuk Zv5VwZMNxThxSN3jFTzTYOLQneCoqsASUEsoWl/0vLnRYCnf1NOaJVzibiNbLu82hleE1aLWoHh R0pSmtcHIl4Q== X-Received: by 2002:a2e:be23:0:b0:2d3:f464:4776 with SMTP id z35-20020a2ebe23000000b002d3f4644776mr196083ljq.42.1709763135498; Wed, 06 Mar 2024 14:12:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IFtt4QiazUuih+kNGwNhT1e9MfsMEmEDvMBJkBuYGGBOaV/ovdTRZ8FF3U/gmz4UfOMujtGPQ== X-Received: by 2002:a2e:be23:0:b0:2d3:f464:4776 with SMTP id z35-20020a2ebe23000000b002d3f4644776mr196069ljq.42.1709763134805; Wed, 06 Mar 2024 14:12:14 -0800 (PST) Received: from gpd.homenet.telecomitalia.it (host-95-252-40-65.retail.telecomitalia.it. [95.252.40.65]) by smtp.gmail.com with ESMTPSA id g7-20020a056402428700b0056740ba5eb0sm707743edc.37.2024.03.06.14.12.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 14:12:14 -0800 (PST) From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [U/N][PATCH 1/1] UBUNTU: [Packaging] re-introduce linux-doc as an empty package Date: Wed, 6 Mar 2024 23:12:12 +0100 Message-ID: <20240306221213.405505-1-andrea.righi@canonical.com> X-Mailer: git-send-email 2.43.0 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: , Cc: Gianfranco Costamagna Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" In commit fd8ee93c3a38 ("UBUNTU: [Packaging] drop useless linux-doc") we decided to remove the linux-doc package, saving in this way a lot of space required to produce the documentation content (that can be easily found online). However, this change broke some user-space packages that are still requiring linux-doc as a dependency. Therefore, re-introduce an empty linux-doc package to prevent the breakgage and at the same time avoid to re-introduce the expensive build dependencies. Signed-off-by: Andrea Righi --- debian.master/control.d/linux-doc.stub | 8 ++++++++ debian/rules | 3 +++ 2 files changed, 11 insertions(+) create mode 100644 debian.master/control.d/linux-doc.stub diff --git a/debian.master/control.d/linux-doc.stub b/debian.master/control.d/linux-doc.stub new file mode 100644 index 000000000000..657144763c74 --- /dev/null +++ b/debian.master/control.d/linux-doc.stub @@ -0,0 +1,8 @@ +Package: linux-doc +Build-Profiles: +Architecture: all +Section: doc +Priority: optional +Description: Linux kernel specific documentation for version PKGVER + This package is deprecated and it is temporarily provided only for + compatibility reasons. It will be dropped in the future. diff --git a/debian/rules b/debian/rules index 303e8fcec153..ce09c3cf1c65 100755 --- a/debian/rules +++ b/debian/rules @@ -174,6 +174,9 @@ ifeq ($(src_pkg_name),linux) control_files += debian/control.d/linux-tools-host.stub control_files += debian/control.d/linux-source.stub endif +ifneq (,$(wildcard $(DEBIAN)/control.d/linux-doc.stub)) + control_files += $(DEBIAN)/control.d/linux-doc.stub +endif # Calculate Ubuntu Compatible Signing levels UBUNTU_COMPATIBLE_SIGNING=$(shell grep -qx ' *Subject: C = GB, ST = Isle of Man, O = Canonical Ltd., OU = Secure Boot, CN = Canonical Ltd. Secure Boot Signing (2021 v3)' debian/canonical-revoked-certs.pem && echo ubuntu/4 pro/3)