public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Henning Schild <henning.schild@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCH 1/3] dpkg: adjust task order to allow using "git" for patching
Date: Fri, 22 Jan 2021 09:42:39 +0100	[thread overview]
Message-ID: <20210122084241.10573-2-henning.schild@siemens.com> (raw)
In-Reply-To: <20210122084241.10573-1-henning.schild@siemens.com>

From: Henning Schild <henning.schild@siemens.com>

The adjust_git task breaks the git tree for use outside the buildchroot.
And our patch implementation supports using "git am" when setting
PATCHTOOL = "git". In order to actually apply git patches we have to
adjust after patching.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/classes/dpkg-base.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 01c6eb658e..5c7bddc9ba 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -47,10 +47,10 @@ python do_adjust_git() {
             bb.fatal(str(e))
 }
 
-addtask adjust_git after do_unpack before do_patch
+addtask adjust_git before do_dpkg_build
 
 inherit patch
-addtask patch after do_adjust_git before do_dpkg_build
+addtask patch before do_adjust_git
 
 SRC_APT ?= ""
 
-- 
2.26.2


  reply	other threads:[~2021-01-22  8:42 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-22  8:42 [PATCH 0/3] allow do_patch to use the "git" tool Henning Schild
2021-01-22  8:42 ` Henning Schild [this message]
2021-01-22 10:53   ` [PATCH 1/3] dpkg: adjust task order to allow using "git" for patching Jan Kiszka
2021-01-22 13:40     ` Henning Schild
2021-02-08 16:06       ` Anton Mikanovich
2021-02-08 16:16         ` Henning Schild
2021-01-22  8:42 ` [PATCH 2/3] meta-isar: apply a "git" patch in cowsay Henning Schild
2021-01-22  8:42 ` [PATCH 3/3] dpkg-gbp: default to "git" patching Henning Schild
2021-01-22 10:55   ` Jan Kiszka
2021-08-11 18:14     ` Jan Kiszka
2021-08-11 18:36       ` Henning Schild
2021-08-11 18:44         ` Henning Schild
2021-08-11 19:15           ` Jan Kiszka
2021-08-13 20:22             ` Henning Schild
2021-08-11 19:12         ` Jan Kiszka
2021-08-13 20:32           ` Henning Schild
2021-02-10  9:17 ` [PATCH 0/3] allow do_patch to use the "git" tool Anton Mikanovich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210122084241.10573-2-henning.schild@siemens.com \
    --to=henning.schild@siemens.com \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox