From 8bc346da036683eb3efc0820ddb68c8f2613fbe0 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Mon, 24 Feb 2020 20:21:42 -0800 Subject: python3-scons{-native}: upgrade 3.1.1 -> 3.1.2 THis release is a mix of improvements and fixes: https://github.com/SCons/scons/blob/3.1.2/src/RELEASE.txt * Changed to inherit pypi rather than relying on SOURCEFORGE_MIRROR. * Add SRC_URI for LICENSE file (not included in pypi tarball). * Make it more obvious that RDEPENDS are for class-target and drop empty RDEPENDS from -native * python3-scons-native now DEPENDS on python3-setuptools-native * Tested with core-image-base + packagegroup-core-buildessential with "scons" oe-selftest via testimage. * Tested build of "serf" (which uses python3-scons-native via the scons.bbclass). License-Update: Added "MIT License" text, updated copyright years (From OE-Core rev: 44b46ae6c65448901477def57a45d5a4ecc2d246) Signed-off-by: Tim Orling Signed-off-by: Richard Purdie --- .../python/python3-scons-native_3.1.1.bb | 8 ------ .../python/python3-scons-native_3.1.2.bb | 7 +++++ .../recipes-devtools/python/python3-scons_3.1.1.bb | 29 ------------------- .../recipes-devtools/python/python3-scons_3.1.2.bb | 33 ++++++++++++++++++++++ 4 files changed, 40 insertions(+), 37 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-scons-native_3.1.1.bb create mode 100644 meta/recipes-devtools/python/python3-scons-native_3.1.2.bb delete mode 100644 meta/recipes-devtools/python/python3-scons_3.1.1.bb create mode 100644 meta/recipes-devtools/python/python3-scons_3.1.2.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/python/python3-scons-native_3.1.1.bb b/meta/recipes-devtools/python/python3-scons-native_3.1.1.bb deleted file mode 100644 index 5cd5956625..0000000000 --- a/meta/recipes-devtools/python/python3-scons-native_3.1.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require python3-scons_${PV}.bb -inherit native python3native -DEPENDS = "python3-native" -RDEPENDS_${PN} = "" - -do_install_append() { - create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' PYTHONNOUSERSITE='1' -} diff --git a/meta/recipes-devtools/python/python3-scons-native_3.1.2.bb b/meta/recipes-devtools/python/python3-scons-native_3.1.2.bb new file mode 100644 index 0000000000..9e127304d6 --- /dev/null +++ b/meta/recipes-devtools/python/python3-scons-native_3.1.2.bb @@ -0,0 +1,7 @@ +require python3-scons_${PV}.bb +inherit native python3native +DEPENDS = "python3-native python3-setuptools-native" + +do_install_append() { + create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' PYTHONNOUSERSITE='1' +} diff --git a/meta/recipes-devtools/python/python3-scons_3.1.1.bb b/meta/recipes-devtools/python/python3-scons_3.1.1.bb deleted file mode 100644 index 0c7aaeaeee..0000000000 --- a/meta/recipes-devtools/python/python3-scons_3.1.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Software Construction tool (make/autotools replacement)" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=37bb53a08e6beaea0c90e7821d731284" - -SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz" -SRC_URI[md5sum] = "35b2a3993313bbedd221d4d5758fd2fd" -SRC_URI[sha256sum] = "4cea417fdd7499a36f407923d03b4b7000b0f9e8fd7b31b316b9ce7eba9143a5" - -S = "${WORKDIR}/scons-${PV}" - -UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" - -inherit setuptools3 - -do_install_prepend() { - sed -i -e "1s,#!.*python.*,#!${USRBINPATH}/env python3," ${S}/script/* -} - -RDEPENDS_${PN} = "\ - python3-core \ - python3-fcntl \ - python3-io \ - python3-json \ - python3-shell \ - python3-pickle \ - python3-pprint \ - " diff --git a/meta/recipes-devtools/python/python3-scons_3.1.2.bb b/meta/recipes-devtools/python/python3-scons_3.1.2.bb new file mode 100644 index 0000000000..aa7a2a8300 --- /dev/null +++ b/meta/recipes-devtools/python/python3-scons_3.1.2.bb @@ -0,0 +1,33 @@ +SUMMARY = "Software Construction tool (make/autotools replacement)" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=e14e1b33428df24a40a782ae142785d0" + +# pypi package does not have a valid license file +SRC_URI += "https://raw.githubusercontent.com/SCons/scons/${PV}/LICENSE;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\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 \ + " -- cgit v1.2.3-54-g00ecf