From patchwork Thu Jun 3 13:05:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1487230 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 4FwmNG1n9Pz9sWQ; Thu, 3 Jun 2021 23:05:34 +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 1lon2Q-0005Mq-US; Thu, 03 Jun 2021 13:05:30 +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 1lon2J-0005LU-9Y for kernel-team@lists.ubuntu.com; Thu, 03 Jun 2021 13:05:23 +0000 Received: from mail-oo1-f72.google.com ([209.85.161.72]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lon2J-00052d-2y for kernel-team@lists.ubuntu.com; Thu, 03 Jun 2021 13:05:23 +0000 Received: by mail-oo1-f72.google.com with SMTP id o1-20020a4adb610000b029020660e40b70so3495270ood.22 for ; Thu, 03 Jun 2021 06:05:23 -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:in-reply-to :references:mime-version:content-transfer-encoding; bh=osjepCq1F2TrUqXsTO6aIrGSwUS7PqttSmEduaL0ggE=; b=G6ZguMowHZIrilNffTj1Aht8o14UN1D+TNCiyb+3IzbacT7hnC9YxKBI1u3v6jCEGy DcQamr5aK+Lpml1i5UydPsI+0RJQ8FoQkky6+f+zQ7jBfnfZMGFK+uMSudi2iW533kqZ 3ab46FEu2IOD+KUXKISQuiK4WqLpc+f7bCs+59WF/XpJvpCe6bWKE6LH5pyqgZ/YqXnG +FxHhXLz1J572WS9yOuSNqvKXj2iZSH7IawN+bt06PK86rCbJBe5/rw36kdvn038HS+V wZxjrsdlwdwyrsJt/mIFQ4TwlrG415uoPzwq4j4t2EeNoQWpxCkvIKHkPLeo0f/5MSk6 HCJA== X-Gm-Message-State: AOAM532XNKnsoowEfK5hcvrF/7LDxEp6NEnFpT6bb3X3w++Yi3vTg/Fi ZRorzTe7sgglQilR+2d7C33v2DjpGuYABpBfuw5Q9EkzwjGzVJACjrJYWZQJlOArLIzDBTTl2J3 EdbRADnDdxekYdZzbZK2DFqggR4qizZ77jkbG/A0tGA== X-Received: by 2002:a9d:5552:: with SMTP id h18mr31402815oti.104.1622725521920; Thu, 03 Jun 2021 06:05:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKeZSEa81VAowN/eghML79D0F8XPtA6I0xcf7enq6ZUySj0kTro++atQsZIR61IKm1ECA5Kg== X-Received: by 2002:a9d:5552:: with SMTP id h18mr31402789oti.104.1622725521649; Thu, 03 Jun 2021 06:05:21 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:29e1:1d7b:726b:70cd]) by smtp.gmail.com with ESMTPSA id 129sm639334ooq.34.2021.06.03.06.05.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 06:05:21 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/6][Unstable] UBUNTU: [Debian] run install-$(flavour) targets during build phase Date: Thu, 3 Jun 2021 08:05:12 -0500 Message-Id: <20210603130516.632208-3-seth.forshee@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210603130516.632208-1-seth.forshee@canonical.com> References: <20210603130516.632208-1-seth.forshee@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" BugLink: https://bugs.launchpad.net/bugs/1930713 Move installation of files from the flavour build directories to the build phase. This results in cleaning up of one flavour build directory before starting the build of the next flavour, significantly reducing the amount of space needed on builders. Note that this will result in incorrect ownership of files in cases where the build and binary phases of building packages are run separately. This will be addressed in a later patch. Signed-off-by: Seth Forshee --- debian/rules.d/2-binary-arch.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 71f30b72329c..b6b8640d8b8f 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -39,7 +39,7 @@ $(stampdir)/stamp-prepare-tree-%: $(commonconfdir)/config.common.$(family) $(arc prepare-%: $(stampdir)/stamp-prepare-% @echo Debug: $@ # Used by developers to allow efficient pre-building without fakeroot. -build-%: $(stampdir)/stamp-build-% +build-%: $(stampdir)/stamp-install-% @echo Debug: $@ # Do the actual build, including image and modules @@ -797,7 +797,7 @@ ifeq ($(any_signed),true) dpkg-distaddfile $(signing_tar) raw-signing - endif -build-arch-deps-$(do_flavour_image_package) += $(addprefix $(stampdir)/stamp-build-,$(flavours)) +build-arch-deps-$(do_flavour_image_package) += $(addprefix $(stampdir)/stamp-install-,$(flavours)) build-arch: $(build-arch-deps-true) @echo Debug: $@