From 9e41c54b4558709f4ff20f03dad77f2cf99477ed Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Thu, 23 Jul 2026 12:08:56 +0300 Subject: [PATCH] Upgrade LICENSE to use AND Replace & with AND in the LICENSE of the affected recipes. Fixes: WARNING: LICENSE is using an old syntax and should be upgraded This work was sponsored by GOVCERT.LU. Signed-off-by: Leon Anavi --- .../recipes-multimedia/libpisp/libpisp_1.3.0.bb | 2 +- recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_7.1.13.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/libpisp_1.3.0.bb b/dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/libpisp_1.3.0.bb index b6275b2..2826b2b 100644 --- a/dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/libpisp_1.3.0.bb +++ b/dynamic-layers/multimedia-layer/recipes-multimedia/libpisp/libpisp_1.3.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A helper library to generate run-time configuration for the Raspberry Pi \ ISP (PiSP), consisting of the Frontend and Backend hardware components." HOMEPAGE = "https://github.com/raspberrypi/libpisp" -LICENSE = "BSD-2-Clause & GPL-2.0-only & GPL-2.0-or-later" +LICENSE = "BSD-2-Clause AND GPL-2.0-only AND GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=3417a46e992fdf62e5759fba9baef7a7 \ file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c" diff --git a/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_7.1.13.bb b/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_7.1.13.bb index 7ec1f2e..9363314 100644 --- a/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_7.1.13.bb +++ b/recipes-multimedia/rpidistro-ffmpeg/rpidistro-ffmpeg_7.1.13.bb @@ -5,7 +5,7 @@ DESCRIPTION = "FFmpeg is the leading multimedia framework, able to decode, encod HOMEPAGE = "https://www.ffmpeg.org/" SECTION = "libs" -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & ISC & MIT & BSD-2-Clause & BSD-3-Clause & IJG" +LICENSE = "GPL-2.0-or-later AND LGPL-2.1-or-later AND ISC AND MIT AND BSD-2-Clause AND BSD-3-Clause AND IJG" LICENSE:${PN} = "GPL-2.0-or-later" LICENSE:libavcodec = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}" LICENSE:libavdevice = "${@bb.utils.contains('PACKAGECONFIG', 'gpl', 'GPL-2.0-or-later', 'LGPL-2.1-or-later', d)}"