From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7006735278050115584 X-Received: by 2002:adf:c501:: with SMTP id q1mr4016336wrf.150.1631382685695; Sat, 11 Sep 2021 10:51:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:c789:: with SMTP id l9ls2140102wrg.1.gmail; Sat, 11 Sep 2021 10:51:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFieVRlie1/nZGRr3pK5nceMpuM+nz5AE8ch87kMXGoZnWWwxi7TCAe3PteGcHNB+KN1T1 X-Received: by 2002:a5d:528b:: with SMTP id c11mr3885136wrv.369.1631382684695; Sat, 11 Sep 2021 10:51:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631382684; cv=none; d=google.com; s=arc-20160816; b=Hi6y1z/zP+urlxc5Po4gvcdDQGp8Qgex8BS/czTwXBed2sL85HBSrLMSJ5RY78aX8k uKrRZZR9hVS3zyjmoG07d9fyLwnw3Q6IAwqx+/ZuvHUzZPy8UouLT4PioATRAUk1jS/i w5SYenmvZxdvKClIDbz0R0aLO5RM5YlSj57QlR8xpWMMleDzCmmmrXFylRL0T8a2qW8K POQMfkJEL+E3R7w2NF4p6mYuo1uuwxeZVjKNAooJt/+xjB9dRoOhhb9b6PNHf+mJPrNW loK5jQpTx07e/uBkqIYbGVNbio0909XumSnOihiRdbmZdR+2fVgVkJAghsggjGG9davY wrwg== 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=EoxnLV4URzc1bY0NlKS3tQujXd9Qy5TOcKn+NdZl+RdgXywYUIMA5vxORjj7ROyMuX gE4NmJ1JSVieMdRJ6lmdaXdeCmEwQTSu0U3fbyXlBAYIYggIdInS/JQc/B9rlnllr6+M ci35JHDWUYODsMBJPJG7e9kY/GIU8xX+ClVOlRJ0JN3rhltNe92B7kBByqkUucoj3LPK AuJrBLlg0xXKOxP8dcc14SUNLkeElS0ZT3TUzdgtTIfZTrROkpf7AAzkDMzahxy5oEFc DdWB+q2QnYKxDifR+1yBpn0A61+BBRHw5BYTZOZ09n/HzYrIT4xJOtfIotPEF9leXFGT Y4PA== 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 q195si358944wme.1.2021.09.11.10.51.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 11 Sep 2021 10:51:24 -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 18BHpJfu002279 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sat, 11 Sep 2021 19:51:22 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 1/3] meta-isar: reformat isar.patch for cowsay to properly work with git Date: Sat, 11 Sep 2021 19:51:17 +0200 Message-Id: <20210911175119.5910-2-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210911175119.5910-1-ubely@ilbers.de> References: <20210911175119.5910-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: w5E2VIOr8N19 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 = <