From patchwork Wed Oct 19 16:31:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1692104 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=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=aikX09GV; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (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 4Msx8P6jFYz23jk for ; Thu, 20 Oct 2022 03:32:04 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1olByw-0000jI-7t; Wed, 19 Oct 2022 16:31:50 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1olByv-0000jB-0K for kernel-team@lists.ubuntu.com; Wed, 19 Oct 2022 16:31:49 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.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-0.canonical.com (Postfix) with ESMTPS id C2CD83F56C for ; Wed, 19 Oct 2022 16:31:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1666197108; bh=s/DwmfBHxuH2QZLgy2DAEpRZ6oAg4Z8PxaFCsC+Dwpk=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=aikX09GVCDy/29o6wukj1AsRHj3UBYosbT2iTIaiyuPL3MKAB/IirEzzF0iieM3Pu Fo2MN3y4PMRgqtflN81/batNqHTGvmo+6Aek5zRfYx5tL38X4I9TyGv8nyAVPz9ENW lhmWVjKk3/O+wRLKx5JbwFIuOrNeergBEE/qcRR//8olswgoAxJcxDWDFxdhXK0rdL vhOYSQ+xeq7OuvzzsFFexJ5hnw37skOhBYHvAqopN/N2I9BjAOPgwiFjRH/96Vwabx H2975r7YamG2E9cRnVcoPPRyZn6faWW+6K6fCDbXn2TqFbvlRZF4/PUfkIHbsE4Vvk kQVAIg7ZrU3hg== Received: by mail-wm1-f72.google.com with SMTP id f26-20020a7bcc1a000000b003c03db14864so218104wmh.6 for ; Wed, 19 Oct 2022 09:31:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=s/DwmfBHxuH2QZLgy2DAEpRZ6oAg4Z8PxaFCsC+Dwpk=; b=yaiOCaIjq7ma2s2Ga09zrWlsGlSbIbNu8gDfXz6Jhaj56whrZJy0sqjCcUNrLAUsf7 K3wV3F0/senDLp0IxzFGwixKFW6r2luxmAcrQhEDxMiQ5D2G8jrT53ZnEuMiy+kZSGzu 0YotdDjiKNZDedj43ijgkK1rC83fKV8Ddz3hK2Iai4OpEja0bzD/jpbNAF9gZWctR/+C k60qMK3SbBgjVRwtfGF3bM4sx/p1FntrdpGUatOl1KvqnmM484L+2ssCkR1Hw8IzO/7B sUESVjI3PTNwzkYmRErNcn0rQvaJtstdyGxq3GhUznPKib+Z9d8ZUkqilVzh166auRiF eh0A== X-Gm-Message-State: ACrzQf0wAy3iDVBxVYxh02co0VYLv0AoJ2H7wI6eGIYFA3PVpQ39GexC Hyc8Y+q9KWNP2oAR51i//3b2j+rVtQY0E2KS9MYIi5x4boBMDyd9Wn9hvuiJN/TreNGsr58Smb7 Q+KlmMwfyQjlkTL45cuqsk3rrm+Q1Evwx/wzmbTBHlA== X-Received: by 2002:a5d:6d86:0:b0:22e:4049:441f with SMTP id l6-20020a5d6d86000000b0022e4049441fmr5852484wrs.198.1666197108067; Wed, 19 Oct 2022 09:31:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6e4pDWh42YYsrZQdEl61/XK3f+G9VGeEkh5DfdXhCmcXaE3qS6TaEtHDSDbQTc5O35C6GRpw== X-Received: by 2002:a5d:6d86:0:b0:22e:4049:441f with SMTP id l6-20020a5d6d86000000b0022e4049441fmr5852468wrs.198.1666197107782; Wed, 19 Oct 2022 09:31:47 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:d919:b739:b55:2d20]) by smtp.gmail.com with ESMTPSA id e18-20020a5d5012000000b0023055fc5df5sm14083389wrt.112.2022.10.19.09.31.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 09:31:47 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [SRU][J][K][PATCH] UBUNTU: [Packaging] sameport -- add support for sameport versioning Date: Wed, 19 Oct 2022 17:31:39 +0100 Message-Id: <20221019163139.44349-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" From: Andy Whitcroft BugLink: https://bugs.launchpad.net/bugs/1993563 We currently support two types of kernels which are programatically configured (marked "backports" in kernel-series and having copy/local-mangle support): backports: those who express in an older series (~20.04.N) forwardports: those who express in a newer series (+22.04.N) Add a new third type which represents "backports" into the same series: sameports: those which express in the same series (.N) These will simply number with an additional upload number to allow local respins, for example linux/5.15.0-30.31 -> linux-lowlatency/5.15.0-30.31.1. Add support for BACKPORT_SUFFIX to be present and empty using `--` to represent this situation (in a similar fashion to variants). Signed-off-by: Andy Whitcroft (amend syntax to use bash variable expansion) Signed-off-by: Dimitri John Ledkov Acked-by: Stefan Bader Acked-by: Kleber Sacilotto de Souza --- SRU for jammy and kinetic. Already applied to unstable Currently unused, even if kteam-tools patch lands. This is support, for future new kernels. debian/rules.d/1-maintainer.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 23da141a6c..7fbfad26d3 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -136,7 +136,7 @@ startnewrelease: dh_testdir @[ -f "$(DEBIAN)/etc/update.conf" ] && . "$(DEBIAN)/etc/update.conf"; \ if [ -n "$$BACKPORT_SUFFIX" ]; then \ - ver="$$(dpkg-parsechangelog -l"$$DEBIAN_MASTER/changelog" -SVersion)$${BACKPORT_SUFFIX}.1"; \ + ver="$$(dpkg-parsechangelog -l"$$DEBIAN_MASTER/changelog" -SVersion)$${BACKPORT_SUFFIX/--/}.1"; \ prev_ver="$$(dpkg-parsechangelog -l"$(DEBIAN)/changelog" -SVersion)"; \ if [ "$${ver%.*}" = "$${prev_ver%.*}" ]; then \ ver="$${ver%.*}.$$(( $${prev_ver##*.} +1 ))"; \