From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750187537661165568 X-Received: by 2002:aca:c483:: with SMTP id u125mr17497685oif.133.1571650519340; Mon, 21 Oct 2019 02:35:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aca:c743:: with SMTP id x64ls2052358oif.10.gmail; Mon, 21 Oct 2019 02:35:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqwINLmLvaE9dH/YGcporK/9/IjbCmCsYFSKRrzy0cEcmYWKY3TiOK/9weHXMCbW8RHcWtv+ X-Received: by 2002:aca:650a:: with SMTP id m10mr18630018oim.130.1571650518843; Mon, 21 Oct 2019 02:35:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571650518; cv=none; d=google.com; s=arc-20160816; b=0VxzvQDy7vbVTjadmRp18m3HXFSHhvtuAZdAyLybtPHfZQQ82H2qDhvEpSbs0kV6zA iy4Ei7J3b4QwLF+pFir++kZOL3/rtR3uiLKXPGFG+XNefkc2YK5OrnywZBuulfapdSJM mVIWKSl85CgSp89NsACRxC0Oj8BQMVMJnV1IRSNgp6nrr5K8npB3k2afs7w7j4negMqF I6SE2jSS5oNCvIxHs/CtFYaqgm3fYTZRLc6aO+MsLdXWfCl2mxuKH8FR2xvRLnQZNVla RQxjEIAem/wbpyxXOmypzdXbOhGGiKxHW5B+hBU37YhNbV0yk7Gne/3+KsJU5pRrdeRP 9poQ== 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=Bi6JCY1TdVH3jR5XhE+HxYjci5ANO+Raneg1AjhHVZ0=; b=EKV1kyq2KXmBrndDfrvf7qSj3KECRqjxk991h2Fp/PXc3eT3v2qJmrHotlUi9qUZHj EyJOamsr15fudfqy3V/Rr41r0v7gDdGEKLEhAZV8EJiQgCB8OlrF+aKkohp02jZmC0Cb xwm5yGrJ6Cj97QfX1Dgv550ZrgqNpd5wyaTHldqWFnbP1Om/vf99PBQlijBvEQCTstFJ FerZHMIrofDSQArLvbqACTcUmSiRxDbEkOiNSsDh+CZ4nZ4aHZqTiYvgr4o1w6pDSTri b626scZY/I65K116cjpVxzWtRMaBi+ThvyAlT41a1O9HRiT7U4PV5J2kf2Aw9cO+i4dY WV6A== 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 b11si964359oii.5.2019.10.21.02.35.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Oct 2019 02:35:18 -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: EET6V1fsRASlw31hKmQZBVB1WFDNR3utGsA8FHL3Mser6F12nOuA0MJStQgf45FVrxcQOl6lkV GFxhUvqvai4zzGC8LbA7I3ymXpeUXi/6BNiMqqP5Q+Es6TfsSBPu3SSNb0GKdagFBy3TtqRPbM Iz0cDawFy+yAJaH6qvU2pLVWSVOs6FWShxHQOTyZfAKyURrCMIYzme9No+1Bgmzg27r5lbWhjc fKYbmCZkGChunvCf1HP91FuB1L/TL9dC6ToP5d5EbkXFioK1xXxilt4NrpyYmCJ51VLrAMQtA1 u+0= X-IronPort-AV: E=Sophos;i="5.67,323,1566892800"; d="scan'208";a="42429282" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 21 Oct 2019 01:35:18 -0800 IronPort-SDR: fNh/74uiKV8KpuksD8bKXYocPA7oCUAc98bdNQAfyE3WlZUO0n7L6m2VH8fD3nG+YrtUPTwsvR zHU7c1cqes/TmUP2MDDpzdGl+w/wA5oqVr1chy76qVeFAJ9+W0cUJJajwgiefF8cQMvBAM1znC 2tIsRo0QZrLoW5nZaTwMnfLJ4xbBEA8rx3lkKB8zy5Cf+rWgUjb268vgIE2bdzt2hy6tK/ugsG NxBZaXi8eufbmqNw1fX1Iu2zoL6Jnj9ufgEz/Nzv3OGWsmoUhy+W3VrZ4L9i45G5V/kIlwMy2x q7Y= From: Cedric Hombourger To: CC: Cedric Hombourger Subject: [PATCH 4/4] patch: suffix patch files copied to .applied_patches with "~" Date: Mon, 21 Oct 2019 11:34:54 +0200 Message-ID: <1571650494-572-5-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571650494-572-1-git-send-email-Cedric_Hombourger@mentor.com> References: <1571650494-572-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-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: XgPYv5Dh0dqu 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index c5ba463..1d8041f 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -54,7 +54,7 @@ python do_patch() { 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