diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2022-03-18 18:23:01 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2022-03-18 18:25:24 +0100 |
| commit | e5f39ea2a7e1c415a4cbb67c1cd78fe3d31f922d (patch) | |
| tree | 6d804b08acf2577e59fd04a4757280f7e090ec23 | |
| parent | d79d6fc45a26494ee6c1d0c6b7b890429a90b1e0 (diff) | |
| download | ptxdist-e5f39ea2a7e1c415a4cbb67c1cd78fe3d31f922d.tar.gz ptxdist-e5f39ea2a7e1c415a4cbb67c1cd78fe3d31f922d.tar.xz | |
ptxd_make_world_license: generate yaml for ignored packages
Those packages are skipped in the license report pdf, but the yaml data
will be needed elsewhere.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | scripts/lib/ptxd_make_license_report.sh | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_world_license.sh | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/scripts/lib/ptxd_make_license_report.sh b/scripts/lib/ptxd_make_license_report.sh index 30b6e3e36..21135d0db 100644 --- a/scripts/lib/ptxd_make_license_report.sh +++ b/scripts/lib/ptxd_make_license_report.sh @@ -279,7 +279,7 @@ ptxd_make_license_compliance_pdf() { ptxd_make_license_compliance_header for pkg in ${@}; do pkg_lic="${ptxd_package_license_association[${pkg}]}" - if [ -z "${pkg_lic}" -o "${pkg_lic}" = "proprietary" ]; then + if [ -z "${pkg_lic}" -o "${pkg_lic}" = "proprietary" -o "${pkg_lic}" = "ignore" ]; then continue fi pkg_lic="${pkg_lic}/${pkg}" diff --git a/scripts/lib/ptxd_make_world_license.sh b/scripts/lib/ptxd_make_world_license.sh index 5b7e1e435..b652df27b 100644 --- a/scripts/lib/ptxd_make_world_license.sh +++ b/scripts/lib/ptxd_make_world_license.sh @@ -491,11 +491,6 @@ ptxd_make_world_license() { rm -rf "${pkg_license_dir}" || return - if [ "${pkg_section}" == "ignore" ]; then - echo "Package to be ignored: metapackage for example" - return 0 - fi - mkdir -p ${pkg_license_dir} && echo ${pkg_section}/${pkg_label} >> "${ptx_report_dir}/package.list" && @@ -535,9 +530,11 @@ changed: ${md5} -> $(md5sum "${lic}" | sed 's/ .*//') done && echo && - ptxd_make_world_license_write | \ - sed -e 's/%/\\%/g' > "${pkg_license_dir}/license-report.tex" && - check_pipe_status && + if [ "${pkg_section}" != "ignore" ]; then + ptxd_make_world_license_write | \ + sed -e 's/%/\\%/g' > "${pkg_license_dir}/license-report.tex" && + check_pipe_status + fi && ptxd_make_world_license_yaml > "${pkg_license_dir}/license-report.yaml" && |