From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7001018444897320960 X-Received: by 2002:a17:906:69d0:: with SMTP id g16mr8489735ejs.20.1630051633844; Fri, 27 Aug 2021 01:07:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:bb62:: with SMTP id y89ls8761013ede.2.gmail; Fri, 27 Aug 2021 01:07:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrR6diO3E9P2K2OTxRS0lnEc2yoVtFZ0rzraY+fythKmmvrKOQBRSVpBAalkkjt44fUc38 X-Received: by 2002:a05:6402:5:: with SMTP id d5mr8494812edu.359.1630051632787; Fri, 27 Aug 2021 01:07:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630051632; cv=none; d=google.com; s=arc-20160816; b=BRVtYjYS9NxqV2yn2TmZytuoba/4OUj6jMSgXkoCYS7YxY6yj1pKIGueiVms+iKEu5 5u5uhX5bjiNy6q6J9gdnYo+uHTjcNxkBAwXUg9OIr6jGW9x3PN9SDlLeFOg7FlBSrPYy BVNXkAL3euN2Tnxbmasn68FHiocDTnJmc1IT3qdC5/QTD/blgGcEKF04Lj64ezWbzxnt TAmDtfFmxueW7IF5nNTpT4wppQD9LNwuQJnzvBdEPDtdd+46nL5FOeRBPXN57xRKlJuZ qWKQQ6vKKJOdFFTvhE7GuMRhbHQbYZDZIMBmoXfVeljLU4lklQKp+eOkvoTfqfjCNjH9 Bj4w== 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:date:subject:to:from; bh=gUFZr/vhqXl0NIcSBGjEZqF8tkax8G/JeDNU0YGqIx8=; b=bF9chu1vA18iyll7RWWoUwQ2QXScJfRcNkEcejmndIurpRW3+eEZs5HpuGqs0YOB+2 AWzxfNAuRJFZrU0hlPahuZubbhUxiiJ/2sJeq/Ox8gq2UzEY+KM6p1cDU8duS72JWl6v VWtK0LUbN1mrecVY6gpk+a+562aQkbqyJivJPaXQSCOvr4+2s3u7/7wRY6HzTUsqI6SB GDWK+Ftp59WJHX3GEpF6DEKlo4JaGV84nhwPCWn+QTttkfpMBZfWDMc+4jUtWbJkXp77 KS11LWl+Q6+a01X1D6e65hX5kTANgQ3jQH+f9us8+hk1ckaNNRUp1iG2hc2RseF8aKAi K5aA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id s18si372865ejo.1.2021.08.27.01.07.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Aug 2021 01:07:12 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 17R871RN019101 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 27 Aug 2021 10:07:08 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [RFC 1/3] meta-isar: reformat isar.patch for cowsay to properly work with git Date: Fri, 27 Aug 2021 10:06:59 +0200 Message-Id: <20210827080701.5099-2-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210827080701.5099-1-ubely@ilbers.de> References: <20210827080701.5099-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: 12UQOGId4n9w When PATCHTOOL is set to git, GitApplyTree class in oe/patch.py can't properly handle non-git patches and fallbacks to PatchTree class. This makes impossible to reapply the same patch if it was already done during previous build, with `Patch format detection failed` Signed-off-by: Uladzimir Bely --- meta-isar/recipes-app/cowsay/files/isar.patch | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/meta-isar/recipes-app/cowsay/files/isar.patch b/meta-isar/recipes-app/cowsay/files/isar.patch index 4333d4d..529a93c 100644 --- a/meta-isar/recipes-app/cowsay/files/isar.patch +++ b/meta-isar/recipes-app/cowsay/files/isar.patch @@ -1,6 +1,20 @@ -diff -Nru git.old/debian/patches/isar.patch git/debian/patches/isar.patch ---- git.old/debian/patches/isar.patch 1970-01-01 01:00:00.000000000 +0100 -+++ git/debian/patches/isar.patch 2021-01-21 14:21:26.439040449 +0100 +From 8b7944ca60d4bba3644463d39c865de71e9eba05 Mon Sep 17 00:00:00 2001 +From: Henning Schild +Date: Fri, 22 Jan 2021 09:42:40 +0100 +Subject: [PATCH] %% original patch: isar.patch + +%% original patch: isar.patch +--- + debian/patches/isar.patch | 12 ++++++++++++ + debian/patches/series | 1 + + 2 files changed, 13 insertions(+) + create mode 100644 debian/patches/isar.patch + +diff --git a/debian/patches/isar.patch b/debian/patches/isar.patch +new file mode 100644 +index 0000000..00dae53 +--- /dev/null ++++ b/debian/patches/isar.patch @@ -0,0 +1,12 @@ +Index: git/cows/elephant.cow +=================================================================== @@ -14,11 +28,15 @@ diff -Nru git.old/debian/patches/isar.patch git/debian/patches/isar.patch + $the_cow = <