From patchwork Tue Jun 8 11:56:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1489384 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fzpc80ZdQz9sSn; Tue, 8 Jun 2021 21:56:24 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lqaLF-000331-63; Tue, 08 Jun 2021 11:56:21 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lqaLD-00032v-K8 for kernel-team@lists.ubuntu.com; Tue, 08 Jun 2021 11:56:19 +0000 Received: from mail-wm1-f69.google.com ([209.85.128.69]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lqaLD-0002qQ-CU for kernel-team@lists.ubuntu.com; Tue, 08 Jun 2021 11:56:19 +0000 Received: by mail-wm1-f69.google.com with SMTP id g14-20020a05600c4eceb02901b609849650so662852wmq.6 for ; Tue, 08 Jun 2021 04:56:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SI6qC3LXxQHhCfMCDcORXae9n+HELpD1spj1hZ6lers=; b=dLT0pstrPQzhQTxDQUNClPU8KqJum3dPQyQhtCex9A6YLyTO06WVwQtD6P6p/wcHYH vU9jM9hje1Zt94WDEnDgHDeffNufa11jcegFR1RV+s3IsTdLlj/R6iGDq0cuAZfUcl9m hGs/5kDQP7TNCOOGQj5JzP3iZVEz/ekrZepTVq3jIyvoy77HetnRsDE7ZCTHIS+CJgQn sm058ix6xxIZcgR43ARos65YIoiibvz2lmm4XJPOzwRoIwk9KcBBRmtd6D+IjLSmKzhF RTNgqMUMmxaRuDfnF7kc7CuraMHGdhbFw1utiz+5FOkbey1ZrXKqQaRqE7EG5uzsKWCD D2FQ== X-Gm-Message-State: AOAM533ZWJZUugGDTEio+mGXcHlMxfGDMoxiCicQ8J0zqiZEJT7FD9pz lgBslvRNrl9MOXLZeWMTa0TL56FYxZ2ZsSPFIhsj+BRGzcp8AuU48W+aWJ4kujH9e8RYvlRgP6/ P7bxlUgFdi5wFynk9WrOSUW2kChEHucs/Ev+kqy3vgg== X-Received: by 2002:a1c:e409:: with SMTP id b9mr3839268wmh.63.1623153378812; Tue, 08 Jun 2021 04:56:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDzzcx69YHdAejmKzaVPKg7sXZGwE7mKHel2JIJFz8/MAW09Dr9J3wAdV8odfG0HdWqhV+JA== X-Received: by 2002:a1c:e409:: with SMTP id b9mr3839246wmh.63.1623153378639; Tue, 08 Jun 2021 04:56:18 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:f778:57b3:82bc:9628]) by smtp.gmail.com with ESMTPSA id x20sm12917374wmc.39.2021.06.08.04.56.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 04:56:17 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [linux-uc20-efi][FOCAL][PATCH 1/2] UBUNTU: [Packaging] drop usage of KERNEL_SOURCE Date: Tue, 8 Jun 2021 12:56:13 +0100 Message-Id: <20210608115614.43007-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.27.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: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" In creation of uc20-efi kernel.efi apps derivation of $(KERNEL_SOURCE) is not needed, because all dependencies are installed by $(ABI)-$(FLAVOUR). And all kernels share the same `linux-` prefix irrespective of which source package has built them. This change will make it easier to build kernel.efi apps for derivative kernels. BugLink: https://bugs.launchpad.net/bugs/1931242 Signed-off-by: Dimitri John Ledkov --- debian.uc20-efi/control.stub | 10 +++++----- debian/rules | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/debian.uc20-efi/control.stub b/debian.uc20-efi/control.stub index 22999ab..bfe5555 100644 --- a/debian.uc20-efi/control.stub +++ b/debian.uc20-efi/control.stub @@ -10,11 +10,11 @@ Build-Depends: kmod, linux-firmware Build-Depends-Arch: - @KERNEL_SOURCE@-image-unsigned-@KERNEL_ABI_VERSION@-generic, - @KERNEL_SOURCE@-modules-@KERNEL_ABI_VERSION@-generic, - @KERNEL_SOURCE@-modules-extra-@KERNEL_ABI_VERSION@-generic, - @KERNEL_SOURCE@-image-unsigned-@KERNEL_ABI_VERSION@-lowlatency, - @KERNEL_SOURCE@-modules-@KERNEL_ABI_VERSION@-lowlatency, + linux-image-unsigned-@KERNEL_ABI_VERSION@-generic, + linux-modules-@KERNEL_ABI_VERSION@-generic, + linux-modules-extra-@KERNEL_ABI_VERSION@-generic, + linux-image-unsigned-@KERNEL_ABI_VERSION@-lowlatency, + linux-modules-@KERNEL_ABI_VERSION@-lowlatency, Vcs-Git: git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-uc20/+git/@SERIES@ Package: @SRCPKGNAME@ diff --git a/debian/rules b/debian/rules index 1d85292..f6e6ec0 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,6 @@ DEBIAN=$(shell awk -F= '($$1 == "DEBIAN") { print $$2 }' debian/control \ -e 's/@SERIES@/$(SERIES)/g' \ -e 's/@KERNEL_ABI_VERSION@/$(KERNEL_ABI_VERSION)/g' \ - -e 's/@SRCPKGNAME@/$(SOURCE)/g' \ - -e 's/@KERNEL_SOURCE@/$(KERNEL_SOURCE)/g' + -e 's/@SRCPKGNAME@/$(SOURCE)/g' cp $(DEBIAN)/changelog debian/changelog .PHONY: debian/control From patchwork Tue Jun 8 11:56:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1489385 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FzpcC33TBz9sW8; Tue, 8 Jun 2021 21:56:27 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lqaLI-00034b-GQ; Tue, 08 Jun 2021 11:56:24 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lqaLF-00033R-Js for kernel-team@lists.ubuntu.com; Tue, 08 Jun 2021 11:56:21 +0000 Received: from mail-wr1-f71.google.com ([209.85.221.71]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lqaLF-0002qm-Cq for kernel-team@lists.ubuntu.com; Tue, 08 Jun 2021 11:56:21 +0000 Received: by mail-wr1-f71.google.com with SMTP id d5-20020a0560001865b0290119bba6e1c7so5370919wri.20 for ; Tue, 08 Jun 2021 04:56:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zvMkF3o0O/hZmwxV4OarIvcRIDmuz2+BOR1fmE9Z/wk=; b=DdypwosLj7Uxr/ji0scZZPgooPI1FIXo8njtXYv/g0+YN/yUw9KEwokCej7ail+rkq JOXmf2rW5memO5C/JiKmdiLbXzI6wAu0xYX2HEW3jL6XnzHTaZ/4pQCt4cTC6UWCLmzx zOhDe+hFue4BkWZ3yd3GRaIZXIxSAmsT7wN2ffnN97i13W/49rscNXu4AG5uhUvBjW1Y sP6a0W7wmpA/jYj9pYBmDC7zaZHlFuILT+fIMUZj0qbQ/VdnDTBXyVatrMq3nWOgXb8a gWrP4cACIXEGIaxSnUrIBMlcu3YrYUiF9Y0blMEZeVYQUOPotvDjf/H0hL6uDRhMTFlt X1xg== X-Gm-Message-State: AOAM532QCBWYoDcjj5uIPCQbF8Dz6kGNL+rx8RFmzxrnxNjh5sILm+nH xesNBDRQY66HkELNzQXM/RbgZWcXsrYPgzW9riu4jW/m0hi6CllcUU1gqTh3y+FPchgGu0KCv9q LxO3101OEQBxmuC92St7A4shl6fQrJ8MDL3+Jf+/QmQ== X-Received: by 2002:a05:600c:4f4a:: with SMTP id m10mr9507742wmq.51.1623153380805; Tue, 08 Jun 2021 04:56:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLobW9+AZ9gM9d4MdMYq1pO4AFKv6eDDC0qRCPMKERdrSHCyF4WjK5BMjWNR5yqJ7ps2cvLw== X-Received: by 2002:a05:600c:4f4a:: with SMTP id m10mr9507725wmq.51.1623153380608; Tue, 08 Jun 2021 04:56:20 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:f778:57b3:82bc:9628]) by smtp.gmail.com with ESMTPSA id k82sm2756841wmf.11.2021.06.08.04.56.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 04:56:20 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [linux-uc20-efi][FOCAL][PATCH 2/2] UBUNTU: [Packaging] automatically detect flavours from build-deps Date: Tue, 8 Jun 2021 12:56:14 +0100 Message-Id: <20210608115614.43007-2-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210608115614.43007-1-dimitri.ledkov@canonical.com> References: <20210608115614.43007-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" Automatically detected from build-deps which flavours to build kernel.efi apps for. This means that suffixes of linux-image-unsigned-$(ABI)-* are used to determine the desired flavours. If this parsing becomes insufficient, it might need to be updated to use python-apt in the future, or encode flavours in $(debian)/flavors.mk or some such. This makes it trivial to build derivative kernel.efi apps, by simply adjusting appropriate control.stub with the desired flavour build-deps. BugLink: https://bugs.launchpad.net/bugs/1931242 Signed-off-by: Dimitri John Ledkov --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index f6e6ec0..18adb20 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ KERNEL_ABI_VERSION=$(shell echo "$(VERSION)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9 DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) -FLAVOURS=generic lowlatency +FLAVOURS=$(shell sed -n 's/linux-image-unsigned-$(KERNEL_ABI_VERSION)-//p' debian/control | sed 's/[ ,]//g') clean: debian/control dh_testdir