* [ptxdist] [PATCH] tcpreplay: fix license and pin down more license files
@ 2024-09-24 9:03 Bastian Krause
2024-09-24 9:07 ` Roland Hieber
2024-09-26 13:19 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 2 replies; 3+ messages in thread
From: Bastian Krause @ 2024-09-24 9:03 UTC (permalink / raw)
To: ptxdist; +Cc: ore, Roland Hieber, Bastian Krause
As tcpreplay is GPL software, include a file mentioning that it's under
GPL (src/tcpreplay.c)
Additionally, docs/LICENSE states:
Please note that this license covers the files that I have written.
Some files distributed with the Tcpreplay Suite are copyrighted by
other authors and have a different license. These files & directories
are marked as such.
This probably applies to src/common/err.c (BSD-4-Clause-UC) and to
src/common/fakepoll.c (BSD-3-Clause).
Add those licenses and pin the corresponding files.
Suggested-by: Roland Hieber <rhi@pengutronix.de>
Signed-off-by: Bastian Krause <bst@pengutronix.de>
---
Originally sent as "[PATCH v2] tcpreplay: new package"
(<20240923132020.1626850-1-bst@pengutronix.de>), but v1 was already
applied on master. So turn this into a separate commit instead.
Since the above version, I've also pinned down src/tcpreplay.c.
---
rules/tcpreplay.make | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/rules/tcpreplay.make b/rules/tcpreplay.make
index 3f1568ad0..b28bc571a 100644
--- a/rules/tcpreplay.make
+++ b/rules/tcpreplay.make
@@ -21,9 +21,12 @@ TCPREPLAY_SUFFIX := tar.xz
TCPREPLAY_URL := https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION)/$(TCPREPLAY).$(TCPREPLAY_SUFFIX)
TCPREPLAY_SOURCE := $(SRCDIR)/$(TCPREPLAY).$(TCPREPLAY_SUFFIX)
TCPREPLAY_DIR := $(BUILDDIR)/$(TCPREPLAY)
-TCPREPLAY_LICENSE := GPL-3.0-only
+TCPREPLAY_LICENSE := GPL-3.0-only AND BSD-4-Clause-UC AND BSD-3-Clause
TCPREPLAY_LICENSE_FILES := \
- file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8
+ file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8 \
+ file://src/tcpreplay.c;startline=4;endline=15;md5=9b41c5c891f51dfe9669e794a1d680c7 \
+ file://src/common/err.c;startline=14;endline=43;md5=0fd028531634bf7aba2791035e3c2de4 \
+ file://src/common/fakepoll.c;startline=8;endline=36;md5=903f05912a12e9a01b3018b915a1a7df
# ----------------------------------------------------------------------------
# Prepare
--
2.39.5
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] tcpreplay: fix license and pin down more license files
2024-09-24 9:03 [ptxdist] [PATCH] tcpreplay: fix license and pin down more license files Bastian Krause
@ 2024-09-24 9:07 ` Roland Hieber
2024-09-26 13:19 ` [ptxdist] [APPLIED] " Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Roland Hieber @ 2024-09-24 9:07 UTC (permalink / raw)
To: ptxdist; +Cc: ore, Bastian Krause
On Tue, Sep 24, 2024 at 11:03:31AM +0200, Bastian Krause wrote:
> As tcpreplay is GPL software, include a file mentioning that it's under
> GPL (src/tcpreplay.c)
>
> Additionally, docs/LICENSE states:
>
> Please note that this license covers the files that I have written.
> Some files distributed with the Tcpreplay Suite are copyrighted by
> other authors and have a different license. These files & directories
> are marked as such.
>
> This probably applies to src/common/err.c (BSD-4-Clause-UC) and to
> src/common/fakepoll.c (BSD-3-Clause).
>
> Add those licenses and pin the corresponding files.
>
> Suggested-by: Roland Hieber <rhi@pengutronix.de>
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
Reviewed-by: Roland Hieber <rhi@pengutronix.de>
> ---
> Originally sent as "[PATCH v2] tcpreplay: new package"
> (<20240923132020.1626850-1-bst@pengutronix.de>), but v1 was already
> applied on master. So turn this into a separate commit instead.
>
> Since the above version, I've also pinned down src/tcpreplay.c.
> ---
> rules/tcpreplay.make | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/rules/tcpreplay.make b/rules/tcpreplay.make
> index 3f1568ad0..b28bc571a 100644
> --- a/rules/tcpreplay.make
> +++ b/rules/tcpreplay.make
> @@ -21,9 +21,12 @@ TCPREPLAY_SUFFIX := tar.xz
> TCPREPLAY_URL := https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION)/$(TCPREPLAY).$(TCPREPLAY_SUFFIX)
> TCPREPLAY_SOURCE := $(SRCDIR)/$(TCPREPLAY).$(TCPREPLAY_SUFFIX)
> TCPREPLAY_DIR := $(BUILDDIR)/$(TCPREPLAY)
> -TCPREPLAY_LICENSE := GPL-3.0-only
> +TCPREPLAY_LICENSE := GPL-3.0-only AND BSD-4-Clause-UC AND BSD-3-Clause
> TCPREPLAY_LICENSE_FILES := \
> - file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8
> + file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8 \
> + file://src/tcpreplay.c;startline=4;endline=15;md5=9b41c5c891f51dfe9669e794a1d680c7 \
> + file://src/common/err.c;startline=14;endline=43;md5=0fd028531634bf7aba2791035e3c2de4 \
> + file://src/common/fakepoll.c;startline=8;endline=36;md5=903f05912a12e9a01b3018b915a1a7df
>
> # ----------------------------------------------------------------------------
> # Prepare
> --
> 2.39.5
>
>
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [APPLIED] tcpreplay: fix license and pin down more license files
2024-09-24 9:03 [ptxdist] [PATCH] tcpreplay: fix license and pin down more license files Bastian Krause
2024-09-24 9:07 ` Roland Hieber
@ 2024-09-26 13:19 ` Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Michael Olbrich @ 2024-09-26 13:19 UTC (permalink / raw)
To: ptxdist; +Cc: Bastian Krause
Thanks, applied as 5624977948d9900399db9a51305f434972712609.
Michael
[sent from post-receive hook]
On Thu, 26 Sep 2024 15:19:00 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> As tcpreplay is GPL software, include a file mentioning that it's under
> GPL (src/tcpreplay.c)
>
> Additionally, docs/LICENSE states:
>
> Please note that this license covers the files that I have written.
> Some files distributed with the Tcpreplay Suite are copyrighted by
> other authors and have a different license. These files & directories
> are marked as such.
>
> This probably applies to src/common/err.c (BSD-4-Clause-UC) and to
> src/common/fakepoll.c (BSD-3-Clause).
>
> Add those licenses and pin the corresponding files.
>
> Suggested-by: Roland Hieber <rhi@pengutronix.de>
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Reviewed-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20240924090331.2643891-1-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/tcpreplay.make b/rules/tcpreplay.make
> index 3f1568ad0db9..b28bc571aadf 100644
> --- a/rules/tcpreplay.make
> +++ b/rules/tcpreplay.make
> @@ -21,9 +21,12 @@ TCPREPLAY_SUFFIX := tar.xz
> TCPREPLAY_URL := https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION)/$(TCPREPLAY).$(TCPREPLAY_SUFFIX)
> TCPREPLAY_SOURCE := $(SRCDIR)/$(TCPREPLAY).$(TCPREPLAY_SUFFIX)
> TCPREPLAY_DIR := $(BUILDDIR)/$(TCPREPLAY)
> -TCPREPLAY_LICENSE := GPL-3.0-only
> +TCPREPLAY_LICENSE := GPL-3.0-only AND BSD-4-Clause-UC AND BSD-3-Clause
> TCPREPLAY_LICENSE_FILES := \
> - file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8
> + file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8 \
> + file://src/tcpreplay.c;startline=4;endline=15;md5=9b41c5c891f51dfe9669e794a1d680c7 \
> + file://src/common/err.c;startline=14;endline=43;md5=0fd028531634bf7aba2791035e3c2de4 \
> + file://src/common/fakepoll.c;startline=8;endline=36;md5=903f05912a12e9a01b3018b915a1a7df
>
> # ----------------------------------------------------------------------------
> # Prepare
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-26 13:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-24 9:03 [ptxdist] [PATCH] tcpreplay: fix license and pin down more license files Bastian Krause
2024-09-24 9:07 ` Roland Hieber
2024-09-26 13:19 ` [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