From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750187537661165568 X-Received: by 2002:a81:a390:: with SMTP id a138mr11418906ywh.81.1571670515039; Mon, 21 Oct 2019 08:08:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a81:db4d:: with SMTP id b13ls2217321ywn.4.gmail; Mon, 21 Oct 2019 08:08:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqy5KHSL2YXLTyE1kNNARw9897hS9gW2mqitdegZJB5NIOM6rkHfMXZ6pjXMwm916n+1oIbC X-Received: by 2002:a81:80c1:: with SMTP id q184mr18225776ywf.128.1571670514714; Mon, 21 Oct 2019 08:08:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571670514; cv=none; d=google.com; s=arc-20160816; b=Db0W8ZgayLEy/twXIGMm7O4JGYfYOznsBTJIgO6hMG2uNxH/xv92fAMRDlGM+m+CkU 1XH5QGSVjWzBt5oxacIjS4re3QgCR3VulwnBwJpQBVw8SERoczphQ78rK162z5G6sAPk wKQpdet245mYxL7uZl3lUlmWqcVM5OVVhsghfYOHAM9gjga7x4emi9C3fmrzkHy08Uvs 5UJAEGFLREpcM31g81Pzr/ZJswjiikrRAiJsCd8jhO7Pmu7Cu67BMDElBfq2RkaxuFnz SEEDkg+aSizUs06ub8QliWDDWPqJUFbvKeXyPJR777h3lAduo+6RB82wd0rCdD986FXC 8gRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=SedYmqfDKUmN76Qei+d/wQ+g1agtjIIv9cnL1+KDF4s=; b=aKs2u4jW28xy+KV14dW6t2QHuCT3cJ/J+QV58RQuleuiGoFhapSVgeTfrj2yh5NN8q oSuffDrf2pNoUPUdXKUaCpddl63+PR2B8wiOaf/9VLy7rfMzdt3sshTYWA0bc49h/rC2 Ja9Fr2a1OdPg3n2ptQB35A8SEhodayl8KmZvGF25CoBefVVUzr057MuZDm+J3QcMLN/x 4gdb1bB+1qRn/c7wQlGlbmCQ/Cn+dnjpvbsg/oMRNQOngCu8JVScGOacirEdH6PrJxQZ 0eIjdrjvvOtekzFzb2AXUY6uBQAMhXsR8ajWV1g13sa+b/flikJwvOU2p2QPTm+4Nv4k x4Dg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com. [68.232.137.180]) by gmr-mx.google.com with ESMTPS id t73si921797ybi.4.2019.10.21.08.08.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Oct 2019 08:08:34 -0700 (PDT) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.137.180 as permitted sender) client-ip=68.232.137.180; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com IronPort-SDR: F4QLsJX1YSVNVrvvu1lNYoKKt0vlrHa6G89SGHJz5rRmLLx47mP77ommuhEIhngQJ4nXqihbm4 TIAY31zwLhkgQrjwkshn87c9dVP/fWrt8RE9MsEFOAsudnii2PL0x30I0+EqtiTUJUac4OlxjO twWVFshwq2AKVrl7EVe8qBuXgtRXJVuMxXETJGBCvKJrCTi3QrJnAvcj3Iv7zozdipZyDVbti0 i+pgT9KrkMxEASeJMM1LKjCuvCeNv1Jejkpu4TmypnwJyjeNEj5JGSbQ34ZJXP/873KnER8jzb JrI= X-IronPort-AV: E=Sophos;i="5.67,323,1566892800"; d="scan'208";a="42440871" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 21 Oct 2019 07:08:34 -0800 IronPort-SDR: jf9dln1djsOqBjnMF2WEC5CCMmFz0u3tHJ46twHQ6o/9CDAoXIblmg/jGcUq2lkzpZA/oCT22o 6+O7KWCCeXS9sV4yjazS1RVIP2rLAADVdd6sBNMqTSANnGkTE66obqMui3Rgju72lIz+ANyDqF JI2RLnVvLDztwA6J8/1T5Sw1SYv8n6RbazF2umZ9oEzwcQDl4N3kHgrJu8WbodOfmMNNmE3tiI +fYA4bEwzfxR85qCGisEye9kYlbq8/rPx21aVnE5azTTR6SEWDmPkDS3umYrlMdRS72e2BUSj4 gIA= From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH v2 4/5] patch: suffix patch files copied to .applied_patches with "~" Date: Mon, 21 Oct 2019 17:08:11 +0200 Message-ID: <1571670492-767-5-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571670492-767-1-git-send-email-Cedric_Hombourger@mentor.com> References: <83f900e7-753a-5728-c7b9-5c2cf2733f2b@mentor.com> <1571670492-767-1-git-send-email-Cedric_Hombourger@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Cedric_Hombourger@mentor.com X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-09.mgc.mentorg.com (139.181.222.9) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: dt901RfQX2HO When patches are applied to a source Debian package, patches specified in SRC_URI get copied to ${S}/.applied_patches (as intended) but dpkg-source then believes the source tree was modified and exits with an error. Make dpkg-source ignore patch files that were copied by this class by appending a "~" suffix to them. Signed-off-by: Cedric Hombourger --- meta/classes/patch.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index c5ba463..e75d53c 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -8,7 +8,7 @@ def clean_applied_patches(applied_patches_dir): if not os.path.exists(applied_patches_dir): return - cmds_file = applied_patches_dir + ".patch-commands" + cmds_file = applied_patches_dir + ".patch-commands~" if os.path.exists(cmds_file): with open(cmds_file, "r") as cmds: patch_commands = cmds.readlines() @@ -52,9 +52,9 @@ python do_patch() { bb.utils.mkdirhier(applied_patches_dir) applied_patches_dirs.append(applied_patches_dir) - cmds = open(applied_patches_dir + ".patch-commands", "a") + cmds = open(applied_patches_dir + ".patch-commands~", "a") - patch_file = applied_patches_dir + path + patch_file = applied_patches_dir + path + "~" bb.utils.mkdirhier(os.path.dirname(patch_file)) shutil.copyfile(workdir + path, patch_file) -- 2.20.1