From 73f05a2c83a80b64a9e86c49a11c069cb3547267 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Sun, 6 Jun 2021 15:20:13 -0700 Subject: python3-scons: upgrade 3.1.2 -> 4.1.0; simplify * Drop UPSTREAM_CHECK_URI and UPSTREAM_CHECK_REGEX, the default pypi.bbclass values work now. * Drop scipts/ patch, no longer applies. * Add patch to fix man page installation. License-Update: Update compyright years Changelog for 4.1.0: https://pyup.io/changelogs/scons/#4.1.0 Changelog for 4.0.1: https://pyup.io/changelogs/scons/#4.0.1 Changelog for 4.0.0: https://pyup.io/changelogs/scons/#4.0.0 (From OE-Core rev: 6fd0e96fca004ea7ec3441326ef0a601f36703c6) Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- .../0001-Fix-man-page-installation.patch | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 meta/recipes-devtools/python/python3-scons/0001-Fix-man-page-installation.patch (limited to 'meta/recipes-devtools/python/python3-scons') diff --git a/meta/recipes-devtools/python/python3-scons/0001-Fix-man-page-installation.patch b/meta/recipes-devtools/python/python3-scons/0001-Fix-man-page-installation.patch new file mode 100644 index 0000000000..ff212b85ee --- /dev/null +++ b/meta/recipes-devtools/python/python3-scons/0001-Fix-man-page-installation.patch @@ -0,0 +1,46 @@ +From 82be2b7b9758a2f62ee11931da674cd541076041 Mon Sep 17 00:00:00 2001 +From: Tim Orling +Date: Sat, 22 May 2021 11:20:46 -0700 +Subject: [PATCH] Fix man page installation + +Fixes: + error: can't copy 'build/doc/man/scons.1': doesn't exist or not a regular file + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Tim Orling +--- + MANIFEST.in | 2 +- + setup.cfg | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/MANIFEST.in b/MANIFEST.in +index 04ec000..937f6f3 100644 +--- a/MANIFEST.in ++++ b/MANIFEST.in +@@ -4,7 +4,7 @@ recursive-include SCons/Tool/docbook * + include LICENSE + + include scons.1 sconsign.1 scons-time.1 +-recursive-include build/doc/man *.1 ++#recursive-include build/doc/man *.1 + + + +diff --git a/setup.cfg b/setup.cfg +index 37e5204..677c00a 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -56,9 +56,9 @@ console_scripts = + scons.tool.docbook = *.* + + [options.data_files] +-. = build/doc/man/scons.1 +- build/doc/man/scons-time.1 +- build/doc/man/sconsign.1 ++. = scons.1 ++ scons-time.1 ++ sconsign.1 + + [sdist] + dist-dir = build/dist -- cgit v1.2.3-54-g00ecf