From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 09 May 2022 08:29:19 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nnwtT-006qok-Lt for lore@lore.pengutronix.de; Mon, 09 May 2022 08:29:19 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nnwtS-0000qA-Nv; Mon, 09 May 2022 08:29:18 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nnwt0-0000pp-VS; Mon, 09 May 2022 08:28:51 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nnwt1-001F5O-Kn; Mon, 09 May 2022 08:28:50 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nnwsz-00Fk5s-KO; Mon, 09 May 2022 08:28:49 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 9 May 2022 08:28:49 +0200 Message-Id: <20220509062849.3751874-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220426153249.1458376-1-m.tretter@pengutronix.de> References: <20220426153249.1458376-1-m.tretter@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] ptxd_make_world_license: skip ignore in license report X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Michael Tretter Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as e1eac6754383f08b0f8dba65bb8671c78aa635cc. Michael [sent from post-receive hook] On Mon, 09 May 2022 08:28:49 +0200, Michael Tretter 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 > Message-Id: <20220426153249.1458376-1-m.tretter@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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}"