From patchwork Mon Oct 14 10:09:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Shrirang Bagul X-Patchwork-Id: 1176124 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com 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 46sDn42cfBz9sPd; Mon, 14 Oct 2019 21:09:27 +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 1iJxI3-0008Kc-Km; Mon, 14 Oct 2019 10:09:23 +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 1iJxI1-0008K8-Pm for kernel-team@lists.ubuntu.com; Mon, 14 Oct 2019 10:09:21 +0000 Received: from 1.general.shrirang--bagul.uk.vpn ([10.172.198.4] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iJxI1-0000By-1G for kernel-team@lists.ubuntu.com; Mon, 14 Oct 2019 10:09:21 +0000 From: Shrirang Bagul To: kernel-team@lists.ubuntu.com Subject: [SRU][Xenial][Bionic][PATCH 2/2] UBUNTU: [Packaging] force creation of headers directory Date: Mon, 14 Oct 2019 18:09:13 +0800 Message-Id: <20191014100913.10898-3-shrirang.bagul@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191014100913.10898-1-shrirang.bagul@canonical.com> References: <20191014100913.10898-1-shrirang.bagul@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/1847969 Due to a race condition, some times the headers directory already exists when running the install-arch-headers rule. Make sure we do not fail in that case. Signed-off-by: Alfonso Sánchez-Beato Signed-off-by: Shrirang Bagul --- debian/rules.d/2-binary-arch.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 0b91b83d88d2..c4c15517e491 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -491,7 +491,8 @@ endif find . -name '.' -o -name '.*' -prune -o -print | \ cpio -pvd --preserve-modification-time \ $(headers_dir)/usr/include/ ) - mkdir $(headers_dir)/usr/include/$(DEB_HOST_MULTIARCH) + mkdir -p $(headers_dir)/usr/include/$(DEB_HOST_MULTIARCH) + rm -rf $(headers_dir)/usr/include/$(DEB_HOST_MULTIARCH)/asm mv $(headers_dir)/usr/include/asm $(headers_dir)/usr/include/$(DEB_HOST_MULTIARCH)/ rm -rf $(headers_tmp)