mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 09:32:13 +02:00
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 <timothy.t.orling@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
4882e7b989
commit
73f05a2c83
@@ -0,0 +1,46 @@
|
||||
From 82be2b7b9758a2f62ee11931da674cd541076041 Mon Sep 17 00:00:00 2001
|
||||
From: Tim Orling <ticotimo@gmail.com>
|
||||
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 <ticotimo@gmail.com>
|
||||
---
|
||||
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
|
||||
@@ -1,34 +0,0 @@
|
||||
SUMMARY = "Software Construction tool (make/autotools replacement)"
|
||||
HOMEPAGE = "https://github.com/SCons/scons"
|
||||
SECTION = "devel/python"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-python3-scons-${PV};md5=e14e1b33428df24a40a782ae142785d0"
|
||||
|
||||
# pypi package does not have a valid license file
|
||||
SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;downloadfilename=LICENSE-python3-scons-${PV};name=license"
|
||||
|
||||
SRC_URI[md5sum] = "f9c4ad06dcf1427be95472eaf380c81a"
|
||||
SRC_URI[sha256sum] = "8aaa483c303efeb678e6f7c776c8444a482f8ddc3ad891f8b6cdd35264da9a1f"
|
||||
SRC_URI[license.md5sum] = "e14e1b33428df24a40a782ae142785d0"
|
||||
SRC_URI[license.sha256sum] = "72ed889165fb28378cadac14552be4a959f1ebab6b148abb5dd2b49712c3c6f6"
|
||||
|
||||
S = "${WORKDIR}/scons-${PV}"
|
||||
|
||||
UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html"
|
||||
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
|
||||
|
||||
inherit pypi setuptools3
|
||||
|
||||
do_install_prepend() {
|
||||
sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/script/*
|
||||
}
|
||||
|
||||
RDEPENDS_${PN}_class-target = "\
|
||||
python3-core \
|
||||
python3-fcntl \
|
||||
python3-io \
|
||||
python3-json \
|
||||
python3-shell \
|
||||
python3-pickle \
|
||||
python3-pprint \
|
||||
"
|
||||
27
meta/recipes-devtools/python/python3-scons_4.1.0.bb
Normal file
27
meta/recipes-devtools/python/python3-scons_4.1.0.bb
Normal file
@@ -0,0 +1,27 @@
|
||||
SUMMARY = "Software Construction tool (make/autotools replacement)"
|
||||
HOMEPAGE = "https://github.com/SCons/scons"
|
||||
SECTION = "devel/python"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=b94c6e2be9670c62b38f7118c12866d2"
|
||||
|
||||
SRC_URI += " file://0001-Fix-man-page-installation.patch"
|
||||
SRC_URI[sha256sum] = "accb8035be2c9cfbab06471286eaeff86a10037a8064cf4ef4c3df04ea5a7387"
|
||||
|
||||
PYPI_PACKAGE = "SCons"
|
||||
|
||||
inherit pypi setuptools3
|
||||
|
||||
RDEPENDS_${PN}_class-target = "\
|
||||
python3-core \
|
||||
python3-compression \
|
||||
python3-fcntl \
|
||||
python3-importlib-metadata \
|
||||
python3-io \
|
||||
python3-json \
|
||||
python3-shell \
|
||||
python3-pickle \
|
||||
python3-pkg-resources \
|
||||
python3-pprint \
|
||||
"
|
||||
|
||||
FILES_${PN}-doc += "${datadir}/scons*.1"
|
||||
Reference in New Issue
Block a user