diff mbox series

[dunfell,42/42] openssh: remove redundant BSD license

Message ID	45ac839a6982d2ea4cb154ada02969420b9fc043.1638136329.git.steve@sakoman.com
State	Accepted, archived
Commit	f61fcb6e176f19f1e768ce63a693f238713c8887
Headers	show Return-Path: <steve@sakoman.com> ip: 209.85.214.170, mailfrom: steve@sakoman.com) From: Steve Sakoman <steve@sakoman.com> To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 42/42] openssh: remove redundant BSD license Date: Sun, 28 Nov 2021 11:57:54 -1000 Message-Id: <45ac839a6982d2ea4cb154ada02969420b9fc043.1638136329.git.steve@sakoman.com> In-Reply-To: <cover.1638136329.git.steve@sakoman.com> References: <cover.1638136329.git.steve@sakoman.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[dunfell,01/42] linux-yocto/5.4: update to v5.4.154 \| expand [dunfell,01/42] linux-yocto/5.4: update to v5.4.154 [dunfell,02/42] linux-yocto/5.4: update to v5.4.155 [dunfell,03/42] linux-yocto/5.4: update to v5.4.156 [dunfell,04/42] linux-yocto/5.4: update to v5.4.158 [dunfell,05/42] linux-firmware: upgrade 20210919 -> 20211027 [dunfell,06/42] python3: upgrade 3.8.11 -> 3.8.12 [dunfell,07/42] Revert "vim: fix 2021-3796" [dunfell,08/42] vim: fix CVE-2021-3796, CVE-2021-3872, and CVE-2021-3875 [dunfell,09/42] vim: add patch number to CVE-2021-3778 patch [dunfell,10/42] vim: fix CVE-2021-3927 and CVE-2021-3928 [dunfell,11/42] gmp: fix CVE-2021-43618 [dunfell,12/42] git: fix CVE-2021-40330 [dunfell,13/42] scripts/oe-package-browser: Handle no packages being built [dunfell,14/42] scripts/lib/wic/help.py: Update Fedora Kickstart URLs [dunfell,15/42] glibc-version.inc: remove branch= from GLIBC_GIT_URI [dunfell,16/42] libpcre/libpcre2: correct SRC_URI [dunfell,17/42] cups: Fix missing installation of cups sysv init scripts [dunfell,18/42] os-release: Add DISTRO_CODENAME as vardeps for do_compile [dunfell,19/42] curl: submit patch upstream [dunfell,20/42] libxml2: submit patch upstream [dunfell,21/42] cracklib: patches submitted upstream [dunfell,22/42] docbook-xml: patch is not upstreamable [dunfell,23/42] lrzsz: Use Cross AR during compile [dunfell,24/42] lrzsz: patch is not upstreamable [dunfell,25/42] valgrind: mark ptest-specific patch as inappropriate [dunfell,26/42] systemd-bootchart: submit musl patches upstream [dunfell,27/42] libxml2: mark patch as non-upstreamable [dunfell,28/42] libgpg-error: mark patch as non-upstreamable [dunfell,29/42] valgrind: submit patch upstream [dunfell,30/42] webkitgtk: submit patches upstream [dunfell,31/42] weston: submit patch upstream [dunfell,32/42] db: mark all patches as non-upstreamable [dunfell,33/42] unzip/zip: mark all patches as non-upstreamable [dunfell,34/42] slang: mark patch as inappropriate for upstream submission [dunfell,35/42] libdnf: Backport bugfix for upgrade calc [dunfell,36/42] dnf: Backport bugfix for upgrade [dunfell,37/42] oeqa: fix warnings for append operators combined with += [dunfell,38/42] reproducible_build/package_XXX: Ensure SDE task is in dependency chain [dunfell,39/42] make-mod-scripts: pass CROSS_COMPILE to configure and build [dunfell,40/42] systemd: add packageconfig for wheel-group [dunfell,41/42] openssh: Improve LICENSE to show BSD license variants. [dunfell,42/42] openssh: remove redundant BSD license

Commit Message

Steve Sakoman Nov. 28, 2021, 9:57 p.m. UTC

From: Ross Burton <ross@burtonini.com>

The license statement already includes BSD-2-Clause and BSD-3-Clause, so
remove the redundant and ambiguous BSD license.

(From OE-Core rev: 5c0b03cda19bcebfc71e1e601a4336fcda4bfc2b)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de>
(cherry picked from commit 7eaab4b261017ae49926b4f18228a3af9906c19c)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-connectivity/openssh/openssh_8.2p1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/meta/recipes-connectivity/openssh/openssh_8.2p1.bb b/meta/recipes-connectivity/openssh/openssh_8.2p1.bb
index 78f1669240..b60d1a6bd4 100644
--- a/meta/recipes-connectivity/openssh/openssh_8.2p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_8.2p1.bb
@@ -5,7 +5,7 @@  Ssh (Secure Shell) is a program for logging into a remote machine \
 and for executing commands on a remote machine."
 HOMEPAGE = "http://www.openssh.com/"
 SECTION = "console/network"
-LICENSE = "BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & BSD & ISC & MIT"
+LICENSE = "BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & ISC & MIT"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=18d9e5a8b3dd1790d73502f50426d4d3"
 
 DEPENDS = "zlib openssl virtual/crypt"