From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750187537661165568 X-Received: by 2002:ac2:5507:: with SMTP id j7mr15420233lfk.75.1571661807085; Mon, 21 Oct 2019 05:43:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:7d02:: with SMTP id y2ls1543583ljc.8.gmail; Mon, 21 Oct 2019 05:43:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqw1fCgdr5tE5hNViZ+sEALriYwkRoVKeIaMsSAkh3ZUighsPFG8p6ztW/J1dyOJ2hkVLYdY X-Received: by 2002:a2e:8945:: with SMTP id b5mr10901156ljk.215.1571661806226; Mon, 21 Oct 2019 05:43:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571661806; cv=none; d=google.com; s=arc-20160816; b=cquzwz7uomuPFOhVKdiEI714HEcV8ha9X40z1g4d8aKU/aeZwWYi9u0yEZaYK2fGv5 k/Ntnfnst6odcPEOzG8i57umbnbShRnELPm7cQBnr/ESYWaMjDgJA2GkQaJaggjtY9CY WTqrvQVOaoqBv5SxtqD4/E70IW1jkv3FgICEt877W95FFARO9MfiKQYdgbEDWZCedN4x Nbk6OHPu5ki0e3bnh0LjWvX6M/kYbkQQYow0HwAHqLo2BRnS+Kaf2im82cjTnZExo5cz kFQFwYowAgcsVLHVWYUkJK96FEMVGsQERvlppsnkVieaQo5axlt7kPF/c9N+nt2CQEfX z9dQ== 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=TEgMNgs4dSfCDUvirgYlN0MoxDQ7UN6LuAI9HSeU8oE=; b=sE7gBjGLuQGoKp0id/i7HYITQji1QughNpO8FNZF/SdDlRbIBgZWoyXfoPI5V9a76M 83o4fl6YO5U3E+1Wijux+gHUZfGkqSNROUgDWL5XAUPNv4o6nQZRqxjxO5fw85zO9rj8 ntXthV8daIUsTv3EwO2upmR67GhnsRoz5LFUJISFkRUj737btzYJlE1vmfZTtlay9Fou tHZLrziFHPPUqtP21IXKbYBv3xUga3Yuu3mUk/4Hd6ypk703vctwcBMX/l2aAUc0r6r7 4d84Ia92MiT7+eDOYiH9h68CEjJyjyA4l6vOszCU6s0lE4S9Xci91bYG3AtrU1YcQ5YA 7riw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id z26si69589lfq.4.2019.10.21.05.43.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Oct 2019 05:43:26 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x9LChPio028595 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Oct 2019 14:43:25 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.8]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9LChPI8008755; Mon, 21 Oct 2019 14:43:25 +0200 Date: Mon, 21 Oct 2019 14:43:24 +0200 From: Henning Schild To: Cedric Hombourger Cc: Subject: Re: [PATCH 4/4] patch: suffix patch files copied to .applied_patches with "~" Message-ID: <20191021144324.6b9c407a@md1za8fc.ad001.siemens.net> In-Reply-To: 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> 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: TgvJ02AqRvPG 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) 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) > >>