From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Christian Melki <christian.melki@t2data.com>
Subject: Re: [ptxdist] [APPLIED] libslirp: Fix license file definitions.
Date: Fri, 14 Apr 2023 12:03:39 +0200 [thread overview]
Message-ID: <20230414100339.3412998-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20230409140553.3057693-1-christian.melki@t2data.com>
Thanks, applied as 6b512347ee4b2f2239495af7cea04a9e6cdd2bfb.
Michael
[sent from post-receive hook]
On Fri, 14 Apr 2023 12:03:38 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Our somewhat sensitive license parsing choked on
> the one recipie with endline but no startline.
> Might aswell just align it with the rest.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20230409140553.3057693-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libslirp.make b/rules/libslirp.make
> index 232241da2b96..210c32a69917 100644
> --- a/rules/libslirp.make
> +++ b/rules/libslirp.make
> @@ -23,8 +23,8 @@ LIBSLIRP_SOURCE := $(SRCDIR)/$(LIBSLIRP).$(LIBSLIRP_SUFFIX)
> LIBSLIRP_DIR := $(BUILDDIR)/$(LIBSLIRP)
> LIBSLIRP_LICENSE := BSD-3-Clause AND MIT
> LIBSLIRP_LICENSE_FILES := \
> - file://src/main.h;endline=4;md5=1e742c49b6e4dd48549742f8727faceb \
> - file://src/slirp.c;endline=24;md5=1e11fddaa17f36215c1697d4bad0e70a \
> + file://src/main.h;startline=1;endline=4;md5=1e742c49b6e4dd48549742f8727faceb \
> + file://src/slirp.c;startline=1;endline=24;md5=1e11fddaa17f36215c1697d4bad0e70a \
> file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727
>
> # ----------------------------------------------------------------------------
prev parent reply other threads:[~2023-04-14 10:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-09 14:05 [ptxdist] [PATCH] " Christian Melki
2023-04-14 10:03 ` Michael Olbrich [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=20230414100339.3412998-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=christian.melki@t2data.com \
--cc=ptxdist@pengutronix.de \
/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