From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750187537661165568 X-Received: by 2002:a17:906:1655:: with SMTP id n21mr21697212ejd.110.1571657214056; Mon, 21 Oct 2019 04:26:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:cfc3:: with SMTP id i3ls2631154edk.9.gmail; Mon, 21 Oct 2019 04:26:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqwS76f7MxAUfSxB5HTuPsQHOcSzxsOGxpxe6k8F2VG+Fvsx5xGjndEGSi20rGe3TjQfa1f7 X-Received: by 2002:a05:6402:1492:: with SMTP id e18mr23998421edv.140.1571657213609; Mon, 21 Oct 2019 04:26:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571657213; cv=none; d=google.com; s=arc-20160816; b=sou2knN0swjTiaTwbSqFQpXvLNGDIS1p5cjObj5IRBro9mBwI9p61hDyD5IMqvJgM4 ixkZmoYV9OP9qiqtSdsMFXQmd/BgYBFzYK/Kpw2a+CBimClxeJ/cMtwN2EZDgZlyWGyn eaNe5zSEHG2B7UvECJsMC+D4ZkkIfH/0AgbRkivROoExlNCnf8FoZJAdL4oTS3ZN/ZTf 7eJcxkLvTj0aW1HB5G60oVFeAwWAlg+jiNfdR46TPIzMZ9avedqBTpvDfdt5V9o4MMA7 g4zf8NMurpEC/JfOGNJBY7Eei2VvsPuXIcCDzyDZgxeHofl5llxGWBjZPw/BBWZcQUlH 8HdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=AvESlUvcUFd8icYNhjMX4qp3U1f98Tvb/tX3Bf7UL68=; b=qIGaDRLgfWkxa5sI/uqsNoIqFO/ahMbsNixQZrG2Aw+YVydzPFG8vAZR6/2wZxN6fD 0Yn7I3F9uUfY66M3DYaCNz2I8Eqnd4BVh44VQqxX/5wRbMaBjUKXNE0KOzsYbJHdYZX+ i8ZrAZRh5pMFNIH9qZC8B7+RpriAgYFMmwffEXt9/M7DAKt/cVHwfsek528JUsjxUhRH aTHGuP7dd6smfad04uYMJflIBM6YN5Ay7mPct0Py54Vy+XEBA4LlkFl6WLdIH+x/C1Ne bJZrkhb3qqtapY5jIfsiN9rBYGTM9MIEToAkD6FEYBUs4BzYrTm+L1/X53B0Un3YJFKW zDpA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id b18si759651edr.1.2019.10.21.04.26.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Oct 2019 04:26:53 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x9LBQr9G006780 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Oct 2019 13:26:53 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.8]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9LBQrtg011041; Mon, 21 Oct 2019 13:26:53 +0200 Date: Mon, 21 Oct 2019 13:26:52 +0200 From: Henning Schild To: Cedric Hombourger Cc: Subject: Re: [PATCH 4/4] patch: suffix patch files copied to .applied_patches with "~" Message-ID: <20191021132652.2de4c080@md1za8fc.ad001.siemens.net> In-Reply-To: <1571650494-572-5-git-send-email-Cedric_Hombourger@mentor.com> References: <1571650494-572-1-git-send-email-Cedric_Hombourger@mentor.com> <1571650494-572-5-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: 9k4a7x8MycZA 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. Renaming that file might break that, did you check? I guess we could introduce a test for parts of that by adding a patch to the hello recipe. 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) >