Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: "J. Neuschäfer" <j.neuschaefer@gmx.net>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH] {skalibs, execline, mdevd, s6, s6-{rc, linux-init, {linux, portable}-utils, networking}}: bump
Date: Sat, 1 Jun 2024 11:51:52 +0200	[thread overview]
Message-ID: <ZlrvOE7b8M1YGuVq@landeda> (raw)
In-Reply-To: <20240530-s6-update-v1-1-8088e16a1cf4@gmx.net>

J. All,

On 2024-05-30 22:32 +0200, J. Neuschäfer via buildroot spake thusly:
> Update all skarnet.org packages to their current upstream version.

I shoterned the commit title, and moved the package list in the commit
log instead, it's a little bit cleaner...

> diff COPYING (slightly different between packages):
> -Copyright (c) 2011-2022 Laurent Bercot <ska-skaware@skarnet.org>
> +Copyright (c) 2011-2024 Laurent Bercot <ska-skaware@skarnet.org>

Gah, when I applied, that got interpreted as a diff, which throw git-am
off, and I had to manually fix it up, and I forgot to amend the commit
log with the explanations for the license change. Damn me.

> Signed-off-by: J. Neuschäfer <j.neuschaefer@gmx.net>
> ---
> This patch(set) updates the packages from skarnet.org. It is one commit
> to avoid build failures due to incompatible versions: For example, when
> I only update skalibs to 2.14.1.1 and leave the rest as is, execline
> fails to build.

I've moved that paragraph to the commit log, and slightly reworded and
extended it, as discussed in the review.

[--SNIP--]
> diff --git a/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch b/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch
> deleted file mode 100644
> index 2df8a99700..0000000000
> --- a/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@

That hunk failed to apply, and I was wondering why, until I wrote this
reply, and remembered the 'diff COPYING' above. That pseudo-diff hunk
ended up in this hunk, which is what made git-am throw up its hands and
leave me handle the breakage...

Also:

    $ ./utils/docker-run check-package
    .checkpackageignore:1383: ignored file package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch is missing

So I also fixed that.

Applied to next, thanks.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

      parent reply	other threads:[~2024-06-01  9:51 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-30 20:32 [Buildroot] [PATCH] {skalibs, execline, mdevd, s6, s6-{rc, linux-init, {linux, portable}-utils, networking}}: bump J. Neuschäfer via buildroot
2024-05-31  9:35 ` Yann E. MORIN
2024-06-01  8:50   ` J. Neuschäfer via buildroot
2024-06-01  9:13     ` Yann E. MORIN
2024-06-01 11:15       ` J. Neuschäfer via buildroot
2024-06-01  9:51 ` Yann E. MORIN [this message]

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=ZlrvOE7b8M1YGuVq@landeda \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@buildroot.org \
    --cc=j.neuschaefer@gmx.net \
    /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