From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from re-prd-fep-041.btinternet.com (mailomta6-re.btinternet.com [213.120.69.99]) by sourceware.org (Postfix) with ESMTPS id A79293851C0C for ; Sun, 29 May 2022 14:05:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A79293851C0C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=dronecode.org.uk Authentication-Results: sourceware.org; spf=none smtp.mailfrom=dronecode.org.uk Received: from re-prd-rgout-001.btmx-prd.synchronoss.net ([10.2.54.4]) by re-prd-fep-041.btinternet.com with ESMTP id <20220529140525.IAFM3283.re-prd-fep-041.btinternet.com@re-prd-rgout-001.btmx-prd.synchronoss.net>; Sun, 29 May 2022 15:05:25 +0100 Authentication-Results: btinternet.com; auth=pass (LOGIN) smtp.auth=jonturney@btinternet.com; bimi=skipped X-SNCR-Rigid: 613A8CC325CCE9B2 X-Originating-IP: [86.139.167.41] X-OWM-Source-IP: 86.139.167.41 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-VadeSecure-score: verdict=clean score=49/300, class=clean X-RazorGate-Vade: gggruggvucftvghtrhhoucdtuddrgedvfedrkeeggdejudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemuceutffkvffkuffjvffgnffgvefqofdpqfgfvfenuceurghilhhouhhtmecufedtudenucgoufhushhpvggtthffohhmrghinhculdegledmnecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheplfhonhcuvfhurhhnvgihuceojhhonhdrthhurhhnvgihsegurhhonhgvtghouggvrdhorhhgrdhukheqnecuggftrfgrthhtvghrnhepgffggeejleeitedtleduueffgeegkeevgfdtuedujeeiiedvgffhkeekuefggfeinecuffhomhgrihhnpehsphgugidruggvvhdpshhouhhrtggvfigrrhgvrdhorhhgnecukfhppeekiedrudefledrudeijedrgedunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehhvghloheplhhotggrlhhhohhsthdrlhhotggrlhguohhmrghinhdpihhnvghtpeekiedrudefledrudeijedrgedupdhmrghilhhfrhhomhepjhhonhdrthhurhhnvgihsegurhhonhgvtghouggvrdhorhhgrdhukhdpnhgspghrtghpthhtohepvddprhgtphhtthhopegthihgfihinhdqrghpphhssegthihgfihinhdrtghomhdprhgtphhtthhopehjohhnrdhtuhhrnhgvhiesughrohhnvggtohguvgdrohhrghdruhhk X-RazorGate-Vade-Verdict: clean 49 X-RazorGate-Vade-Classification: clean Received: from localhost.localdomain (86.139.167.41) by re-prd-rgout-001.btmx-prd.synchronoss.net (5.8.716.04) (authenticated as jonturney@btinternet.com) id 613A8CC325CCE9B2; Sun, 29 May 2022 15:05:25 +0100 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH cygport] Add LICENSE variable Date: Sun, 29 May 2022 15:05:05 +0100 Message-Id: <20220529140505.18387-1-jon.turney@dronecode.org.uk> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1199.3 required=5.0 tests=BAYES_00, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: cygwin-apps@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin package maintainer discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 May 2022 14:05:28 -0000 Pass it's value through to the source package hint. --- lib/pkg_info.cygpart | 7 +++++++ lib/pkg_pkg.cygpart | 6 ++++++ testsuite/basic/info/foo.cygport | 1 + testsuite/basic/info/info.out | 1 + 4 files changed, 15 insertions(+) diff --git a/lib/pkg_info.cygpart b/lib/pkg_info.cygpart index 1ad8baa..6ed34ca 100644 --- a/lib/pkg_info.cygpart +++ b/lib/pkg_info.cygpart @@ -43,6 +43,12 @@ __pager() { # what address will be displayed in BROWSER by the homepage command. #**** +#****v* Information/LICENSE +# DESCRIPTION +# A SPDX license expression (See https://spdx.dev/ids/) for the license(s) of +# the package. +#**** + __show_info() { __pager <<-_EOF Cygport package information @@ -50,6 +56,7 @@ __show_info() { Package version: ${PV} Cygwin release: ${PR} Homepage: ${HOMEPAGE} + License: ${LICENSE} Summary: ${SUMMARY:-${DESCRIPTION}} Description: ${DESCRIPTION:-${SUMMARY}} diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart index db998f0..82112e1 100644 --- a/lib/pkg_pkg.cygpart +++ b/lib/pkg_pkg.cygpart @@ -556,6 +556,12 @@ _EOF then cat >> ${distdir}/${PN}/${PN}-${PVR}-src.hint <<-_EOF homepage: ${HOMEPAGE} +_EOF + fi + if [ -n "${LICENSE}" ] + then + cat >> ${distdir}/${PN}/${PN}-${PVR}-src.hint <<-_EOF +license: ${LICENSE} _EOF fi else diff --git a/testsuite/basic/info/foo.cygport b/testsuite/basic/info/foo.cygport index a5d73b7..188b13c 100644 --- a/testsuite/basic/info/foo.cygport +++ b/testsuite/basic/info/foo.cygport @@ -3,4 +3,5 @@ VERSION=2.3.4 RELEASE=1 DESCRIPTION="Cygport messages test package" HOMEPAGE="http://sourceware.org/cygwinports/" +LICENSE="GPL-3.0-or-later" SRC_URI="http://sourceware.org/cygwinports/\${P}.ABC" diff --git a/testsuite/basic/info/info.out b/testsuite/basic/info/info.out index 0cd2a1a..8308681 100644 --- a/testsuite/basic/info/info.out +++ b/testsuite/basic/info/info.out @@ -3,6 +3,7 @@ Cygport package information Package version: 2.3.4 Cygwin release: 1 Homepage: http://sourceware.org/cygwinports/ + License: GPL-3.0-or-later Summary: Cygport messages test package Description: Cygport messages test package -- 2.36.1