From patchwork Wed Feb 7 02:02:37 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: 1895976 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 4TV3L81zsGz23gD for ; Wed, 7 Feb 2024 13:03:11 +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 1rXXH6-0004iK-H6; Wed, 07 Feb 2024 02:02:56 +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 1rXXGu-0004ho-Po for kernel-team@lists.ubuntu.com; Wed, 07 Feb 2024 02:02:44 +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 83EE33FA8A for ; Wed, 7 Feb 2024 02:02:44 +0000 (UTC) Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-40fb1690f94so530725e9.0 for ; Tue, 06 Feb 2024 18:02:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707271363; x=1707876163; 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=qKCS0FbqAYNNrCX6nui3RVX+j18lwsNzJB2/Bp08oe4=; b=TQFXqtIx05Xy+y+8eOgenm5uZYxLVUiIfxGjkxWYrlSQ8qai1D8nXjzV8U4b5yn9/Y ODVdeu26g4ZNRoolPBRQxLnPQyU//wNcszOjezDGh7iS95oA18SI8AOdIM2d49nWnYQj HvrChOfI+0JmJnpkL8DahRXJCicgcMQpqvzrPQ3cwktOS4Cir3U9rL+PCew67e699NxI 9URT7T12chzhqVSR7lm6wyGISPf2crcLypNO3esVgNXTwjXNNRm//BSUzaPbQ0VVWg4f 4cHSLzt0O4Z+m/Zy8Ajl1jIDB63Pi26D3hSs/InEcEX41y26esDUFdgxhpFJ2yIW6x34 x+tg== X-Gm-Message-State: AOJu0YxSTr6zFC0rERObkZND8Rk82qTD9Zs54sSB5rJXMR5c/09wPeY7 EAJ68WSu3moBI7Fd5vr3vQuZR7PyfWYNN5a7c62kKO8vWdWiW7U/vzi3sSA5PpnepHoii7jWg4d 4EpSUIbdutY3wawCptd4QtOpt5YRm0VvmcUryeSyyPzONgXeVqoYBJodA65vgIL+AeUllIwxlrt AjhfJb1l2ZjA== X-Received: by 2002:a05:600c:1e1f:b0:410:385:a8cb with SMTP id ay31-20020a05600c1e1f00b004100385a8cbmr451962wmb.19.1707271363636; Tue, 06 Feb 2024 18:02:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IEoyx9ScuPfADLt1w3klV3Cq3Tc9dEVBYlSuEKFxIq/dCChEmq/BkLGyDHA1bFsp5KXmKw5Cg== X-Received: by 2002:a05:600c:1e1f:b0:410:385:a8cb with SMTP id ay31-20020a05600c1e1f00b004100385a8cbmr451954wmb.19.1707271363193; Tue, 06 Feb 2024 18:02:43 -0800 (PST) Received: from localhost ([2a01:4b00:85fd:d700:3da5:e359:d237:a3c8]) by smtp.gmail.com with ESMTPSA id b7-20020a5d4d87000000b0033b4b1d180esm270684wru.43.2024.02.06.18.02.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 18:02:42 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [UNSTABLE][PATCH 0/2] Switch to 3.0 dpkg source format with verified orig tarball Date: Wed, 7 Feb 2024 02:02:37 +0000 Message-Id: <20240207020239.120806-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 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 is a subset of changes proposed by Masahiro during the hackathon, and implemented slightly differently as a smaller change. This updates -rc kernel releases to 3.0 native format (no orig tarball), and released kernel versions to 3.0 quilt format (with orig tarball) and many options to ensure this new format works with our existing workflows. Specifically, git delta is automatically generated into a single patch added to the quilt series. Immediate benefit to the kernel team is much smaller source tarballs and thus amount of data to dput, as xz compression is used. Separately for end-users unpacking source tarball, it is obvious what the delta to the source tree is. Also it makes it trivial to add any git format-patch to debian/patches/ and rebuild the kernel, just like any other Ubuntu source package. The addition of the watch file and upstream signing key, allows one to retrieve upstream published source tarball, and verify its authenticity. This should work for any of our kernels irrespective where and how they are published. $ uscan --download-current-version uscan: Newest version of linux on remote site is 6.7.0, specified download version is 6.7.0 gpgv: Signature made Mon Jan 8 05:47:49 2024 GMT gpgv: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E gpgv: Good signature from "Greg Kroah-Hartman " gpgv: aka "Greg Kroah-Hartman " gpgv: aka "Greg Kroah-Hartman (Linux kernel stable release signing key) " Successfully symlinked ../linux-6.7.tar.xz to ../linux_6.7.0.orig.tar.xz. You can see unstable (6.8 rc) "3.0 (native)" and released (6.7) "3.0 (quilt)" source package builds in this ppa (note slightly earlier version of this patch, and the tree was not clean in those builds): https://launchpad.net/~yolo4k/+archive/ubuntu/format-3 One can fetch the .dsc directly with: dget https://ppa.launchpadcontent.net/yolo4k/format-3/ubuntu/pool/main/l/linux/linux_6.7.0-3.3.dsc dget https://ppa.launchpadcontent.net/yolo4k/format-3/ubuntu/pool/main/l/linux-unstable/linux-unstable_6.8.0-5.5.dsc orig tarball goes down in size from 215MB to 135MB, and diff.gz goes down from 3.9MB to 2.2MB. Once this is applied consistently to all our kernels we can start work on further improvements - for example moving debian.* directories to be subdirs of debian/, reducing our reconstruct script (if not eliminating it), and allowing additional tarball components for any other additional source code we may ever need, etc. Some of which was already previously proposed by the Masahiro patchset. Dimitri John Ledkov (2): UBUNTU: [Packaging] Switch to 3.0 dpkg source formats UBUNTU: [Packaging] add uscan watch file with GPG verification debian/rules.d/1-maintainer.mk | 2 + debian/source/format | 2 +- debian/source/local-options | 12 +++++ debian/upstream/signing-key.asc | 78 +++++++++++++++++++++++++++++++++ debian/watch | 3 ++ 5 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 debian/.gitignore create mode 100644 debian/source/local-options create mode 100644 debian/upstream/signing-key.asc create mode 100644 debian/watch Acked-by: Emil Renner Berthing