All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tim Orling <timothy.t.orling@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH v2 19/19] python-scons: upgrade to 3.0.1; use pypi.bbclass
Date: Fri,  8 Dec 2017 14:45:31 -0800	[thread overview]
Message-ID: <4325780c940c9fa780da31513d5ce8d62e1d4db1.1512765771.git.timothy.t.orling@linux.intel.com> (raw)
In-Reply-To: <cover.1512765771.git.timothy.t.orling@linux.intel.com>

* Simplify recipe by using pypi.bbclass
* Drop patch for __future__ print_function
  - fixed upstream:
https://github.com/SConsProject/scons/pull/1/commits/4c199d06e76afb9379e76942d0f68caa57f42509

Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
---
 ...ative_3.0.0.bb => python-scons-native_3.0.1.bb} |  0
 ...onscript-Support-python2-print-statements.patch | 38 ----------------------
 meta/recipes-devtools/python/python-scons_3.0.0.bb | 27 ---------------
 meta/recipes-devtools/python/python-scons_3.0.1.bb | 18 ++++++++++
 4 files changed, 18 insertions(+), 65 deletions(-)
 rename meta/recipes-devtools/python/{python-scons-native_3.0.0.bb => python-scons-native_3.0.1.bb} (100%)
 delete mode 100644 meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch
 delete mode 100644 meta/recipes-devtools/python/python-scons_3.0.0.bb
 create mode 100644 meta/recipes-devtools/python/python-scons_3.0.1.bb

diff --git a/meta/recipes-devtools/python/python-scons-native_3.0.0.bb b/meta/recipes-devtools/python/python-scons-native_3.0.1.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-scons-native_3.0.0.bb
rename to meta/recipes-devtools/python/python-scons-native_3.0.1.bb
diff --git a/meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch b/meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch
deleted file mode 100644
index b1a790219ed..00000000000
--- a/meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 885aabdb313685405737112dcb7d7774eee6d879 Mon Sep 17 00:00:00 2001
-From: Thomas Berg <merlin66b@gmail.com>
-Date: Thu, 19 Oct 2017 14:02:21 -0500
-Subject: [PATCH] SConscript: Support python2 print statements
-
-This fixes a regression introduced in scons-3.0.0, where
-SConscripts containing python 2 print statements would cause
-syntax errors even when executing scons with python 2.7.
-
-This ensures backward compatibility, allowing users to build
-legacy code with scons-3.0.0 without having to patch it.
-
-Taken from
-https://github.com/SConsProject/scons/commit/2e0de3c55f22b3eaa7767b69740b898f3d2f46bf
-
-Upstream-Status: Accepted
-
-Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
----
- engine/SCons/Script/SConscript.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/engine/SCons/Script/SConscript.py b/engine/SCons/Script/SConscript.py
-index bc05540..332d1fa 100644
---- a/engine/SCons/Script/SConscript.py
-+++ b/engine/SCons/Script/SConscript.py
-@@ -5,8 +5,6 @@ files.
- 
- """
- 
--from __future__ import print_function
--
- #
- # Copyright (c) 2001 - 2017 The SCons Foundation
- #
--- 
-2.7.4
-
diff --git a/meta/recipes-devtools/python/python-scons_3.0.0.bb b/meta/recipes-devtools/python/python-scons_3.0.0.bb
deleted file mode 100644
index e780c542e4a..00000000000
--- a/meta/recipes-devtools/python/python-scons_3.0.0.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "Software Construction tool (make/autotools replacement)"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=46ddf66004e5be5566367cb525a66fc6"
-SRCNAME = "scons"
-
-SRC_URI = "https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \
-           file://SConscript-Support-python2-print-statements.patch"
-
-SRC_URI[md5sum] = "7ca558edaaa1942fe38f3105ca2400fb"
-SRC_URI[sha256sum] = "aa5afb33c2bbd33c311e47e912412195739e9ffb2e933534a31f85fba8f3470e"
-
-UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html"
-UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-RDEPENDS_${PN} = "\
-  python-fcntl \
-  python-io \
-  python-json \
-  python-subprocess \
-  python-shell \
-  python-pprint \
-  "
diff --git a/meta/recipes-devtools/python/python-scons_3.0.1.bb b/meta/recipes-devtools/python/python-scons_3.0.1.bb
new file mode 100644
index 00000000000..4add9eb3ad7
--- /dev/null
+++ b/meta/recipes-devtools/python/python-scons_3.0.1.bb
@@ -0,0 +1,18 @@
+SUMMARY = "Software Construction tool (make/autotools replacement)"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=46ddf66004e5be5566367cb525a66fc6"
+
+SRC_URI[md5sum] = "b6a292e251b34b82c203b56cfa3968b3"
+SRC_URI[sha256sum] = "24475e38d39c19683bc88054524df018fe6949d70fbd4c69e298d39a0269f173"
+
+inherit pypi setuptools
+
+RDEPENDS_${PN} = "\
+  python-fcntl \
+  python-io \
+  python-json \
+  python-subprocess \
+  python-shell \
+  python-pprint \
+  "
-- 
2.13.6



  parent reply	other threads:[~2017-12-08 22:46 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-08 22:45 [PATCH v2 00/19] python improvements Tim Orling
2017-12-08 22:45 ` [PATCH v2 01/19] python: Restructure python packaging and replace it with autopackaging Tim Orling
2017-12-08 22:45 ` [PATCH v2 02/19] python3: Restructure python3 " Tim Orling
2017-12-08 22:45 ` [PATCH v2 03/19] python3: fix RDEPENDS on several recipes, due to non-existent python3 packages Tim Orling
2017-12-08 22:45 ` [PATCH v2 04/19] hwlatdetect: fix RDEPENDS to avoid QA failures Tim Orling
2017-12-08 22:45 ` [PATCH v2 05/19] python-scons: Remove python-importlib dependency Tim Orling
2017-12-08 22:45 ` [PATCH v2 06/19] pypi.bbclass: bring in from meta-python Tim Orling
2017-12-08 22:45 ` [PATCH v2 07/19] python2 create_manifest.py: fix trailing whitespace in json Tim Orling
2017-12-08 22:45 ` [PATCH v2 08/19] python*-manifest.json: add dependencies, runpy Tim Orling
2017-12-08 22:45 ` [PATCH v2 09/19] python*-setuptools: upgrade to 38.2.3; use pypi.bbclass; improvements Tim Orling
2017-12-08 22:45 ` [PATCH v2 10/19] python3-pip: use pypi.bbclass Tim Orling
2017-12-08 22:45 ` [PATCH v2 11/19] python-nose: " Tim Orling
2017-12-08 22:45 ` [PATCH v2 12/19] python-six: " Tim Orling
2017-12-08 22:45 ` [PATCH v2 13/19] python-async: " Tim Orling
2017-12-08 22:45 ` [PATCH v2 14/19] python-mako: " Tim Orling
2017-12-08 22:45 ` [PATCH v2 15/19] python-smmap: " Tim Orling
2017-12-08 22:45 ` [PATCH v2 16/19] python-gitdb: " Tim Orling
2017-12-08 22:45 ` [PATCH v2 17/19] python-git: " Tim Orling
2017-12-08 22:45 ` [PATCH v2 18/19] python3-iniparse: " Tim Orling
2017-12-08 22:45 ` Tim Orling [this message]
2017-12-08 23:02 ` ✗ patchtest: failure for python improvements Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4325780c940c9fa780da31513d5ce8d62e1d4db1.1512765771.git.timothy.t.orling@linux.intel.com \
    --to=timothy.t.orling@linux.intel.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.