All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni via buildroot <buildroot@buildroot.org>
To: Daniel Lang <dalang@gmx.at>
Cc: Martin Bark <martin@barkynet.com>, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH] package/ca-certificates: bump version to 20230311
Date: Sat, 18 Mar 2023 23:22:52 +0100	[thread overview]
Message-ID: <20230318232252.1a6ce79b@windsurf> (raw)
In-Reply-To: <20230316204743.26192-1-dalang@gmx.at>

On Thu, 16 Mar 2023 21:47:43 +0100
Daniel Lang <dalang@gmx.at> wrote:

> Signed-off-by: Daniel Lang <dalang@gmx.at>
> ---
>  ...2pem.py-make-cryptography-module-opt.patch | 10 ++++---
>  ...2pem.py-Fix-compat-with-cryptography.patch | 29 -------------------
>  package/ca-certificates/ca-certificates.hash  |  4 +--
>  package/ca-certificates/ca-certificates.mk    |  4 +--
>  4 files changed, 10 insertions(+), 37 deletions(-)
>  delete mode 100644 package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch

I didn't look carefully, but it doesn't apply here:

Applying patch #1757985 using "git am -s"
Description: package/ca-certificates: bump version to 20230311
Applying: package/ca-certificates: bump version to 20230311
error: patch failed: package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch:36
error: package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch: patch does not apply
error: patch failed: package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch:1
error: package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch: patch does not apply
Patch failed at 0001 package/ca-certificates: bump version to 20230311
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
'git am' failed with exit status 128

Does your patch apply on the master branch?

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  reply	other threads:[~2023-03-18 22:23 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-16 20:47 [Buildroot] [PATCH] package/ca-certificates: bump version to 20230311 Daniel Lang
2023-03-18 22:22 ` Thomas Petazzoni via buildroot [this message]
2023-03-19 11:05   ` Daniel Lang
  -- strict thread matches above, loose matches on Subject: below --
2023-03-18 20:44 Steve Hay via buildroot
2023-03-18 20:50 ` Thomas Petazzoni via buildroot
2023-03-19  2:24   ` ʎɐH ǝʌǝʇS via buildroot
2023-03-19  2:18 Steve Hay via buildroot
2023-03-19 13:44 ` Thomas Petazzoni via buildroot
2023-03-19 14:23   ` ʎɐH ǝʌǝʇS via buildroot
2023-03-19 14:22 Steve Hay via buildroot
2023-03-19 17:49 ` Thomas Petazzoni via buildroot
2023-04-08 19:42 ` Peter Korsgaard

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=20230318232252.1a6ce79b@windsurf \
    --to=buildroot@buildroot.org \
    --cc=dalang@gmx.at \
    --cc=martin@barkynet.com \
    --cc=thomas.petazzoni@bootlin.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.