From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750187537661165568 X-Received: by 2002:a02:a1c8:: with SMTP id o8mr21139337jah.82.1571657794409; Mon, 21 Oct 2019 04:36:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a6b:b5cd:: with SMTP id e196ls2543467iof.8.gmail; Mon, 21 Oct 2019 04:36:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqzYRcR2F0rTYKYNsId8sLozrU38EWE9To0j9ATUoHFeFOUz4RNhpS09xiSo1KPrBN5GYS+O X-Received: by 2002:a05:6602:21c2:: with SMTP id c2mr10442453ioc.189.1571657794005; Mon, 21 Oct 2019 04:36:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571657794; cv=none; d=google.com; s=arc-20160816; b=RianjLdD7bmUDt2YWyfE1FOKkQpoV7DWvL/r6PHoRqJnkIKxncAA9aerMOvj5EkINa dpwHZ+MU0SnCRPkVo7yyIsgI/AgB7JjXkn1dFxhDjlhh6DUoMiOzLovaVXQBZYGDDJ2E U4e0Qi8YbAli991isVAWwT0MIPPV0RIlfRoeX1b6ZXUvUTtcScJO4XZLVIB+LNpyI1A/ KjZgTOfSM9CK4vwEa8WHkp54Psm2We8W4aUW24GXbpOC6oMc8y/Dkh0wBvRow4Q/PWim frUqAyGEChwlkLmIkOOfIyhv6b6JNEM4EnUGTpuckphq/ngwgVBxiiC059dNvB5dTcSo +B2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-language:content-transfer-encoding:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject :ironport-sdr:ironport-sdr; bh=Y9H17KfFT6kWz1Oxrl5tkau086yiv7N0z6eN2XggIKs=; b=GTz8V2EejWxEkK5hd+g4EONn9FLLI9z2P6Q1LMotySXvRCkJJ+N5+S3ZecAG+k2Amd BFNL2Pmwoo9Ocdn9tSbcNj/Jbf2RvI/KBglBPnRuSSuSHVVR9iG3qoQP7+mql1dpmYTw UGbSYIk8YXWbgPG3AGH1044O6NWT0YjEj5xxgKX3Jo6CZRq/F0Hwp8zF/F3bOmxFUl89 a5UsyshQy3Zc8ODyBdYzYiaSfYx8WmB3fMxQtOYiNIyTKWf93R6w9Vsni5IkPSjz7mZO vSEkrwp3UB/4oGDrb+yB+yYOLf8KGfU3Qb3yewvgj1tpu1tau3xvC9BGHikZbV/JO7PH wDlg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id j68si199469ild.3.2019.10.21.04.36.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Oct 2019 04:36:33 -0700 (PDT) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com IronPort-SDR: iBu/t49wYe7N1+a6eGtmuxgTe8uqSPVnXK7CXuGTFIaZJgqWr0MEOBdrJzvAaegq/QuD1ZiKQf LEhGwqoyRcTOLlYJ8uw38Mh6TMI51Ksw6y7hTJwpAij5zBlx9FeC4DCcSQDObBf2i/hmtuW0YB GQC8Q2ZIzHbxUuJ/3FUX9npoFJVCa1N1QoFqhuiAcDKyt/NfPxBgO1GRykLQN7zJgx1TEOAPTT C6BVLvrLfc/56jrMh85YugaYQ3Qna4szTyawocGrYMBgEAe/Ssig+Xfjbqj4XWMaM1nmyKP2SV GNc= X-IronPort-AV: E=Sophos;i="5.67,323,1566892800"; d="scan'208";a="42452974" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 21 Oct 2019 03:36:32 -0800 IronPort-SDR: K/aKAsgOQadKfrlTRdZjDl/aqrOjp9qwJEcq5ZwURs544NwwtnHu03zLKcqoQuHLLzCmpMzSJr bfMAGwITZiUD5w4ITrytfc91rBfKkd40aikkU8dtWxa0BwywyWzO4tesAZqxAnoLmAB/Tr7HcV s4LzwDyb4/We9CMX3Yg7c3h9KuTiNGIlRMx3jSXXBTMAekL1/no+0qL9z1xmL1heIxeZ1PagVz 6Gb1Jpm5DaXv6qN5PLv9J+odDStQlfQvixB7R9NBU237KjOhbPU8Z8TRgYSEpgY7z3pN7GZY1H Uj8= Subject: Re: [PATCH 4/4] patch: suffix patch files copied to .applied_patches with "~" To: Henning Schild CC: References: <1571650494-572-1-git-send-email-Cedric_Hombourger@mentor.com> <1571650494-572-5-git-send-email-Cedric_Hombourger@mentor.com> <20191021132652.2de4c080@md1za8fc.ad001.siemens.net> From: Cedric Hombourger Message-ID: Date: Mon, 21 Oct 2019 13:36:25 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191021132652.2de4c080@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Return-Path: cedric_hombourger@mentor.com X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: ljlzcYK0vW5a Hi Henning On 10/21/2019 1:26 PM, Henning Schild wrote: > I think that whole patching keeps the files so we can roll back and i > think Jan wanted to somehow continue working on it using quilt. Ok the last I heard from him is that he felt that the approach he had implemented and upstream'ed was far easier than having to implement something ala Yocto. I guess we can let him comment? > > Renaming that file might break that, did you check? yes, no issues observed on my end with e.g. the linux-mainline kernel recipe on the de0-nano machine. The .patch_commands file carries the full "patch" command and the expected filename (suffixed with ~). Isar simply appends -R to the patch command line when it needs to revert previously applied patches. > I guess we could introduce a test for parts of that by adding a patch > to the hello recipe. We sure could though the linux-mainline recipe is already testing this. > > Henning > > Am Mon, 21 Oct 2019 11:34:54 +0200 > schrieb Cedric Hombourger : > >> 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) >>