public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: bkylerussell@gmail.com
To: openembedded-core@lists.openembedded.org
Cc: wesley.lindauer@gmail.com, richard.purdie@linuxfoundation.org,
	Kyle Russell <bkylerussell@gmail.com>
Subject: [PATCH v2 0/1] patch.py: don't apply striplevel to git am command
Date: Wed, 29 Apr 2020 20:01:44 -0400	[thread overview]
Message-ID: <20200430000145.8359-1-bkylerussell@gmail.com> (raw)
In-Reply-To: <CAFrQVPMFCxHN4hzp2ktmP0wEH1Bp571z1KkSL5pfbHdWcuaFQg@mail.gmail.com>

Here's an updated patch that I hope will be a little more clear.  I've dropped
the change to git apply since that wasn't behaving as I expected, then added
a selftest on llvm that demonstrates the issue I'm trying to resolve.  Without
the change in patch.py included here, the selftest that I'm proposing will fail.

One might argue, "Well, if you change the default PATCHTOOL, you could also
just change your patch SRC_URIs and drop the striplevel parameter."  While
that may be true, the same failure can also be demonstrated using devtool on
llvm without modifying PATCHTOOL at all, since by default devtool also uses
GitApplyTree.  So if you don't consider "modifying a recipe's PATCHTOOL without
also modify its SRC_URI patches" to be a valid workflow, devtool is another
common workflow where this behavior could be encountered.

Hope that helps,

Kyle

Kyle Russell (1):
  patch.py: don't apply striplevel to git am command

 .../llvm/files/0001-Test-new-file.patch        | 17 +++++++++++++++++
 .../recipes-test/llvm/llvm_%.bbappend          |  2 ++
 meta/lib/oe/patch.py                           |  2 +-
 meta/lib/oeqa/selftest/cases/bbtests.py        | 18 ++++++++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 meta-selftest/recipes-test/llvm/files/0001-Test-new-file.patch
 create mode 100644 meta-selftest/recipes-test/llvm/llvm_%.bbappend

-- 
2.17.1


  reply	other threads:[~2020-04-30  0:02 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-09  4:41 [PATCH 0/1] patch: don't strip GitApplyTree patches bkylerussell
2020-04-09  4:41 ` [PATCH 1/1] " bkylerussell
2020-04-09 10:07   ` [OE-core] " Richard Purdie
2020-04-27 20:32     ` bkylerussell
2020-04-30  0:01       ` bkylerussell [this message]
2020-04-30  0:01         ` [PATCH v2 1/1] patch.py: don't apply striplevel to git am command bkylerussell
2020-04-10  3:44   ` [OE-core] [PATCH 1/1] patch: don't strip GitApplyTree patches Peter Kjellerstedt
2020-04-09  5:02 ` ✗ patchtest: failure for " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2020-06-05  1:35 [PATCH v2 0/1] patch.py: don't apply striplevel to git am command bkylerussell

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=20200430000145.8359-1-bkylerussell@gmail.com \
    --to=bkylerussell@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=richard.purdie@linuxfoundation.org \
    --cc=wesley.lindauer@gmail.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