[ptxdist] [PATCH] ptxd_make_world_license: skip ignore in license report

[ptxdist] [PATCH] ptxd_make_world_license: skip ignore in license report

[Michael Tretter]

The yaml contains packages with an ignored license. These packages are
removed from the license-compliance.pdf, but they must be removed from
the license-report.pdf as well.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 scripts/lib/ptxd_make_license_report.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/ptxd_make_license_report.sh b/scripts/lib/ptxd_make_license_report.sh
index 21135d0db9cd..24f833637de0 100644
--- a/scripts/lib/ptxd_make_license_report.sh
+++ b/scripts/lib/ptxd_make_license_report.sh
@@ -185,7 +185,7 @@ ptxd_make_license_report() {
 	ptxd_make_license_report_header
 	for pkg in ${@}; do
 		pkg_lic="${ptxd_package_license_association[${pkg}]}"
-		if [ -z ${pkg_lic} ]; then
+		if [ -z ${pkg_lic} -o "${pkg_lic}" = "ignore" ]; then
 			continue
 		fi
 		pkg_lic="${pkg_lic}/${pkg}"
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] ptxd_make_world_license: skip ignore in license report

[Michael Olbrich]

Thanks, applied as e1eac6754383f08b0f8dba65bb8671c78aa635cc.

Michael

[sent from post-receive hook]

On Mon, 09 May 2022 08:28:49 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> The yaml contains packages with an ignored license. These packages are
> removed from the license-compliance.pdf, but they must be removed from
> the license-report.pdf as well.
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20220426153249.1458376-1-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/scripts/lib/ptxd_make_license_report.sh b/scripts/lib/ptxd_make_license_report.sh
> index 21135d0db9cd..24f833637de0 100644
> --- a/scripts/lib/ptxd_make_license_report.sh
> +++ b/scripts/lib/ptxd_make_license_report.sh
> @@ -185,7 +185,7 @@ ptxd_make_license_report() {
>  	ptxd_make_license_report_header
>  	for pkg in ${@}; do
>  		pkg_lic="${ptxd_package_license_association[${pkg}]}"
> -		if [ -z ${pkg_lic} ]; then
> +		if [ -z ${pkg_lic} -o "${pkg_lic}" = "ignore" ]; then
>  			continue
>  		fi
>  		pkg_lic="${pkg_lic}/${pkg}"