* [ptxdist] [PATCH] libslirp: Fix license file definitions.
@ 2023-04-09 14:05 Christian Melki
2023-04-14 10:03 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2023-04-09 14:05 UTC (permalink / raw)
To: ptxdist
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>
---
rules/libslirp.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/libslirp.make b/rules/libslirp.make
index 232241da2..210c32a69 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
# ----------------------------------------------------------------------------
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] libslirp: Fix license file definitions.
2023-04-09 14:05 [ptxdist] [PATCH] libslirp: Fix license file definitions Christian Melki
@ 2023-04-14 10:03 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2023-04-14 10:03 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
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
>
> # ----------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-04-14 10:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-09 14:05 [ptxdist] [PATCH] libslirp: Fix license file definitions Christian Melki
2023-04-14 10:03 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox