From patchwork Tue Mar 23 15:52:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1457280 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 4F4bVB5Bvqz9sVS; Wed, 24 Mar 2021 02:52:34 +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 1lOjKZ-0006Dm-GY; Tue, 23 Mar 2021 15:52:31 +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 1lOjKY-0006Dg-7l for kernel-team@lists.ubuntu.com; Tue, 23 Mar 2021 15:52:30 +0000 Received: from mail-wm1-f70.google.com ([209.85.128.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lOjKX-0007rW-W6 for kernel-team@lists.ubuntu.com; Tue, 23 Mar 2021 15:52:30 +0000 Received: by mail-wm1-f70.google.com with SMTP id a65so646052wmh.1 for ; Tue, 23 Mar 2021 08:52:29 -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:subject:date:message-id:mime-version :content-transfer-encoding; bh=HC6GFmrmSq+1jWC0e9uPalOyT/cuWcleYuylGt2KVzk=; b=AhRfi/sp7jinkEsFhirnhdGSc2qFeo+neOvZdLFqGgfsD9DWera4GW4I0KnNtxdBjA vfHQhY0Qy8cJ0H9gmOPPC1h0vSoeWELyN2T1YSW7IA+BWlqwszijeJ3tszR1l4BrUUUt Kio+4csQgUWQXQkBWOJSn5dFTwr7CJyGNqhgUY2O5HdEqRB1Zcwxlr8JbAAhOT4Ici7b nLUYtUop/K+KKLWw0g8F18J8c49aZRJWvp6yZ1S+SZaAzydJOGRLnwB5exSSUKykxsav kSD89oO1DCdZhOM0IttqswZFyPg2cUDrZPZFaJZGRujJo3Gfev7ERTw5q7Gy2Atn1aEn fSng== X-Gm-Message-State: AOAM5303PUfz9MjbIrTrYUS9Oweaoi1Zj1Av9mQAIw9kpU/3ujnUaioA EHWXCFFZ4v97baDudJKvOC5MncDB7rg01RvoRdxAU6frN78i6o83DB40kWcAJEnygOAi2zmc/MX aHDYFkOz3oisYch9eP5fN3ay39pawssNSNL9gGPlPTA== X-Received: by 2002:a1c:8041:: with SMTP id b62mr4121616wmd.0.1616514749631; Tue, 23 Mar 2021 08:52:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIwWuHwy1AwkxjhDc64TuwweY/iR1B7pW2sbme8cSeD1vwVNAxhMMfZLrIHeTGchSZjr0NcA== X-Received: by 2002:a1c:8041:: with SMTP id b62mr4121600wmd.0.1616514749436; Tue, 23 Mar 2021 08:52:29 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id 91sm25995726wrl.20.2021.03.23.08.52.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:52:28 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [Unstable][PATCH] UBUNTU: [Packaging] Replace flavor-specific arm64 build rule variables Date: Tue, 23 Mar 2021 16:52:27 +0100 Message-Id: <20210323155227.45793-1-juergh@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" The build rule variables 'build_image' and 'kernel_file' are identical for both flavors on arm64 so replace the flavor-specific variables with the generic ones. Ignore: yes Signed-off-by: Juerg Haefliger Acked-by: Tim Gardner --- debian.master/rules.d/arm64.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk index f243c39e311a..97b64d213d8b 100644 --- a/debian.master/rules.d/arm64.mk +++ b/debian.master/rules.d/arm64.mk @@ -3,10 +3,8 @@ build_arch = arm64 header_arch = arm64 defconfig = defconfig flavours = generic generic-64k -build_image_generic = Image.gz -kernel_file_generic = arch/$(build_arch)/boot/Image.gz -build_image_generic-64k = Image.gz -kernel_file_generic-64k = arch/$(build_arch)/boot/Image.gz +build_image = Image.gz +kernel_file = arch/$(build_arch)/boot/Image.gz install_file = vmlinuz no_dumpfile = true uefi_signed = true