From patchwork Sun Feb 19 21:38:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Elberger X-Patchwork-Id: 19784 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D666C636CC for ; Sun, 19 Feb 2023 21:38:21 +0000 (UTC) Received: from a11-77.smtp-out.amazonses.com (a11-77.smtp-out.amazonses.com [54.240.11.77]) by mx.groups.io with SMTP id smtpd.web10.6573.1676842699210446666 for ; Sun, 19 Feb 2023 13:38:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@richelberger.com header.s=5u2mht5g5nbgnd5xxu4iibla5zobc5bd header.b=T7BoUxxK; spf=pass (domain: amazonses.com, ip: 54.240.11.77, mailfrom: 010001866b9d0634-676dbda8-5f68-4a16-b3f2-5b80d490524a-000000@amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=5u2mht5g5nbgnd5xxu4iibla5zobc5bd; d=richelberger.com; t=1676842698; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=pxbQVVJc1JX5u+tr5bUbQlOHv5wdfA1NYvYMacY+OV0=; b=T7BoUxxKScZ4/a9M3R2IS09D5WBDsJlFcRvINk1nUBZskOf3Df8V73TSgNgUUMGP W1r2zv3RT2wgHRruoQO4cZg4VpvznesWDz6K6TRCCO+Ug84vPvEU4Ivuw7EFv84AB/v FnYl+cmA5wVO6Vc+FCbS+BG5WDGTP4LG1BFjgHcc= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw; d=amazonses.com; t=1676842698; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=pxbQVVJc1JX5u+tr5bUbQlOHv5wdfA1NYvYMacY+OV0=; b=gm63f3M6cMETI5WEGQ8+bmNf5Lr4G9LhgyUjz7+0P+JurEOJUGXRc8LuKiwlRhZu 94fRp6QKuTXlLUBhjXk4CSGOSBVtA2Exg3r+zX3VtQQdgXLKQ7UOfWSo4oJ3JZ1nu9u CyiyydvIhCFUvWYPgxZa/MSugyeWvOQfa3CiKCLA= Subject: [PATCH 2/2] [YOCTO #13270] docbook-xml-dtd: refactor for style, add version check regex From: =?utf-8?q?Richard_Elberger?= To: =?utf-8?q?openembedded-core=40lists=2Eopenembedded=2Eorg?= Cc: =?utf-8?q?Richard_Elberger?= Date: Sun, 19 Feb 2023 21:38:18 +0000 Mime-Version: 1.0 In-Reply-To: <20230219213807.3415938-1-rich@richelberger.com> References: <20230219213807.3415938-1-rich@richelberger.com> <20230219213807.3415938-2-rich@richelberger.com> X-Mailer: Amazon WorkMail Thread-Index: AQHZRKp3Rd+89yRvQFycCVf28l/dgwAAALvo Thread-Topic: [PATCH 2/2] [YOCTO #13270] docbook-xml-dtd: refactor for style, add version check regex X-Original-Mailer: git-send-email 2.34.1 X-Wm-Sent-Timestamp: 1676842697 Message-ID: <010001866b9d0634-676dbda8-5f68-4a16-b3f2-5b80d490524a-000000@email.amazonses.com> Feedback-ID: 1.us-east-1.LF00NED762KFuBsfzrtoqw+Brn/qlF9OYdxWukAhsl8=:AmazonSES X-SES-Outgoing: 2023.02.19-54.240.11.77 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 19 Feb 2023 21:38:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177392 Try to keep everything else the same. Added package version filtering for devtool upgrade check. 4.0 no longer available on docbook.org so removed. Signed-off-by: Richard Elberger --- .../docbook-xml/docbook-xml-dtd4_4.5.bb | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) -- 2.34.1 diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb index 71aa8c14ec..f8a5631d77 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb @@ -3,8 +3,12 @@ DESCRIPTION = "Document type definitions for verification of XML data \ files against the DocBook rule set." HOMEPAGE = "https://docbook.org" -inherit allarch -BBCLASSEXTEND = "native" +# The upstream sources are not distributed with a license file. +# LICENSE-OASIS is included as a "patch" to workaround this. When +# upgrading this recipe, please verify whether this is still needed. + +LICENSE = "OASIS" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" # To support apps with xml schema backward compatibility, we must # install a set of schemas. Install the latest based on PV and then @@ -18,37 +22,32 @@ BBCLASSEXTEND = "native" # to use the Gradle build system to do so. It might be safer to use # the source tree which would also enable proper SBOM generation # through the bitbake build system. https://github.com/docbook/docbook -# +# -S = "${WORKDIR}" +SRC_URI = "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2 \ + https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2 \ + https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3 \ + https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4 \ + https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV} \ + file://LICENSE-OASIS" -SRC_URI += "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-xml-4.1.2" SRC_URI[payload412.md5sum] = "900d7609fb7e6d78901b357e4acfbc17" SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" - -SRC_URI += "https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-xml-4.2" SRC_URI[payload42.md5sum] = "73fe50dfe74ca631c1602f558ed8961f" SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" - -SRC_URI += "https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-xml-4.3" SRC_URI[payload43.md5sum] = "ab200202b9e136a144db1e0864c45074" SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" - -SRC_URI += "https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-xml-4.4" SRC_URI[payload44.md5sum] = "cbb04e9a700955d88c50962ef22c1634" SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" - -SRC_URI += "https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-xml-${PV}" SRC_URI[payloadPV.md5sum] = "03083e288e87a7e829e437358da7ef9e" SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" -# The upstream sources are not distributed with a license file. -# LICENSE-OASIS is included as a "patch" to workaround this. When -# upgrading this recipe, please verify whether this is still needed. -LICENSE = "OASIS" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" -SRC_URI += "file://LICENSE-OASIS" +UPSTREAM_CHECK_REGEX = "docbook-xml-(?P4(\.\d+)).zip" + +S = "${WORKDIR}" +inherit allarch +BBCLASSEXTEND = "native" do_configure (){ :