mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Bastian Krause <bst@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: ore@pengutronix.de, Roland Hieber <rhi@pengutronix.de>,
	Bastian Krause <bst@pengutronix.de>
Subject: [ptxdist] [PATCH] tcpreplay: fix license and pin down more license files
Date: Tue, 24 Sep 2024 11:03:31 +0200	[thread overview]
Message-ID: <20240924090331.2643891-1-bst@pengutronix.de> (raw)

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




             reply	other threads:[~2024-09-24  9:03 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-24  9:03 Bastian Krause [this message]
2024-09-24  9:07 ` Roland Hieber
2024-09-26 13:19 ` [ptxdist] [APPLIED] " Michael Olbrich

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=20240924090331.2643891-1-bst@pengutronix.de \
    --to=bst@pengutronix.de \
    --cc=ore@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    --cc=rhi@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