From patchwork Fri Jun 4 02:47:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1487544 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 4Fx6cj1161z9sVt; Fri, 4 Jun 2021 12:47:31 +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 1lozrp-00032y-Ri; Fri, 04 Jun 2021 02:47:25 +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 1lozro-00032i-Mh for kernel-team@lists.ubuntu.com; Fri, 04 Jun 2021 02:47:24 +0000 Received: from mail-oi1-f197.google.com ([209.85.167.197]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lozro-00061c-Fd for kernel-team@lists.ubuntu.com; Fri, 04 Jun 2021 02:47:24 +0000 Received: by mail-oi1-f197.google.com with SMTP id h133-20020aca538b0000b02901f1a06a6705so3991312oib.7 for ; Thu, 03 Jun 2021 19:47:24 -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=d7T8j5V0uRgOjwllkhkm9QSWUO3/1g6jJ6z5flCbAyU=; b=npAHFpeD4kSqVYqWKl+WTptY7f+ELbpWrLNr9A1J0Xx//1MJcSoPexkW2d9NgMtk+o PnHV3X0toDFElz0xrwHDdKM0eb/eVkufF6S863KtKu5IrIwC5uQhJwm4YhdTWprfmNlc BEyxB1a7fqwqQ/Pux/4VnVT2IL+3zhLZr4VWzs1XA/PjR1fWjjKlDHkvVlZEPxVD6zll 55mf9VhumfHVwtiRykI0KL61rijg5fwFCD0Lm+xZBqmpyVzgSGS92Nb8k2TEA7UuxjTw vKTWCBsJhULs9fZeasVSmaNNdVZ67FmCr57/D+L0RexT9RhksinAnFXxTamBP8c9aNBT S6yg== X-Gm-Message-State: AOAM530rMuQeUraG1CjQSvTcNYKHvx4NMXC6OY0BPIM/Z7zJFoiNZ231 YdwLwMLsc0qnXUKvRyPdH19HzRZEcO4Ufg5hJfxMX8Tk50DymqXWzgUhmBwZdgAFc7rYXDJRZwo zOluFKD24vm73YgkL4yJ3WYA+TLPqYMU5gvKfMcssUw== X-Received: by 2002:a05:6808:997:: with SMTP id a23mr9413961oic.129.1622774843528; Thu, 03 Jun 2021 19:47:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeSGaEmz4oy7J37ZOeaapVBuKaTRWI2BVmE96QEUE+CF8f/55jsYJquj1JYdXfJ5D3TKmMTw== X-Received: by 2002:a05:6808:997:: with SMTP id a23mr9413952oic.129.1622774843276; Thu, 03 Jun 2021 19:47:23 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:49de:d1a8:57e3:739e]) by smtp.gmail.com with ESMTPSA id z15sm194757otp.20.2021.06.03.19.47.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 19:47:22 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 2/6][Unstable] UBUNTU: [Debian] run install-$(flavour) targets during build phase Date: Thu, 3 Jun 2021 21:47:15 -0500 Message-Id: <20210604024719.650626-3-seth.forshee@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210604024719.650626-1-seth.forshee@canonical.com> References: <20210604024719.650626-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 commit. 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: $@