From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750187537661165568 X-Received: by 2002:a17:902:b20c:: with SMTP id t12mr24740862plr.196.1571662445657; Mon, 21 Oct 2019 05:54:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a63:b304:: with SMTP id i4ls3596819pgf.9.gmail; Mon, 21 Oct 2019 05:54:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqxfBZoNFwVmR61gZrVq321lAN2SAzHqhFYAaNxfbLtlZDAi1u+ciWtxWp9nCqAQuGDI1qqP X-Received: by 2002:a63:934d:: with SMTP id w13mr7606147pgm.185.1571662445204; Mon, 21 Oct 2019 05:54:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571662445; cv=none; d=google.com; s=arc-20160816; b=vVbJ3NZxFjGdo9lqm5d3HQh4D7NRO4kOAn6NoLYSo8MDK0l2wsgEaTmd/cAD1JfSti 2rZi4vBWIHkZLBf6kiZYMvjkkh5me4ET24TBU75wvdiGSEfF6ir1IHrd2sqcc4WQ0+4V mWKLUuAuPu2Zv13hhoQSEKD+Wyh18pidfGxVo0bytH3SQxQNVn1Dku6T7ichZYbPajUc za8tcv6CZzwrfZ69gyLv4ocx5nR+EKRX3kVa4PvizurFZqDuWAp2Vlg52n0izDn+3JQD SEr+J4Tza2kuwI3GFW3wtKYGKwf31hnux26fGRcQ5OPQnyMgdrejjP64/EWzRwgkj2MP RReQ== 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=Y17Lr74+4/lGqTdZxURDQJVBYZNotEJmwxNyYQDUiEw=; b=ZO1l7ibbrvTVFBKosW4QUCqgxSBl61d9qvQswCXTn5dIUhCieZ+tlU1LVPS3t1TBEg Mk/gIv0cky9GoDUEZ3qH7BJmGFU2loAzQW8igNPK1Ui28ORFz/viO+SQ0S/iAUERq2DF HqJ8KxiAzKwmh3So97lAeVnQswx5c5q6Lz25q4nk1FhPqGMH3H6+H3UVL5Br/q5xiR2S hK1ZCznc+vxcnpQVhKxb6k+GTvkoGBqatCAHup4hxMmzsLVV3ouS2KqFyMbKUd6qJ5KH D4FelGDxjFcq/GwRXt1UPLMj85MX8MRtyTEHrAX4yZ/ZhpOg5zYkS/MtF2ujus9bjOz+ s5Ew== 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 124si664869pgd.4.2019.10.21.05.54.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Oct 2019 05:54:05 -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: FVph9gXEn0QdMo24RIEAdz61l+TFE5qlv4oIVrKeegwgCwqGw3/MYGx36Bt1ffMmwCZfms2PVa P7RVZ+pGjmLZSRF48zfp/W/88/Vnw6blS5dQcCaGJdnBz8SL7umr23Ry7pmywqev9TnGr+gE2e fJ1tpToaTA6WrON9itz7qptYHutU1uLDZJeEV279i1dOXvUaE5L8IexueAbUy6VaVZmcvZ/OUf aUnkk1eBOJFWUGUTof+ez17VS1obsQjXSOwdqD6FU3ALxWWmOGjrmJuYf78VCx+YJ6NndqI9v2 NGA= X-IronPort-AV: E=Sophos;i="5.67,323,1566892800"; d="scan'208";a="42455417" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 21 Oct 2019 04:54:04 -0800 IronPort-SDR: KWHBk/uSBVK7AfLPH4ThXhnTRyc5zQzyGBQ41LUR4yxzgTPLvKRIjO4xnvJeaPwibfMXXk0Dtt ZfUauiiEsfB4TOJ5faHgJGsmMYIKSmvRZcVicU/CnRa+T/6kB5QG/8asHe+t5EnnBMd6kor5ik D1/4/QzpcbPA2JsxK5wN/ZrsC0o7VBT4RzzXnb9nsabQusv7MPuQe5CIf6JUt7v9FXkrk01EUF cV9PXPf8WjPH5kZV3oS4Sv0qqlzVjEhf7zvQtzKu51u5thmBs2L/Lh72yAWbIbxwqdtp+2wl4M DT4= 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> <20191021144324.6b9c407a@md1za8fc.ad001.siemens.net> From: Cedric Hombourger Message-ID: <83f900e7-753a-5728-c7b9-5c2cf2733f2b@mentor.com> Date: Mon, 21 Oct 2019 14:53:53 +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: <20191021144324.6b9c407a@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-08.mgc.mentorg.com (139.181.222.8) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: lJalCZcohsfX On 10/21/2019 2:43 PM, Henning Schild wrote: > Am Mon, 21 Oct 2019 13:36:25 +0200 > schrieb Cedric Hombourger : > >> 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. > I was talking about the combination apt://-URI + patch(es) Copy that. I will figure out something > > Henning > >>> 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) >>>>