From patchwork Wed Feb 7 02:02:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1895977 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 4TV3LF5pRPz23gD for ; Wed, 7 Feb 2024 13:03:17 +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 1rXXHF-0004jR-Kx; Wed, 07 Feb 2024 02:03:06 +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 1rXXGx-0004hv-LA for kernel-team@lists.ubuntu.com; Wed, 07 Feb 2024 02:02:48 +0000 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (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 3E63440606 for ; Wed, 7 Feb 2024 02:02:47 +0000 (UTC) Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-33b316fcaecso62820f8f.3 for ; Tue, 06 Feb 2024 18:02:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707271365; x=1707876165; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f2UpAFUi2uSopDiuYAknY9U7Ml3GHMYxmKU4JNPfGdE=; b=ikA3X9//pSCVQ604yI1Ms9GYHv3xFHxMkryPGuvyJxwP/5toDhbLVnJ6DLiTNArnTZ h5VnJNPmCMQWgW10jHFr6T08iR0qBoHbbG695k4CxZ0b3EWhwXR+GV91G2zo8FwAS6pW V9qLMJJ2S/ilHXIdKnmBqyRNd/baIflusHcn4csIZod/khrVQwLiEmLbZYTVOtqluh5F PWKvH2WrZjBoj4Aednm4DdDC7Th8BtwsY1STkhMtwgMphfzo2Q4f64HoFKo2HAalmk7D NlOQlNI9EbxNMBpRNdY5Swi+eUSg1CW2QQ9ibO1zKgB+/qYJGjP0ewJ2jbVy6xCDfImN KMLQ== X-Gm-Message-State: AOJu0Yw5IpWvY6jUIX6Wy/NfZHL8ZjMr0ThlEQ3r/PbVU367sM9iyHsd wryxVpdA4ZtFFzHUYsiDHougPSnpS0iWspF+hbbx3WXjhT0NWVuIUYL3I90qaCEKRjqTjNAVWBm 3MAe1NqBaAUNF7UYnTavIvPOCyxmKw7xPf3p01x9+Kf79nOXONxoA7XXNM4xLKPn9KMHmjDozM3 /H7+zgufYkSA== X-Received: by 2002:adf:e843:0:b0:33a:e76e:8b5c with SMTP id d3-20020adfe843000000b0033ae76e8b5cmr2205371wrn.33.1707271365568; Tue, 06 Feb 2024 18:02:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IE0q/FVMwdnqvlWwfIVkPSvI2aMakL3/pKZ8k+8YlU+drtzaQmgdGB8SZqZaeKWbUzsff4d8Q== X-Received: by 2002:adf:e843:0:b0:33a:e76e:8b5c with SMTP id d3-20020adfe843000000b0033ae76e8b5cmr2205365wrn.33.1707271365327; Tue, 06 Feb 2024 18:02:45 -0800 (PST) Received: from localhost ([2a01:4b00:85fd:d700:3da5:e359:d237:a3c8]) by smtp.gmail.com with ESMTPSA id bv11-20020a0560001f0b00b0033b2f127f69sm266873wrb.26.2024.02.06.18.02.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 18:02:44 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [UNSTABLE][PATCH 1/2] UBUNTU: [Packaging] Switch to 3.0 dpkg source formats Date: Wed, 7 Feb 2024 02:02:38 +0000 Message-Id: <20240207020239.120806-2-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240207020239.120806-1-dimitri.ledkov@canonical.com> References: <20240207020239.120806-1-dimitri.ledkov@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" This patch switches packaging to 3.0 dpkg source formats. Using native (no orig-tarball) for RC releases, and quilt (with orig tarball) for released kernels. This is a minimal conversion to the new formats. The immediate benefit is ability to use xz compression for the source tarballs, GPG verified upstream tarballs, and simplify kernel patching for those that are rebuilding Ubuntu kernels. Once this is applied we will then be able to further simplify our packaging by collapsing debian.* directories under debian dir, and significantly reducing - if not eliminating our reconstruct scripts. Signed-off-by: Dimitri John Ledkov Acked-by: Masahiro Yamada --- debian/rules.d/1-maintainer.mk | 2 ++ debian/source/format | 2 +- debian/source/local-options | 12 ++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 debian/source/local-options diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index dfcd814e2d..51eae55f78 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -114,8 +114,10 @@ autoreconstruct: # No need for reconstruct for -rc kernels since we don't upload an # orig tarball, so just remove it. if grep -q "^EXTRAVERSION = -rc[0-9]\+$$" Makefile; then \ + echo "3.0 (native)" > debian/source/format; \ echo "exit 0" >$(DEBIAN)/reconstruct; \ else \ + echo "3.0 (quilt)" > debian/source/format; \ $(DROOT)/scripts/misc/gen-auto-reconstruct $(upstream_tag) $(DEBIAN)/reconstruct $(DROOT)/source/options; \ fi diff --git a/debian/source/format b/debian/source/format index d3827e75a5..89ae9db8f8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (native) diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000000..d77c6f2631 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,12 @@ +# Do not ingore removed files and include them in the automatically +# generated patch +include-removal +# Do not try to prepare the build tree by applying patches which are +# apparently unapplied +no-preparation +# Use debian-changes patch name without version number +single-debian-patch +# Do not try to unapply patches +no-unapply-patches +# Automatically add to quilt series the autogenerated patch +auto-commit