[OE-core] [PATCH 02/20] oeqa.selftest._sstatetests_noauto: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/_sstatetests_noauto.py| 9 +++--
meta/lib/oeqa/selftest/conf/_sstatetests_noauto.conf | 3 +++
2 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/_sstatetests_noauto.conf
diff --git a/meta/lib/oeqa/selftest/_sstatetests_noauto.py
b/meta/lib/oeqa/selftest/_sstatetests_noauto.py
index fc9ae7e..f35811e 100644
--- a/meta/lib/oeqa/selftest/_sstatetests_noauto.py
+++ b/meta/lib/oeqa/selftest/_sstatetests_noauto.py
@@ -8,6 +8,7 @@ import oeqa.utils.ftools as ftools
from oeqa.selftest.base import oeSelfTest
from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_test_layer
from oeqa.selftest.sstate import SStateBase
+from oeqa.utils.readconfig import conffile
class RebuildFromSState(SStateBase):
@@ -15,6 +16,8 @@ class RebuildFromSState(SStateBase):
@classmethod
def setUpClass(self):
self.builddir = os.path.join(os.environ.get('BUILDDIR'))
+# Get test configurations from configuration file
+self.config = conffile(__file__)
def get_dep_targets(self, primary_targets):
found_targets = []
@@ -89,7 +92,9 @@ class RebuildFromSState(SStateBase):
self.assertFalse(failed_cleansstate, msg="The following recipes have
failed cleansstate(all others have passed both cleansstate and rebuild from
sstate tests): %s" % ' '.join(map(str, failed_cleansstate)))
def test_sstate_relocation(self):
-self.run_test_sstate_rebuild(['core-image-sato-sdk'], relocate=True,
rebuild_dependencies=True)
+image = self.config.get('RebuildFromSState', 'sstate_relocation_image')
+self.run_test_sstate_rebuild([image], relocate=True,
rebuild_dependencies=True)
def test_sstate_rebuild(self):
-self.run_test_sstate_rebuild(['core-image-sato-sdk'], relocate=False,
rebuild_dependencies=True)
+image = self.config.get('RebuildFromSState', 'sstate_rebuild_image')
+self.run_test_sstate_rebuild([image], relocate=False,
rebuild_dependencies=True)
diff --git a/meta/lib/oeqa/selftest/conf/_sstatetests_noauto.conf
b/meta/lib/oeqa/selftest/conf/_sstatetests_noauto.conf
new file mode 100644
index 000..41854a0
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/_sstatetests_noauto.conf
@@ -0,0 +1,3 @@
+[RebuildFromSState]
+sstate_relocation_image = core-image-sato-sdk
+sstate_rebuild_image = core-image-sato-sdk
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/20] oeqa: Split configuration from the code
Improve oeqa-selftest capabilities and UX by placing test configuration features and variables into a separate configuration file. Configuration file reading is done through a new library in oeqa.utils and specific configuration files for each test are stored in a separate directory. [Yocto 9389] The following changes since commit dfc016fbf13e62f7767edaf7abadf1d1b72680b2: maintainers.inc: remove augeas (2016-08-04 20:56:11 +0100) are available in the git repository at: ssh://git.yoctoproject.org/poky-contrib lamego/9389 http://git.yoctoproject.org/cgit.cgi//log/?h=lamego/9389 Jose Lamego (20): oeqa.selftest.archiver: Split configuration from code oeqa.selftest._sstatetests_noauto: Split configuration from code oeqa.selftest.bblayers: Split configuration from code oeqa.selftest.bbtests: Split configuration from code oeqa.selftest.buildhistory: Split configuration from code oeqa.selftest.buildoptions: Split configuration from code oeqa.selftest.devtool: Split configuration from code oeqa.selftest.imagefeatures: Split configuration from code oeqa.selftest.layerappend: Split configuration from code oeqa.selftest.lic-checksum: Split configuration from code oeqa.selftest.manifest: Split configuration from code oeqa.selftest.oescripts: Split configuration from code oeqa.selftest.pkgdata: Split configuration from code oeqa.selftest.prservice: Split configuration from code oeqa.selftest.recipetool: Split configuration from code oeqa.selftest.runtime-test: Split configuration from code oeqa.selftest.signing: Split configuration from code oeqa.selftest.sstatetests: Split configuration from code oeqa.selftest.wic: Split configuration from code oeqa.utils.readconfig: Read self-test configuration file meta/lib/oeqa/selftest/_sstatetests_noauto.py | 9 +- meta/lib/oeqa/selftest/archiver.py | 24 +- meta/lib/oeqa/selftest/bblayers.py | 125 -- meta/lib/oeqa/selftest/bbtests.py | 175 ++--- meta/lib/oeqa/selftest/buildhistory.py | 10 +- meta/lib/oeqa/selftest/buildoptions.py | 231 .../oeqa/selftest/conf/_sstatetests_noauto.conf| 3 + meta/lib/oeqa/selftest/conf/archiver.conf | 8 + meta/lib/oeqa/selftest/conf/bblayers.conf | 21 ++ meta/lib/oeqa/selftest/conf/bbtests.conf | 28 ++ meta/lib/oeqa/selftest/conf/buildhistory.conf | 3 + meta/lib/oeqa/selftest/conf/buildoptions.conf | 42 +++ meta/lib/oeqa/selftest/conf/devtool.conf | 100 + meta/lib/oeqa/selftest/conf/imagefeatures.conf | 19 + meta/lib/oeqa/selftest/conf/layerappend.conf | 40 ++ meta/lib/oeqa/selftest/conf/lic-checksum.conf | 4 + meta/lib/oeqa/selftest/conf/manifest.conf | 8 + meta/lib/oeqa/selftest/conf/oescripts.conf | 6 + meta/lib/oeqa/selftest/conf/pkgdata.conf | 39 ++ meta/lib/oeqa/selftest/conf/prservice.conf | 21 ++ meta/lib/oeqa/selftest/conf/recipetool.conf| 84 + meta/lib/oeqa/selftest/conf/runtime-test.conf | 13 + meta/lib/oeqa/selftest/conf/signing.conf | 15 + meta/lib/oeqa/selftest/conf/sstatetests.conf | 25 ++ meta/lib/oeqa/selftest/conf/wic.conf | 10 + meta/lib/oeqa/selftest/devtool.py | 417 ++--- meta/lib/oeqa/selftest/imagefeatures.py| 55 ++- meta/lib/oeqa/selftest/layerappend.py | 88 ++--- meta/lib/oeqa/selftest/lic-checksum.py | 22 +- meta/lib/oeqa/selftest/manifest.py | 22 +- meta/lib/oeqa/selftest/oescripts.py| 31 +- meta/lib/oeqa/selftest/pkgdata.py | 373 -- meta/lib/oeqa/selftest/prservice.py| 71 +++- meta/lib/oeqa/selftest/recipetool.py | 326 meta/lib/oeqa/selftest/runtime-test.py | 80 ++-- meta/lib/oeqa/selftest/signing.py | 119 +++--- meta/lib/oeqa/selftest/sstatetests.py | 162 +--- meta/lib/oeqa/selftest/wic.py | 150 +--- meta/lib/oeqa/utils/readconfig.py | 18 + 39 files changed, 2213 insertions(+), 784 deletions(-) create mode 100644 meta/lib/oeqa/selftest/conf/_sstatetests_noauto.conf create mode 100644 meta/lib/oeqa/selftest/conf/archiver.conf create mode 100644 meta/lib/oeqa/selftest/conf/bblayers.conf create mode 100644 meta/lib/oeqa/selftest/conf/bbtests.conf create mode 100644 meta/lib/oeqa/selftest/conf/buildhistory.conf create mode 100644 meta/lib/oeqa/selftest/conf/buildoptions.conf create mode 100644 meta/lib/oeqa/selftest/conf/devtool.conf create mode 100644 meta/lib/oeqa/selftest/conf/imagefeatures.conf create mode 100644 meta/lib/oeqa/selftest/conf/layerappend.conf create mode 100644 meta/lib/oeqa/selftest/conf/lic-checksum.conf create mode 100644 meta/lib/oeqa/selftest/conf
[OE-core] [PATCH 01/20] oeqa.selftest.archiver: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/archiver.py| 24 +++-
meta/lib/oeqa/selftest/conf/archiver.conf | 8
2 files changed, 23 insertions(+), 9 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/archiver.conf
diff --git a/meta/lib/oeqa/selftest/archiver.py
b/meta/lib/oeqa/selftest/archiver.py
index f2030c4..a2e2de9 100644
--- a/meta/lib/oeqa/selftest/archiver.py
+++ b/meta/lib/oeqa/selftest/archiver.py
@@ -4,10 +4,16 @@ from oeqa.utils.decorators import testcase
import glob
import os
import shutil
+from oeqa.utils.readconfig import conffile
class Archiver(oeSelfTest):
+@classmethod
+def setUpClass(cls):
+# Get test configurations from configuration file
+cls.config = conffile(__file__)
+
@testcase(1345)
def test_archiver_allows_to_filter_on_recipe_name(self):
"""
@@ -19,13 +25,11 @@ class Archiver(oeSelfTest):
AutomatedBy: Daniel Istrate <daniel.alexandrux.istr...@intel.com>
"""
-include_recipe = 'busybox'
-exclude_recipe = 'zlib'
-
-features = 'INHERIT += "archiver"\n'
-features += 'ARCHIVER_MODE[src] = "original"\n'
-features += 'COPYLEFT_PN_INCLUDE = "%s"\n' % include_recipe
-features += 'COPYLEFT_PN_EXCLUDE = "%s"\n' % exclude_recipe
+# Test configuration is taken from conf file
+include_recipe = self.config.get('archiver', 'include_recipe')
+exclude_recipe = self.config.get('archiver', 'exclude_recipe')
+image = self.config.get('archiver', 'image')
+features = self.config.get('archiver', 'archiver_features')
# Update local.conf
self.write_config(features)
@@ -43,8 +47,10 @@ class Archiver(oeSelfTest):
# Check that include_recipe was included
is_included = len(glob.glob(src_path + '/%s*' % include_recipe))
-self.assertEqual(1, is_included, 'Recipe %s was not included.' %
include_recipe)
+self.assertEqual(1, is_included, 'Recipe %s was not included.'
+ % include_recipe)
# Check that exclude_recipe was excluded
is_excluded = len(glob.glob(src_path + '/%s*' % exclude_recipe))
-self.assertEqual(0, is_excluded, 'Recipe %s was not excluded.' %
exclude_recipe)
+self.assertEqual(0, is_excluded, 'Recipe %s was not excluded.'
+ % exclude_recipe)
diff --git a/meta/lib/oeqa/selftest/conf/archiver.conf
b/meta/lib/oeqa/selftest/conf/archiver.conf
new file mode 100644
index 000..2d56056
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/archiver.conf
@@ -0,0 +1,8 @@
+[archiver]
+include_recipe = busybox
+exclude_recipe = zlib
+archiver_features = INHERIT += "archiver"
+ ARCHIVER_MODE[src] = "original"
+ COPYLEFT_PN_INCLUDE = "busybox"
+ COPYLEFT_PN_EXCLUDE = "zlib"
+image = core-image-minimal
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 20/20] oeqa.utils.readconfig: Read self-test configuration file
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
This library reads a configuration file located at the
oeqa/selftest/conf directory with same name as the caller
file and the conf extension.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/utils/readconfig.py | 18 ++
1 file changed, 18 insertions(+)
create mode 100644 meta/lib/oeqa/utils/readconfig.py
diff --git a/meta/lib/oeqa/utils/readconfig.py
b/meta/lib/oeqa/utils/readconfig.py
new file mode 100644
index 000..1534ce7
--- /dev/null
+++ b/meta/lib/oeqa/utils/readconfig.py
@@ -0,0 +1,18 @@
+import os
+import re
+import configparser
+
+
+def conffile(codefile):
+# Get test configurations from configuration file
+f = re.compile(r'(pyc?$)')
+fn = os.path.basename(codefile)
+configfile = os.path.join(os.path.dirname(codefile), 'conf',
+ f.sub('conf', fn))
+config = configparser.SafeConfigParser()
+read_result = config.read(configfile)
+if read_result == []:
+raise configparser.Error("Failed to get test configuration from \
+\"%s\". Verify that file exists and format is correct."
+ % configfile)
+return config
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/20] oeqa.selftest.recipetool: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/conf/recipetool.conf | 84 +++
meta/lib/oeqa/selftest/recipetool.py| 326 +---
2 files changed, 332 insertions(+), 78 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/recipetool.conf
diff --git a/meta/lib/oeqa/selftest/conf/recipetool.conf
b/meta/lib/oeqa/selftest/conf/recipetool.conf
new file mode 100644
index 000..254c634
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/recipetool.conf
@@ -0,0 +1,84 @@
+[RecipetoolTests]
+setupclass_logger_name = selftest
+setupclass_logger_info = Running bitbake to generate pkgdata
+setupclass_recipe_1 = base-files
+setupclass_recipe_2 = coreutils
+setupclass_recipe_3 = busybox
+recipetool_appendfile_basic_recipe = base-files
+recipetool_appendfile_basic_lines = ['FILESEXTRAPATHS_prepend :=
"${THISDIR}/${PN}:"\n',
+'\n']
+recipetool_appendfile_appendfile = motd
+recipetool_appendfile_alternatives_append_file = /bin/ls
+recipetool_appendfile_alternatives_error_msg = {'ERROR: File /bin/ls is an
alternative possibly provided by the following recipes:', 'coreutils',
'busybox'}
+recipetool_appendfile_alternatives_testfile_2 = oe-init-build-env
+recipetool_appendfile_alternatives_testrecipe = coreutils
+# /bin/ls can be a symlink to /usr/bin/ls
+recipetool_appendfile_binary_append_file = /bin/ls
+recipetool_appendfile_binary_testrecipe = coreutils
+recipetool_appendfile_add_append_file = netbase
+recipetool_appendfile_add_testfile_2 = oe-init-build-env
+recipetool_appendfile_add_bindir_append_file = netbase
+recipetool_appendfile_add_machine_append_file = netbase
+# append_testfile is used in tests 1184, 1191, 1187, 1190, 1189, 1181, 1182,
+# 1185, 1188, 1180, 1186
+recipetool_appendfile_append_testfile = selftest-recipetool-appendfile
+recipetool_appendfile_wildcard_recipe = base-files
+recipetool_create_recipe = srctree
+recipetool_create_recipe_file = logrotate_3.8.7.bb
+recipetool_create_srcuri =
https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.8.7.tar.gz
+recipetool_create_license = GPLv2
+recipetool_create_licfileschksum = 18810669f13b87348459e611d31ab760
+recipetool_create_src_uri =
https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz
+recipetool_create_srcuri_md5sum = 99e08503ef24c3e2e3ff74cc5f3be213
+recipetool_create_srcuri_sha256sum =
f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64
+recipetool_create_git_recipes = 'libpng pango libx11 libxext jpeg libcheck'
+recipetool_create_git_recipe_1 = srctree
+recipetool_create_git_srcuri = git://git.yoctoproject.org/libmatchbox
+recipetool_create_git_rev = 9f7cf8895ae2d39c465c04cc78e918c157420269
+
+recipetool_create_git_recipe_file = libmatchbox.bb
+recipetool_create_git_license = LGPLv2.1
+recipetool_create_git_licfileschksum = 7fbc338309ac38fefcd64b04bb903e34
+recipetool_create_git_pv = 1.11
+recipetool_create_git_set_depends = {'libcheck', 'libjpeg-turbo', 'libpng',
'libx11', 'libxext', 'pango'}
+recipetool_create_git_inherit_1 = autotools
+recipetool_create_git_inherit_2 = pkgconfig
+recipetool_create_simple_recipe = recipe
+recipetool_create_simple_pv = 1.7.3.0
+recipetool_create_simple_srcuri =
http://www.dest-unreach.org/socat/download/socat-%(recipetool_create_simple_pv)s.tar.bz2
+recipetool_create_simple_set_license = {'Unknown', 'GPLv2'}
+recipetool_create_simple_set_fileschksum =
{'file://COPYING.OpenSSL;md5=5c9bccc77f67a8328ef4ebaf468116f4',
'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263'}
+recipetool_create_simple_s = None
+recipetool_create_simple_inherits = autotools
+recipetool_create_cmake_recipe = recipe
+recipetool_create_cmake_recipe_file = navit_0.5.0.bb
+recipetool_create_cmake_srcuri =
http://downloads.sourceforge.net/project/navit/v0.5.0/navit-0.5.0.tar.gz
+recipetool_create_cmake_set_license = {'Unknown', 'GPLv2', 'LGPLv2'}
+recipetool_create_cmake_src_uri =
http://downloads.sourceforge.net/project/navit/v${PV}/navit-${PV}.tar.gz
+recipetool_create_cmake_md5sum = 242f398e979a6b8c0f3c802b63435b68
+recipetool_create_cmake_sha256sum =
13353481d7fc01a4f64e385dda460b51496366bba0fd2cc85a89a0747910e94d
+recipetool_create_cmake_set_depends = {'freetype', 'zlib', 'openssl',
'glib-2.0', 'virtual/libgl', 'virtual/egl', 'gtk+', 'libpng', 'libsdl',
'freeglut', 'dbus-glib'}
+recipetool_create_cmake_inherits_recipes = {'cmake', 'python-dir', 'gettext',
'pkgconfig'}
+recipetool_create_github_recipe_file = meson_git.bb
+recipetool_create_github_srcuri = https://github.com/mesonbuild/meson
+recipetool_create_github_license = Apache-2.0
+recipetool_create_github_git_srcuri =
git://github.com/mesonbuild/meson;protocol=https
+recipetool_create_github_inherits = {'setuptools'}
+recipetool_create_github_tar
[OE-core] [PATCH 14/20] oeqa.selftest.prservice: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/conf/prservice.conf | 21 +
meta/lib/oeqa/selftest/prservice.py| 71 ++
2 files changed, 83 insertions(+), 9 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/prservice.conf
diff --git a/meta/lib/oeqa/selftest/conf/prservice.conf
b/meta/lib/oeqa/selftest/conf/prservice.conf
new file mode 100644
index 000..2d5f315
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/prservice.conf
@@ -0,0 +1,21 @@
+[BitbakePrTests]
+import_export_replace_db_package = m4
+import_export_override_db_package = m4
+pr_service_rpm_arch_dep_package = m4
+pr_service_rpm_arch_dep_package_type = rpm
+pr_service_rpm_arch_dep_track_task = do_package
+pr_service_deb_arch_dep_package = m4
+pr_service_deb_arch_dep_package_type = deb
+pr_service_deb_arch_dep_track_task = do_package
+pr_service_ipk_arch_dep_package = m4
+pr_service_ipk_arch_dep_package_type = ipk
+pr_service_ipk_arch_dep_track_task = do_package
+pr_service_rpm_arch_indep_package = xcursor-transparent-theme
+pr_service_rpm_arch_indep_package_type = rpm
+pr_service_rpm_arch_indep_track_task = do_package
+pr_service_deb_arch_indep_package = xcursor-transparent-theme
+pr_service_deb_arch_indep_package_type = deb
+pr_service_deb_arch_indep_track_task = do_package
+pr_service_ipk_arch_indep_package = xcursor-transparent-theme
+pr_service_ipk_arch_indep_package_type = ipk
+pr_service_ipk_arch_indep_track_task = do_package
diff --git a/meta/lib/oeqa/selftest/prservice.py
b/meta/lib/oeqa/selftest/prservice.py
index 1b9a510..af8ffec 100644
--- a/meta/lib/oeqa/selftest/prservice.py
+++ b/meta/lib/oeqa/selftest/prservice.py
@@ -10,9 +10,16 @@ from oeqa.selftest.base import oeSelfTest
from oeqa.utils.commands import runCmd, bitbake, get_bb_var
from oeqa.utils.decorators import testcase
from oeqa.utils.network import get_free_port
+from oeqa.utils.readconfig import conffile
+
class BitbakePrTests(oeSelfTest):
-
+
+@classmethod
+def setUpClass(cls):
+# Get test configurations from configuration file
+cls.config = conffile(__file__)
+
def get_pr_version(self, package_name):
pkgdata_dir = get_bb_var('PKGDATA_DIR')
package_data_file = os.path.join(pkgdata_dir, 'runtime', package_name)
@@ -91,35 +98,81 @@ class BitbakePrTests(oeSelfTest):
@testcase(930)
def test_import_export_replace_db(self):
-self.run_test_pr_export_import('m4')
+package = self.config.get(
+'BitbakePrTests', 'import_export_replace_db_package')
+self.run_test_pr_export_import(package)
@testcase(931)
def test_import_export_override_db(self):
-self.run_test_pr_export_import('m4', replace_current_db=False)
+package = self.config.get(
+'BitbakePrTests', 'import_export_override_db_package')
+self.run_test_pr_export_import(package, replace_current_db=False)
@testcase(932)
def test_pr_service_rpm_arch_dep(self):
-self.run_test_pr_service('m4', 'rpm', 'do_package')
+# Test configuration is taken from conf file
+package = self.config.get(
+'BitbakePrTests', 'pr_service_rpm_arch_dep_package')
+package_type = self.config.get(
+ 'BitbakePrTests', 'pr_service_rpm_arch_dep_package_type')
+track_task = self.config.get(
+ 'BitbakePrTests', 'pr_service_rpm_arch_dep_track_task')
+self.run_test_pr_service(package, package_type, track_task)
@testcase(934)
def test_pr_service_deb_arch_dep(self):
-self.run_test_pr_service('m4', 'deb', 'do_package')
+# Get test configurations from configuration file
+package = self.config.get(
+'BitbakePrTests', 'pr_service_deb_arch_dep_package')
+package_type = self.config.get(
+ 'BitbakePrTests', 'pr_service_deb_arch_dep_package_type')
+track_task = self.config.get(
+ 'BitbakePrTests', 'pr_service_deb_arch_dep_track_task')
+self.run_test_pr_service(package, package_type, track_task)
@testcase(933)
def test_pr_service_ipk_arch_dep(self):
-self.run_test_pr_service('m4', 'ipk', 'do_package')
+# Get test configurations from configuration file
+package = self.config.get(
+'BitbakePrTests', 'pr_service_ipk_arch_dep_package')
+package_type = self.config.get(
+ 'BitbakePrTests', 'pr_service_ipk_arch_dep_package_type')
+track_task = self.config.get(
+ 'BitbakePrTests', 'pr_service_ipk_arch_dep_track_task')
+self.run_test_pr_service(package, package_type, track_task)
@testcase(935)
def test_pr_service_rpm_arch_inde
[OE-core] [PATCH 19/20] oeqa.selftest.wic: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/conf/wic.conf | 10 +++
meta/lib/oeqa/selftest/wic.py| 150 ---
2 files changed, 98 insertions(+), 62 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/wic.conf
diff --git a/meta/lib/oeqa/selftest/conf/wic.conf
b/meta/lib/oeqa/selftest/conf/wic.conf
new file mode 100644
index 000..e2afb8d
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/wic.conf
@@ -0,0 +1,10 @@
+[Wic]
+setUpClass_image1 = core-image-minimal
+setUpClass_image2 = minimal
+setUpClass_image3 = qemux86-directdisk
+setUpClass_image4 = directdisk
+setUpClass_image5 = wic-image-minimal
+setUpClass_features = IMAGE_FSTYPES += " hddimg"
+ MACHINE_FEATURES_append = " efi"
+setUpClass_recipes = syslinux syslinux-native parted-native gptfdisk-native
dosfstools-native mtools-native bmap-tools-native
+
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index e550785..dc81457 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -31,6 +31,7 @@ from shutil import rmtree
from oeqa.selftest.base import oeSelfTest
from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu
from oeqa.utils.decorators import testcase
+from oeqa.utils.readconfig import conffile
class Wic(oeSelfTest):
@@ -39,6 +40,18 @@ class Wic(oeSelfTest):
resultdir = "/var/tmp/wic/build/"
image_is_ready = False
+@classmethod
+def setUpClass(cls):
+# Get test configurations from configuration file
+cls.config = conffile(__file__)
+cls.image1 = cls.config.get('Wic', 'setUpClass_image1')
+cls.image2 = cls.config.get('Wic', 'setUpClass_image2')
+cls.image3 = cls.config.get('Wic', 'setUpClass_image3')
+cls.image4 = cls.config.get('Wic', 'setUpClass_image4')
+cls.image5 = cls.config.get('Wic', 'setUpClass_image5')
+cls.features = cls.config.get('Wic', 'setUpClass_features')
+cls.recipes = cls.config.get('Wic', 'setUpClass_recipes')
+
def setUpLocal(self):
"""This code is executed before each test method."""
self.write_config('IMAGE_FSTYPES += " hddimg"\n'
@@ -48,9 +61,8 @@ class Wic(oeSelfTest):
# clean up which can result in the native tools built earlier in
# setUpClass being unavailable.
if not Wic.image_is_ready:
-bitbake('syslinux syslinux-native parted-native gptfdisk-native '
-'dosfstools-native mtools-native bmap-tools-native')
-bitbake('core-image-minimal')
+bitbake(self.recipes)
+bitbake(self.image1)
Wic.image_is_ready = True
rmtree(self.resultdir, ignore_errors=True)
@@ -73,30 +85,35 @@ class Wic(oeSelfTest):
@testcase(1211)
def test_build_image_name(self):
"""Test wic create directdisk --image-name core-image-minimal"""
-self.assertEqual(0, runCmd("wic create directdisk "
- "--image-name core-image-minimal").status)
-self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct")))
+self.assertEqual(
+0, runCmd("wic create %s --image-name %s"
+ % (self.image4, self.image1)).status)
+self.assertEqual(
+1, len(glob(self.resultdir + "%s-*.direct" % self.image4)))
@testcase(1212)
def test_build_artifacts(self):
"""Test wic create directdisk providing all artifacts."""
-bbvars = dict((var.lower(), get_bb_var(var, 'core-image-minimal')) \
-for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE',
-'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS'))
+bbvars = dict((var.lower(), get_bb_var(var, self.image1))
+ for var in ('STAGING_DATADIR', 'DEPLOY_DIR_IMAGE',
+ 'STAGING_DIR_NATIVE', 'IMAGE_ROOTFS'))
status = runCmd("wic create directdisk "
"-b %(staging_datadir)s "
"-k %(deploy_dir_image)s "
"-n %(staging_dir_native)s "
"-r %(image_rootfs)s" % bbvars).status
self.assertEqual(0, status)
-self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct")))
+self.assertEqual(1, len(glob(self.resultdir + "%s-*.direct"
+ % self.image4)))
@testcase(1157)
def test_gpt_image(self):
-"""Test cr
[OE-core] [PATCH 18/20] oeqa.selftest.sstatetests: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/conf/sstatetests.conf | 25 +
meta/lib/oeqa/selftest/sstatetests.py| 162 ++-
2 files changed, 133 insertions(+), 54 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/sstatetests.conf
diff --git a/meta/lib/oeqa/selftest/conf/sstatetests.conf
b/meta/lib/oeqa/selftest/conf/sstatetests.conf
new file mode 100644
index 000..23c87c4
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/sstatetests.conf
@@ -0,0 +1,25 @@
+[SStateTests]
+setUpClass_prefix = binutils-cross-
+setUpClass_recipe1 = binutils-native
+setUpClass_recipe2 = glibc-initial
+setupClass_recipe3 = m4
+setupClass_recipe4 = meta-toolchain
+setupClass_recipe5 = meta-environment
+setupClass_recipe6 = cross-canadian
+setUpClass_pattern = populate_lic
+setUpClass_machine1 = qemux86-64
+setupClass_machine2 = qemux86
+setupClass_machine3 = qemuarm
+setUpClass_machine4 = qemux86copy
+setUpClass_image = core-image-sato
+sstate_32_64_same_hash_features_1 = MACHINE = "qemux86"
+BUILD_ARCH = "x86_64"
+BUILD_OS = "linux"
+SDKMACHINE = "x86_64"
+sstate_32_64_same_hash_features_2 = MACHINE = "qemux86"
+BUILD_ARCH = "i686"
+BUILD_OS = "linux"
+SDKMACHINE = "i686"
+sstate_32_64_same_hash_arch2 = i686
+sstate_32_64_same_hash_arch1 = x86_64
+
diff --git a/meta/lib/oeqa/selftest/sstatetests.py
b/meta/lib/oeqa/selftest/sstatetests.py
index 07212ac..814c6d0 100644
--- a/meta/lib/oeqa/selftest/sstatetests.py
+++ b/meta/lib/oeqa/selftest/sstatetests.py
@@ -11,9 +11,29 @@ from oeqa.selftest.base import oeSelfTest
from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_test_layer
from oeqa.selftest.sstate import SStateBase
from oeqa.utils.decorators import testcase
+from oeqa.utils.readconfig import conffile
+
class SStateTests(SStateBase):
+@classmethod
+def setUpClass(cls):
+# Get test configurations from configuration file
+cls.config = conffile(__file__)
+cls.prefix = cls.config.get('SStateTests', 'setUpClass_prefix')
+cls.recipe1 = cls.config.get('SStateTests', 'setUpClass_recipe1')
+cls.recipe2 = cls.config.get('SStateTests', 'setUpClass_recipe2')
+cls.recipe3 = cls.config.get('SStateTests', 'setUpClass_recipe3')
+cls.recipe4 = cls.config.get('SStateTests', 'setUpClass_recipe4')
+cls.recipe5 = cls.config.get('SStateTests', 'setUpClass_recipe5')
+cls.recipe6 = cls.config.get('SStateTests', 'setUpClass_recipe6')
+cls.pattern = cls.config.get('SStateTests', 'setUpClass_pattern')
+cls.machine1 = cls.config.get('SStateTests', 'setUpClass_machine1')
+cls.machine2 = cls.config.get('SStateTests', 'setUpClass_machine2')
+cls.machine3 = cls.config.get('SStateTests', 'setUpClass_machine3')
+cls.machine4 = cls.config.get('SStateTests', 'setUpClass_machine4')
+cls.image = cls.config.get('SStateTests', 'setUpClass_image')
+
# Test sstate files creation and their location
def run_test_sstate_creation(self, targets, distro_specific=True,
distro_nonspecific=True, temp_sstate_location=True, should_pass=True):
self.config_sstate(temp_sstate_location)
@@ -42,20 +62,29 @@ class SStateTests(SStateBase):
@testcase(975)
def test_sstate_creation_distro_specific_pass(self):
targetarch = get_bb_var('TUNE_ARCH')
-self.run_test_sstate_creation(['binutils-cross-'+ targetarch,
'binutils-native'], distro_specific=True, distro_nonspecific=False,
temp_sstate_location=True)
+self.run_test_sstate_creation(
+[self.prefix + targetarch, self.recipe1], distro_specific=True,
+distro_nonspecific=False, temp_sstate_location=True)
@testcase(1374)
def test_sstate_creation_distro_specific_fail(self):
targetarch = get_bb_var('TUNE_ARCH')
-self.run_test_sstate_creation(['binutils-cross-'+ targetarch,
'binutils-native'], distro_specific=False, distro_nonspecific=True,
temp_sstate_location=True, should_pass=False)
+self.run_test_sstate_creation(
+[self.prefix + targetarch, self.recipe1],
+distro_specific=False, distro_nonspecific=True,
+temp_sstate_location=True, should_pass=False)
@testcase(976)
def test_sstate_creation_distro_nonspecific_pass(self):
-self.run_test_sstate_creation(['glibc-initial'],
distro_specific=False, distro_nonspecific=True, temp_sstate_location=True)
+self.run_test_sstate_creation(
+
[OE-core] [PATCH 16/20] oeqa.selftest.runtime-test: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/conf/runtime-test.conf | 13 +
meta/lib/oeqa/selftest/runtime-test.py| 80 ---
2 files changed, 37 insertions(+), 56 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/runtime-test.conf
diff --git a/meta/lib/oeqa/selftest/conf/runtime-test.conf
b/meta/lib/oeqa/selftest/conf/runtime-test.conf
new file mode 100644
index 000..6c331ba
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/runtime-test.conf
@@ -0,0 +1,13 @@
+[TestExport]
+# These aren't the actual IP addresses but testexport class needs something
+# defined
+setUpClass_features = INHERIT += "testexport"
+ TEST_SERVER_IP = "192.168.7.1"
+ TEST_TARGET_IP = "192.168.7.1"
+ TEST_SUITES = "ping"
+setUpClass_image = core-image-minimal
+[TestImage]
+setUpClass_features = INHERIT += "testimage"
+ TEST_SUITES = "ping ssh selftest"
+ TEST_SUITES_TAGS = "selftest_package_install"
+setUpClass_image = core-image-full-cmdline
diff --git a/meta/lib/oeqa/selftest/runtime-test.py
b/meta/lib/oeqa/selftest/runtime-test.py
index c2d5b45..627716d 100644
--- a/meta/lib/oeqa/selftest/runtime-test.py
+++ b/meta/lib/oeqa/selftest/runtime-test.py
@@ -2,9 +2,18 @@ from oeqa.selftest.base import oeSelfTest
from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu
from oeqa.utils.decorators import testcase
import os
+from oeqa.utils.readconfig import conffile
+
class TestExport(oeSelfTest):
+@classmethod
+def setUpClass(cls):
+# Get test configurations from configuration file
+cls.config = conffile(__file__)
+cls.features = cls.config.get('TestExport', 'setUpClass_features')
+cls.image = cls.config.get('TestExport', 'setUpClass_image')
+
def test_testexport_basic(self):
"""
Summary: Check basic testexport functionality with only ping test
enabled.
@@ -15,23 +24,18 @@ class TestExport(oeSelfTest):
Author: Mariano Lopez <mariano.lo...@intel.com>
"""
-features = 'INHERIT += "testexport"\n'
-# These aren't the actual IP addresses but testexport class needs
something defined
-features += 'TEST_SERVER_IP = "192.168.7.1"\n'
-features += 'TEST_TARGET_IP = "192.168.7.1"\n'
-features += 'TEST_SUITES = "ping"\n'
-self.write_config(features)
+self.write_config(self.features)
# Build tesexport for core-image-minimal
-bitbake('core-image-minimal')
-bitbake('-c testexport core-image-minimal')
+bitbake(self.image)
+bitbake('-c testexport %s' % self.image)
# Verify if TEST_EXPORT_DIR was created
-testexport_dir = get_bb_var('TEST_EXPORT_DIR', 'core-image-minimal')
+testexport_dir = get_bb_var('TEST_EXPORT_DIR', self.image)
isdir = os.path.isdir(testexport_dir)
self.assertEqual(True, isdir, 'Failed to create testexport dir: %s' %
testexport_dir)
-with runqemu('core-image-minimal') as qemu:
+with runqemu(self.image) as qemu:
# Attempt to run runexported.py to perform ping test
runexported_path = os.path.join(testexport_dir, "runexported.py")
testdata_path = os.path.join(testexport_dir, "testdata.json")
@@ -43,49 +47,16 @@ class TestExport(oeSelfTest):
failure = True if 'FAIL' in result.output else False
self.assertNotEqual(True, failure, 'ping test failed')
-def test_testexport_sdk(self):
-"""
-Summary: Check sdk functionality for testexport.
-Expected: 1. testexport directory must be created.
- 2. SDK tarball must exists.
- 3. Uncompressing of tarball must succeed.
- 4. Check if the SDK directory is added to PATH.
- 5. Run tar from the SDK directory.
-Product: oe-core
-Author: Mariano Lopez <mariano.lo...@intel.com>
-"""
-
-features = 'INHERIT += "testexport"\n'
-# These aren't the actual IP addresses but testexport class needs
something defined
-features += 'TEST_SERVER_IP = "192.168.7.1"\n'
-features += 'TEST_TARGET_IP = "192.168.7.1"\n'
-features += 'TEST_SUITES = "ping"\n'
-features += 'TEST_SUITES_TAGS = "selftest_sdk"\n'
-features += 'TEST_EXPORT_SDK_ENABLED = "1"\n'
-features += 'TEST_EXPORT_SDK_PACKAGES = "nativesdk-tar"\
[OE-core] [PATCH 04/20] oeqa.selftest.bbtests: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/bbtests.py| 175 +--
meta/lib/oeqa/selftest/conf/bbtests.conf | 28 +
2 files changed, 150 insertions(+), 53 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/bbtests.conf
diff --git a/meta/lib/oeqa/selftest/bbtests.py
b/meta/lib/oeqa/selftest/bbtests.py
index 4b42323..0f89fee 100644
--- a/meta/lib/oeqa/selftest/bbtests.py
+++ b/meta/lib/oeqa/selftest/bbtests.py
@@ -5,9 +5,16 @@ import oeqa.utils.ftools as ftools
from oeqa.selftest.base import oeSelfTest
from oeqa.utils.commands import runCmd, bitbake, get_bb_var
from oeqa.utils.decorators import testcase
+from oeqa.utils.readconfig import conffile
+
class BitbakeTests(oeSelfTest):
+@classmethod
+def setUpClass(cls):
+# Get test configurations from configuration file
+cls.config = conffile(__file__)
+
def getline(self, res, line):
for l in res.output.split('\n'):
if line in l:
@@ -27,8 +34,10 @@ class BitbakeTests(oeSelfTest):
@testcase(806)
def test_event_handler(self):
-self.write_config("INHERIT += \"test_events\"")
-result = bitbake('m4-native')
+features = self.config.get('bitbaketests', 'event_handler_features')
+recipe = self.config.get('bitbaketests', 'event_handler_recipe')
+self.write_config(features)
+result = bitbake(recipe)
find_build_started = re.search("NOTE: Test for
bb\.event\.BuildStarted(\n.*)*NOTE: Executing RunQueue Tasks", result.output)
find_build_completed = re.search("Tasks Summary:.*(\n.*)*NOTE: Test
for bb\.event\.BuildCompleted", result.output)
self.assertTrue(find_build_started, msg = "Match failed in:\n%s" %
result.output)
@@ -37,26 +46,40 @@ class BitbakeTests(oeSelfTest):
@testcase(103)
def test_local_sstate(self):
-bitbake('m4-native -ccleansstate')
-bitbake('m4-native')
-bitbake('m4-native -cclean')
-result = bitbake('m4-native')
-find_setscene = re.search("m4-native.*do_.*_setscene", result.output)
-self.assertTrue(find_setscene, msg = "No \"m4-native.*do_.*_setscene\"
message found during bitbake m4-native. bitbake output: %s" % result.output )
+recipe = self.config.get('bitbaketests', 'local_sstate_recipe')
+bitbake('%s -ccleansstate' % recipe)
+bitbake(recipe)
+bitbake('%s -cclean' % recipe)
+result = bitbake(recipe)
+find_setscene = re.search(
+ "%s.*do_.*_setscene" % recipe, result.output)
+self.assertTrue(find_setscene, msg="No \"%s.*do_.*_setscene\" message \
+found during bitbake %s. bitbake output: %s" % (recipe, recipe, result.output))
@testcase(105)
def test_bitbake_invalid_recipe(self):
-result = bitbake('-b asdf', ignore_status=True)
-self.assertTrue("ERROR: Unable to find any recipe file matching
'asdf'" in result.output, msg = "Though asdf recipe doesn't exist, bitbake
didn't output any err. message. bitbake output: %s" % result.output)
+recipe = eval(
+ self.config.get('bitbaketests', 'bb_invalid_recipe_recipe'))
+result = bitbake('-b %s' % recipe, ignore_status=True)
+self.assertTrue("ERROR: Unable to find any recipe file matching '%s'"
+% recipe in result.output,
+msg="Though %s recipe doesn't exist, bitbake didn't \
+output any err. message. bitbake output: %s" % (recipe, result.output))
@testcase(107)
def test_bitbake_invalid_target(self):
-result = bitbake('asdf', ignore_status=True)
-self.assertTrue("ERROR: Nothing PROVIDES 'asdf'" in result.output, msg
= "Though no 'asdf' target exists, bitbake didn't output any err. message.
bitbake output: %s" % result.output)
+recipe = eval(
+ self.config.get('bitbaketests', 'bb_invalid_target_recipe'))
+result = bitbake(recipe, ignore_status=True)
+self.assertTrue("ERROR: Nothing PROVIDES '%s'" % recipe
+in result.output, msg="Though no '%s' target exists, \
+bitbake didn't output any err. message. bitbake output: %s"
+% (recipe, result.output))
@testcase(106)
def test_warnings_errors(self):
-result = bitbake('-b asdf', ignore_status=True)
+recipe = self.config.get('bitbaketests', 'warnings_errors_recipe')
+result = bitbake('-b %s' % recipe, ignore_status=True)
find_warnings = re.search("Summary: There w.{2,3}? [1-9][0-9]*
[OE-core] [PATCH 06/20] oeqa.selftest.buildoptions: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/buildoptions.py| 231 +++---
meta/lib/oeqa/selftest/conf/buildoptions.conf | 42 +
2 files changed, 210 insertions(+), 63 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/buildoptions.conf
diff --git a/meta/lib/oeqa/selftest/buildoptions.py
b/meta/lib/oeqa/selftest/buildoptions.py
index 4d01921..877a8c7 100644
--- a/meta/lib/oeqa/selftest/buildoptions.py
+++ b/meta/lib/oeqa/selftest/buildoptions.py
@@ -8,78 +8,145 @@ from oeqa.selftest.buildhistory import BuildhistoryBase
from oeqa.utils.commands import runCmd, bitbake, get_bb_var
import oeqa.utils.ftools as ftools
from oeqa.utils.decorators import testcase
+from oeqa.utils.readconfig import conffile
+
class ImageOptionsTests(oeSelfTest):
+@classmethod
+def setUpClass(cls):
+# Get test configurations from configuration file
+cls.config = conffile(__file__)
+
@testcase(761)
def test_incremental_image_generation(self):
image_pkgtype = get_bb_var("IMAGE_PKGTYPE")
if image_pkgtype != 'rpm':
self.skipTest('Not using RPM as main package format')
-bitbake("-c cleanall core-image-minimal")
-self.write_config('INC_RPM_IMAGE_GEN = "1"')
-self.append_config('IMAGE_FEATURES += "ssh-server-openssh"')
-bitbake("core-image-minimal")
-log_data_file = os.path.join(get_bb_var("WORKDIR",
"core-image-minimal"), "temp/log.do_rootfs")
+image = self.config.get(
+ 'ImageOptionsTests', 'incremental_image_generation_image')
+writeconfig = self.config.get(
+'ImageOptionsTests',
+'incremental_image_generation_writeconfig')
+appendconfig = self.config.get(
+ 'ImageOptionsTests',
+ 'incremental_image_generation_appendconfig')
+packagecreated = self.config.get(
+ 'ImageOptionsTests',
+ 'incremental_image_generation_packagecreated')
+packageremoved = self.config.get(
+ 'ImageOptionsTests',
+ 'incremental_image_generation_packageremoved')
+bitbake("-c cleanall %s" % image)
+self.write_config(writeconfig)
+self.append_config(appendconfig)
+bitbake(image)
+log_data_file = os.path.join(
+ get_bb_var("WORKDIR", image), "temp/log.do_rootfs")
log_data_created = ftools.read_file(log_data_file)
incremental_created = re.search("NOTE: load old install solution for
incremental install\nNOTE: old install solution not exist\nNOTE: creating new
install solution for incremental install(\n.*)*NOTE: Installing the following
packages:.*packagegroup-core-ssh-openssh", log_data_created)
-self.remove_config('IMAGE_FEATURES += "ssh-server-openssh"')
+self.remove_config(appendconfig)
self.assertTrue(incremental_created, msg = "Match failed in:\n%s" %
log_data_created)
-bitbake("core-image-minimal")
+bitbake(image)
log_data_removed = ftools.read_file(log_data_file)
incremental_removed = re.search("NOTE: load old install solution for
incremental install\nNOTE: creating new install solution for incremental
install(\n.*)*NOTE: incremental removed:.*openssh-sshd-.*", log_data_removed)
self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" %
log_data_removed)
@testcase(925)
def test_rm_old_image(self):
-bitbake("core-image-minimal")
-deploydir = get_bb_var("DEPLOY_DIR_IMAGE", target="core-image-minimal")
-imagename = get_bb_var("IMAGE_LINK_NAME", target="core-image-minimal")
+image = self.config.get('ImageOptionsTests', 'rm_old_image_image')
+bitbake(image)
+deploydir = get_bb_var("DEPLOY_DIR_IMAGE", target=image)
+imagename = get_bb_var("IMAGE_LINK_NAME", target=image)
deploydir_files = os.listdir(deploydir)
track_original_files = []
for image_file in deploydir_files:
if imagename in image_file and
os.path.islink(os.path.join(deploydir, image_file)):
track_original_files.append(os.path.realpath(os.path.join(deploydir,
image_file)))
self.write_config("RM_OLD_IMAGE = \"1\"")
-bitbake("-C rootfs core-image-minimal")
+bitbake("-C rootfs %s" % image)
deploydir_files = os.listdir(deploydir)
remainin
[OE-core] [PATCH 08/20] oeqa.selftest.imagefeatures: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/conf/imagefeatures.conf | 19 +
meta/lib/oeqa/selftest/imagefeatures.py| 55 +-
2 files changed, 56 insertions(+), 18 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/imagefeatures.conf
diff --git a/meta/lib/oeqa/selftest/conf/imagefeatures.conf
b/meta/lib/oeqa/selftest/conf/imagefeatures.conf
new file mode 100644
index 000..23e9dd5
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/imagefeatures.conf
@@ -0,0 +1,19 @@
+[imagefeatures]
+test_user = tester
+root_user = root
+test_non_root_user_can_connect_via_ssh_without_password_features =
+'EXTRA_IMAGE_FEATURES = \
+ "ssh-server-openssh empty-root-password allow-empty-password"\n\
+ INHERIT += "extrausers"\n'
+test_non_root_user_can_connect_via_ssh_without_password_image =
core-image-minimal
+test_all_users_can_connect_via_ssh_without_password_features =
+'EXTRA_IMAGE_FEATURES = \
+ "ssh-server-openssh allow-empty-password"\n\
+ INHERIT += "extrausers"\n'
+test_all_users_can_connect_via_ssh_without_password_image = core-image-minimal
+test_wayland_support_in_image_features =
+'DISTRO_FEATURES_append = " wayland"\n\
+ CORE_IMAGE_EXTRA_INSTALL += "wayland weston"'
+test_wayland_support_in_image_image = core-image-weston
+test_bmap_features = IMAGE_FSTYPES += " ext4 ext4.bmap"
+test_bmap_image = core-image-minimal
diff --git a/meta/lib/oeqa/selftest/imagefeatures.py
b/meta/lib/oeqa/selftest/imagefeatures.py
index 08e382f..654a020 100644
--- a/meta/lib/oeqa/selftest/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/imagefeatures.py
@@ -5,11 +5,17 @@ from oeqa.utils.sshcontrol import SSHControl
import os
import sys
import logging
+from oeqa.utils.readconfig import conffile
+
class ImageFeatures(oeSelfTest):
-test_user = 'tester'
-root_user = 'root'
+@classmethod
+def setUpClass(cls):
+# Get test configurations from configuration file
+cls.config = conffile(__file__)
+cls.test_user = cls.config.get('imagefeatures', 'test_user')
+cls.root_user = cls.config.get('imagefeatures', 'root_user')
@testcase(1107)
def test_non_root_user_can_connect_via_ssh_without_password(self):
@@ -22,15 +28,22 @@ class ImageFeatures(oeSelfTest):
AutomatedBy: Daniel Istrate <daniel.alexandrux.istr...@intel.com>
"""
-features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh
empty-root-password allow-empty-password"\n'
-features += 'INHERIT += "extrausers"\n'
-features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s
/bin/sh {};"'.format(self.test_user, self.test_user)
+features = eval(
+ self.config.get(
+ 'imagefeatures',
+ 'test_non_root_user_can_connect_via_ssh_without_password_\
+features'))
+image = self.config.get(
+ 'imagefeatures',
+ 'test_non_root_user_can_connect_via_ssh_without_password_image')
+features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s \
+/bin/sh {};"'.format(self.test_user, self.test_user)
self.write_config(features)
# Build a core-image-minimal
-bitbake('core-image-minimal')
+bitbake(image)
-with runqemu("core-image-minimal") as qemu:
+with runqemu(image) as qemu:
# Attempt to ssh with each user into qemu with empty password
for user in [self.root_user, self.test_user]:
ssh = SSHControl(ip=qemu.ip, logfile=qemu.sshlog, user=user)
@@ -48,15 +61,19 @@ class ImageFeatures(oeSelfTest):
AutomatedBy: Daniel Istrate <daniel.alexandrux.istr...@intel.com>
"""
-features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh
allow-empty-password"\n'
-features += 'INHERIT += "extrausers"\n'
-features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s
/bin/sh {};"'.format(self.test_user, self.test_user)
+features = eval(
+ self.config.get('imagefeatures', 'test_all_users_can_connect_\
+via_ssh_without_password_features'))
+image = self.config.get('imagefeatures', 'test_all_users_can_connect_\
+via_ssh_without_password_image')
+features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s \
+/bin/sh {};"'.format(self.test_user, self.test_user)
self.write_config(features)
# Build a core-image-minimal
-bitbake('core-image-minimal')
+bitbake(image)
-with runqemu("core-image-minimal")
[OE-core] [PATCH 03/20] oeqa.selftest.bblayers: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/bblayers.py| 125 ++
meta/lib/oeqa/selftest/conf/bblayers.conf | 21 +
2 files changed, 115 insertions(+), 31 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/bblayers.conf
diff --git a/meta/lib/oeqa/selftest/bblayers.py
b/meta/lib/oeqa/selftest/bblayers.py
index d23675e..49eb2e7 100644
--- a/meta/lib/oeqa/selftest/bblayers.py
+++ b/meta/lib/oeqa/selftest/bblayers.py
@@ -8,86 +8,149 @@ import oeqa.utils.ftools as ftools
from oeqa.selftest.base import oeSelfTest
from oeqa.utils.commands import runCmd, get_bb_var
from oeqa.utils.decorators import testcase
+from oeqa.utils.readconfig import conffile
class BitbakeLayers(oeSelfTest):
+@classmethod
+def setUpClass(cls):
+# Get test configurations from configuration file
+cls.config = conffile(__file__)
+
@testcase(756)
def test_bitbakelayers_showcrossdepends(self):
result = runCmd('bitbake-layers show-cross-depends')
-self.assertTrue('aspell' in result.output, msg = "No dependencies were
shown. bitbake-layers show-cross-depends output: %s" % result.output)
+recipe = self.config.get('BitbakeLayers',
+ 'bitbakelayers_showcrossdepends_recipe')
+self.assertTrue(recipe in result.output, msg="No dependencies were \
+shown. bitbake-layers show-cross-depends output: %s" % result.output)
@testcase(83)
def test_bitbakelayers_showlayers(self):
result = runCmd('bitbake-layers show-layers')
-self.assertTrue('meta-selftest' in result.output, msg = "No layers
were shown. bitbake-layers show-layers output: %s" % result.output)
+layer = self.config.get('BitbakeLayers',
+'bitbakelayers_showlayers_layer')
+self.assertTrue(layer in result.output, msg="No layers were shown. \
+bitbake-layers show-layers output: %s" % result.output)
@testcase(93)
def test_bitbakelayers_showappends(self):
-recipe = "xcursor-transparent-theme"
+recipe = self.config.get('BitbakeLayers',
+ 'bitbakelayers_showappends_recipe')
bb_file = self.get_recipe_basename(recipe)
result = runCmd('bitbake-layers show-appends')
-self.assertTrue(bb_file in result.output, msg="%s file was not
recognised. bitbake-layers show-appends output: %s" % (bb_file, result.output))
+self.assertTrue(bb_file in result.output, msg="%s file was not \
+recognised. bitbake-layers show-appends output: %s"
+% (bb_file, result.output))
@testcase(90)
def test_bitbakelayers_showoverlayed(self):
result = runCmd('bitbake-layers show-overlayed')
-self.assertTrue('aspell' in result.output, msg="aspell overlayed
recipe was not recognised bitbake-layers show-overlayed %s" % result.output)
+overlayed = self.config.get('BitbakeLayers',
+'bitbakelayers_showoverlayed_recipe')
+self.assertTrue(overlayed in result.output, msg="%s overlayed recipe \
+was not recognised bitbake-layers show-overlayed %s"
+% (overlayed, result.output))
@testcase(95)
def test_bitbakelayers_flatten(self):
-recipe = "xcursor-transparent-theme"
-recipe_path = "recipes-graphics/xcursor-transparent-theme"
+recipe = self.config.get('BitbakeLayers',
+ 'bitbakelayers_flatten_recipe')
+recipe_path = os.path.join(self.config.get(
+'BitbakeLayers', 'bitbakelayers_flatten_recipedir'), recipe)
recipe_file = self.get_recipe_basename(recipe)
testoutdir = os.path.join(self.builddir, 'test_bitbakelayers_flatten')
self.assertFalse(os.path.isdir(testoutdir), msg =
"test_bitbakelayers_flatten should not exist at this point in time")
self.track_for_cleanup(testoutdir)
result = runCmd('bitbake-layers flatten %s' % testoutdir)
bb_file = os.path.join(testoutdir, recipe_path, recipe_file)
-self.assertTrue(os.path.isfile(bb_file), msg = "Cannot find
xcursor-transparent-theme_0.1.1.bb in the test_bitbakelayers_flatten local
dir.")
+self.assertTrue(os.path.isfile(bb_file), msg="Cannot find %s_0.1.1.bb \
+in the test_bitbakelayers_flatten local dir." % recipe)
contents = ftools.read_file(bb_file)
find_in_contents = re.search("# bbappended from meta-selftest
#\n(.*\n)*include test_recipe.inc", contents)
self.assertTrue(find_in_contents, msg = "Flattening l
[OE-core] [PATCH 05/20] oeqa.selftest.buildhistory: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/buildhistory.py| 10 +-
meta/lib/oeqa/selftest/conf/buildhistory.conf | 3 +++
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 meta/lib/oeqa/selftest/conf/buildhistory.conf
diff --git a/meta/lib/oeqa/selftest/buildhistory.py
b/meta/lib/oeqa/selftest/buildhistory.py
index 674da62..9553788 100644
--- a/meta/lib/oeqa/selftest/buildhistory.py
+++ b/meta/lib/oeqa/selftest/buildhistory.py
@@ -5,13 +5,21 @@ import datetime
from oeqa.selftest.base import oeSelfTest
from oeqa.utils.commands import bitbake, get_bb_var
from oeqa.utils.decorators import testcase
+from oeqa.utils.readconfig import conffile
class BuildhistoryBase(oeSelfTest):
+@classmethod
+def setUpClass(cls):
+# Get test configurations from configuration file
+cls.config = conffile(__file__)
+
def config_buildhistory(self, tmp_bh_location=False):
if (not 'buildhistory' in get_bb_var('USER_CLASSES')) and (not
'buildhistory' in get_bb_var('INHERIT')):
-add_buildhistory_config = 'INHERIT +=
"buildhistory"\nBUILDHISTORY_COMMIT = "1"'
+add_buildhistory_config = self.config.get(
+'buildhistory',
+'config_buildhistory_features')
self.append_config(add_buildhistory_config)
if tmp_bh_location:
diff --git a/meta/lib/oeqa/selftest/conf/buildhistory.conf
b/meta/lib/oeqa/selftest/conf/buildhistory.conf
new file mode 100644
index 000..e81c701
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/buildhistory.conf
@@ -0,0 +1,3 @@
+[buildhistory]
+config_buildhistory_features = INHERIT += "buildhistory"
+ BUILDHISTORY_COMMIT = "1"
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/20] oeqa.selftest.lic-checksum: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/conf/lic-checksum.conf | 4
meta/lib/oeqa/selftest/lic-checksum.py| 22 --
2 files changed, 20 insertions(+), 6 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/lic-checksum.conf
diff --git a/meta/lib/oeqa/selftest/conf/lic-checksum.conf
b/meta/lib/oeqa/selftest/conf/lic-checksum.conf
new file mode 100644
index 000..262b8b1
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/lic-checksum.conf
@@ -0,0 +1,4 @@
+[LicenseTests]
+nonmatching_checksum_bitbake_cmd = -c populate_lic emptytest
+nonmatching_checksum_error_msg = emptytest: The new md5 checksum is
8d777f385d3dfec8815d20f7496026dc
+nonmatching_checksum_lic_path_md5 = d41d8cd98f00b204e9800998ecf8427e
diff --git a/meta/lib/oeqa/selftest/lic-checksum.py
b/meta/lib/oeqa/selftest/lic-checksum.py
index df44c97..78590fc 100644
--- a/meta/lib/oeqa/selftest/lic-checksum.py
+++ b/meta/lib/oeqa/selftest/lic-checksum.py
@@ -5,25 +5,35 @@ from oeqa.selftest.base import oeSelfTest
from oeqa.utils.commands import bitbake
from oeqa.utils import CommandError
from oeqa.utils.decorators import testcase
+from oeqa.utils.readconfig import conffile
+
class LicenseTests(oeSelfTest):
+@classmethod
+def setUpClass(cls):
+# Get test configurations from configuration file
+cls.config = conffile(__file__)
+
# Verify that changing a license file that has an absolute path causes
# the license qa to fail due to a mismatched md5sum.
@testcase(1197)
def test_nonmatching_checksum(self):
-bitbake_cmd = '-c populate_lic emptytest'
-error_msg = 'emptytest: The new md5 checksum is
8d777f385d3dfec8815d20f7496026dc'
-
+bitbake_cmd = self.config.get(
+'LicenseTests', 'nonmatching_checksum_bitbake_cmd')
+error_msg = self.config.get(
+ 'LicenseTests', 'nonmatching_checksum_error_msg')
+lic_path_md5 = self.config.get(
+ 'LicenseTests', 'nonmatching_checksum_lic_path_md5')
lic_file, lic_path = tempfile.mkstemp()
os.close(lic_file)
self.track_for_cleanup(lic_path)
self.write_recipeinc('emptytest', """
INHIBIT_DEFAULT_DEPS = "1"
-LIC_FILES_CHKSUM = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e"
-SRC_URI = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e"
-""" % (lic_path, lic_path))
+LIC_FILES_CHKSUM = "file://%s;md5=%s"
+SRC_URI = "file://%s;md5=%s"
+""" % (lic_path, lic_path_md5, lic_path, lic_path_md5))
result = bitbake(bitbake_cmd)
with open(lic_path, "w") as f:
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/20] oeqa.selftest.devtool: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/conf/devtool.conf | 100
meta/lib/oeqa/selftest/devtool.py| 417 +--
2 files changed, 389 insertions(+), 128 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/devtool.conf
diff --git a/meta/lib/oeqa/selftest/conf/devtool.conf
b/meta/lib/oeqa/selftest/conf/devtool.conf
new file mode 100644
index 000..f328c64
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/devtool.conf
@@ -0,0 +1,100 @@
+[DevtoolTests]
+test_create_workspace_prefix = devtoolqa
+test_devtool_add_prefix = %(test_create_workspace_prefix)s
+test_devtool_add_url = http://www.ivarch.com/programs/sources/pv-1.5.3.tar.bz2
+test_devtool_add_tar_file = pv-1.5.3.tar.bz2
+test_devtool_add_dir = pv-1.5.3
+test_devtool_add_package = pv
+test_devtool_add_git_local_prefix = %(test_create_workspace_prefix)s
+test_devtool_add_git_local_pn = dbus-wait
+# We choose an https:// git URL here to check rewriting the URL works
+test_devtool_add_git_local_url = https://git.yoctoproject.org/git/dbus-wait
+test_devtool_add_git_local_checkvars_license = GPLv2
+test_devtool_add_git_local_checkvars_md5 = b234ee4d69f5fce4486a80fdaf4a4263
+test_devtool_add_git_local_checkvars_pv = 0.1
+test_devtool_add_git_local_checkvars_srcuri =
git://git.yoctoproject.org/git/dbus-wait;protocol=https
+test_devtool_add_git_local_checkvars_depends = dbus
+test_devtool_add_git_local_srcrev = 6cc6077a36fe2648a5f993fe7c16c9632f946517
+test_devtool_add_library_recipe1 = libusb1
+test_devtool_add_library_prefix = %(test_create_workspace_prefix)s
+test_devtool_add_library_version = 1.1
+# _recipe2 is linked to _url, _file, _binary and _extra_var
+test_devtool_add_library_recipe2 = libftdi
+test_devtool_add_library_url =
https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.1.tar.bz2
+test_devtool_add_library_file = libftdi1
+test_devtool_add_library_binary = libftdi1.so.2.1.0
+# libftdi's python/CMakeLists.txt is a bit broken, so let's just disable it
+# There's also the matter of it installing cmake files to a path we don't
+# normally cover, which triggers the installed-vs-shipped QA test we have
+# within do_package
+test_devtool_add_library_extra_var = "EXTRA_OECMAKE -- \'-DPYTHON_BINDINGS=OFF
-DLIBFTDI_CMAKE_CONFIG_DIR=${datadir}/cmake/Modules\'"
+test_devtool_add_fetch_prefix = devtoolqa
+# _testver is linked to _url and _testrecipe
+test_devtool_add_fetch_testver = 0.23
+test_devtool_add_fetch_url =
https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-0.23.tar.gz
+test_devtool_add_fetch_testrecipe = python-markupsafe
+test_devtool_add_fetch_fakever = 1.9
+test_devtool_add_fetch_git_prefix = %(test_devtool_add_fetch_prefix)s
+test_devtool_add_fetch_git_url = git://git.yoctoproject.org/libmatchbox
+test_devtool_add_fetch_git_checkrev = 462f0652055d89c648ddd54fd7b03f175c2c6973
+test_devtool_add_fetch_git_testrecipe = libmatchbox2
+test_devtool_add_fetch_git_pv = 1.12
+# To try with version specified
+test_devtool_add_fetch_git_ver = 1.5
+test_devtool_add_fetch_simple_prefix = devtoolqa
+# _testver is linked to _url and _testrecipe
+test_devtool_add_fetch_simple_testver = 1.6.0
+test_devtool_add_fetch_simple_url =
http://www.ivarch.com/programs/sources/pv-1.6.0.tar.bz2
+test_devtool_add_fetch_simple_testrecipe = pv
+test_devtool_modify_prefix = devtoolqa
+test_devtool_modify_recipe = mdadm
+test_devtool_modify_invalid_prefix = %(test_devtool_modify_prefix)s
+test_devtool_modify_invalid_testrecipes = perf kernel-devsrc package-index
core-image-minimal meta-toolchain packagegroup-core-sdk meta-ide-support
+test_devtool_modify_native_prefix = %(test_devtool_modify_prefix)s
+test_devtool_modify_native_testrecipes = mtools-native apt-native
desktop-file-utils-native
+test_devtool_modify_git_prefix = %(test_devtool_modify_prefix)s
+test_devtool_modify_git_testrecipe = mkelfimage
+test_devtool_modify_localfiles_prefix = %(test_devtool_modify_prefix)s
+test_devtool_modify_localfiles_testrecipe = lighttpd
+test_devtool_modify_virtual_prefix = %(test_devtool_modify_prefix)s
+test_devtool_modify_virtual_virtrecipe = virtual/libx11
+test_devtool_modify_virtual_realrecipe = libx11
+test_devtool_update_recipe_prefix = %(test_devtool_modify_prefix)s
+test_devtool_update_recipe_testrecipe = minicom
+test_devtool_update_recipe_git_prefix = %(test_devtool_modify_prefix)s
+test_devtool_update_recipe_git_testrecipe = mtd-utils
+test_devtool_update_recipe_git_srcuri = git://git.infradead.org/mtd-utils.git
+test_devtool_update_recipe_append_prefix = %(test_devtool_modify_prefix)s
+test_devtool_update_recipe_append_testrecipe = mdadm
+test_devtool_update_recipe_append_git_prefix = %(test_devtool_modify_prefix)s
+test_devtool_update_recipe_append_git_testre
[OE-core] [PATCH 11/20] oeqa.selftest.manifest: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/conf/manifest.conf | 8
meta/lib/oeqa/selftest/manifest.py| 22 +++---
2 files changed, 23 insertions(+), 7 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/manifest.conf
diff --git a/meta/lib/oeqa/selftest/conf/manifest.conf
b/meta/lib/oeqa/selftest/conf/manifest.conf
new file mode 100644
index 000..ac5ad56
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/manifest.conf
@@ -0,0 +1,8 @@
+[VerifyManifest]
+setUpClass_buildtarget = core-image-minimal
+setUpClass_classname = VerifyManifest
+# the setup should bitbake core-image-minimal and here it is required
+# to do an additional setup for the sdk
+SDK_manifest_entries_sdktask = -c populate_sdk
+SDK_manifest_entries_host = nativesdk-packagegroup-sdk-host
+image_manifest_entries_revdir_name = runtime-reverse
diff --git a/meta/lib/oeqa/selftest/manifest.py
b/meta/lib/oeqa/selftest/manifest.py
index 44d0404..2f7cd29 100644
--- a/meta/lib/oeqa/selftest/manifest.py
+++ b/meta/lib/oeqa/selftest/manifest.py
@@ -4,6 +4,8 @@ import os
from oeqa.selftest.base import oeSelfTest
from oeqa.utils.commands import get_bb_var, bitbake
from oeqa.utils.decorators import testcase
+from oeqa.utils.readconfig import conffile
+
class ManifestEntry:
'''A manifest item of a collection able to list missing packages'''
@@ -48,9 +50,12 @@ class VerifyManifest(oeSelfTest):
@classmethod
def setUpClass(self):
-self.buildtarget = 'core-image-minimal'
-self.classname = 'VerifyManifest'
-
+# Get test configurations from configuration file
+self.config = conffile(__file__)
+self.buildtarget = self.config.get(
+ 'VerifyManifest', 'setUpClass_buildtarget')
+self.classname = self.config.get(
+ 'VerifyManifest', 'setUpClass_classname')
self.log.info("{}: doing bitbake {} as a prerequisite of the test"\
.format(self.classname, self.buildtarget))
if bitbake(self.buildtarget).status:
@@ -65,7 +70,9 @@ class VerifyManifest(oeSelfTest):
# the setup should bitbake core-image-minimal and here it is required
# to do an additional setup for the sdk
-sdktask = '-c populate_sdk'
+sdktask = self.config.get(
+'VerifyManifest', 'SDK_manifest_entries_sdktask')
+host = self.config.get('VerifyManifest', 'SDK_manifest_entries_host')
bbargs = sdktask + ' ' + self.buildtarget
self.log.debug("{}: doing bitbake {} as a prerequisite of the test"\
.format(self.classname, bbargs))
@@ -79,8 +86,7 @@ class VerifyManifest(oeSelfTest):
pkgdata_dir = reverse_dir = {}
mfilename = mpath = m_entry = {}
# get manifest location based on target to query about
-d_target= dict(target = self.buildtarget,
- host = 'nativesdk-packagegroup-sdk-host')
+d_target = dict(target=self.buildtarget, host=host)
try:
mdir = self.get_dir_from_bb_var('SDK_DEPLOY', self.buildtarget)
for k in d_target.keys():
@@ -130,6 +136,8 @@ class VerifyManifest(oeSelfTest):
'''Verifying the image manifest entries exist'''
# get manifest location based on target to query about
+revdir_name = self.config.get(
+'VerifyManifest', 'image_manifest_entries_revdir_name')
try:
mdir = self.get_dir_from_bb_var('DEPLOY_DIR_IMAGE',
self.buildtarget)
@@ -142,7 +150,7 @@ class VerifyManifest(oeSelfTest):
pkgdata_dir = {}
pkgdata_dir = self.get_dir_from_bb_var('PKGDATA_DIR',
self.buildtarget)
-revdir = os.path.join(pkgdata_dir, 'runtime-reverse')
+revdir = os.path.join(pkgdata_dir, revdir_name)
if not os.path.exists(revdir): raise IOError
except OSError:
raise unittest.SkipTest("{}: Error in obtaining manifest dirs"\
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/20] oeqa.selftest.oescripts: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/conf/oescripts.conf | 6 ++
meta/lib/oeqa/selftest/oescripts.py| 31 ++
2 files changed, 29 insertions(+), 8 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/oescripts.conf
diff --git a/meta/lib/oeqa/selftest/conf/oescripts.conf
b/meta/lib/oeqa/selftest/conf/oescripts.conf
new file mode 100644
index 000..815c45e
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/oescripts.conf
@@ -0,0 +1,6 @@
+[TestScripts]
+cleanup_workdir_package = gzip
+cleanup_workdir_old_version = 1.3.12
+
+[BuildhistoryDiffTests]
+buildhistory_diff_target = xcursor-transparent-theme
diff --git a/meta/lib/oeqa/selftest/oescripts.py
b/meta/lib/oeqa/selftest/oescripts.py
index 31cd508..5c734b50 100644
--- a/meta/lib/oeqa/selftest/oescripts.py
+++ b/meta/lib/oeqa/selftest/oescripts.py
@@ -9,27 +9,39 @@ from oeqa.selftest.base import oeSelfTest
from oeqa.selftest.buildhistory import BuildhistoryBase
from oeqa.utils.commands import Command, runCmd, bitbake, get_bb_var,
get_test_layer
from oeqa.utils.decorators import testcase
+from oeqa.utils.readconfig import conffile
+
class TestScripts(oeSelfTest):
+@classmethod
+def setUpClass(cls):
+# Get test configurations from configuration file
+cls.config = conffile(__file__)
+
@testcase(300)
def test_cleanup_workdir(self):
-path = os.path.dirname(get_bb_var('WORKDIR', 'gzip'))
-old_version_recipe = os.path.join(get_bb_var('COREBASE'),
'meta/recipes-extended/gzip/gzip_1.3.12.bb')
-old_version = '1.3.12'
-bitbake("-ccleansstate gzip")
+package = self.config.get('TestScripts', 'cleanup_workdir_package')
+old_version = self.config.get(
+'TestScripts', 'cleanup_workdir_old_version')
+path = os.path.dirname(get_bb_var('WORKDIR', package))
+old_version_recipe = os.path.join(
+ get_bb_var('COREBASE'),
+ 'meta/recipes-extended/%s/%s_%s.bb'
+ % (package, package, old_version))
+bitbake("-ccleansstate %s" % package)
bitbake("-ccleansstate -b %s" % old_version_recipe)
if os.path.exists(get_bb_var('WORKDIR', "-b %s" % old_version_recipe)):
shutil.rmtree(get_bb_var('WORKDIR', "-b %s" % old_version_recipe))
-if os.path.exists(get_bb_var('WORKDIR', 'gzip')):
-shutil.rmtree(get_bb_var('WORKDIR', 'gzip'))
+if os.path.exists(get_bb_var('WORKDIR', package)):
+shutil.rmtree(get_bb_var('WORKDIR', package))
if os.path.exists(path):
initial_contents = os.listdir(path)
else:
initial_contents = []
-bitbake('gzip')
+bitbake(package)
intermediary_contents = os.listdir(path)
bitbake("-b %s" % old_version_recipe)
runCmd('cleanup-workdir')
@@ -45,8 +57,11 @@ class BuildhistoryDiffTests(BuildhistoryBase):
@testcase(295)
def test_buildhistory_diff(self):
+# Get test configurations from configuration file
+configlocal = conffile(__file__)
+target = configlocal.get(
+ 'BuildhistoryDiffTests', 'buildhistory_diff_target')
self.add_command_to_tearDown('cleanup-workdir')
-target = 'xcursor-transparent-theme'
self.run_buildhistory_operation(target, target_config="PR = \"r1\"",
change_bh_location=True)
self.run_buildhistory_operation(target, target_config="PR = \"r0\"",
change_bh_location=False, expect_error=True)
result = runCmd("buildhistory-diff -p %s" %
get_bb_var('BUILDHISTORY_DIR'))
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/20] oeqa.selftest.pkgdata: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/conf/pkgdata.conf | 39
meta/lib/oeqa/selftest/pkgdata.py| 373 ++-
2 files changed, 305 insertions(+), 107 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/pkgdata.conf
diff --git a/meta/lib/oeqa/selftest/conf/pkgdata.conf
b/meta/lib/oeqa/selftest/conf/pkgdata.conf
new file mode 100644
index 000..4d7a667
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/pkgdata.conf
@@ -0,0 +1,39 @@
+[OePkgdataUtilTests]
+setUpClass_package_1 = glibc
+setUpClass_package_2 = busybox
+setUpClass_package_3 = zlib
+setUpClass_package_4 = bash
+lookup_pkg_package_1 = glibc
+lookup_pkg_package_2 = busybox
+lookup_pkg_package_3 = libc6
+lookup_pkg_package_4 = zlib-dev
+lookup_pkg_package_5 = libz-dev
+lookup_pkg_package_6 = nonexistentpkg
+read_value_package_1 = libz1
+read_value_package_2 = zlib
+read_value_package_3 = bash
+find_path_package_1 = libc.so.6
+find_path_package_2 = glibc
+find_path_package_3 = bash
+lookup_recipe_package_1 = libc6-staticdev
+lookup_recipe_package_2 = busybox
+lookup_recipe_package_3 = glibc
+lookup_recipe_package_4 = libz-dbg
+lookup_recipe_package_5 = zlib
+lookup_recipe_package_6 = nonexistentpkg
+list_pkgs_package_1 = list-pkgs
+list_pkgs_package_2 = glibc-utils
+list_pkgs_package_3 = zlib-dev
+list_pkgs_package_4 = libc6-utils
+list_pkgs_package_5 = libz-dev
+list_pkgs_package_6 = zlib
+list_pkgs_package_7 = libz
+list_pkg_files_package_1 = zlib
+list_pkg_files_package_2 = libz
+glob_package_1 = libc6
+glob_package_2 = libz
+glob_package_3 = busybox
+glob_package_4 = glibc
+glob_prefix = pkgdataqa
+specify_pkgdatadir_package_1 = glibc
+specify_pkgdatadir_package_2 = libc6
diff --git a/meta/lib/oeqa/selftest/pkgdata.py
b/meta/lib/oeqa/selftest/pkgdata.py
index 5a63f89..f2a5c22 100644
--- a/meta/lib/oeqa/selftest/pkgdata.py
+++ b/meta/lib/oeqa/selftest/pkgdata.py
@@ -8,107 +8,197 @@ import oeqa.utils.ftools as ftools
from oeqa.selftest.base import oeSelfTest
from oeqa.utils.commands import runCmd, bitbake, get_bb_var
from oeqa.utils.decorators import testcase
+from oeqa.utils.readconfig import conffile
+
class OePkgdataUtilTests(oeSelfTest):
@classmethod
def setUpClass(cls):
+# Get test configurations from configuration file
+cls.config = conffile(__file__)
# Ensure we have the right data in pkgdata
logger = logging.getLogger("selftest")
logger.info('Running bitbake to generate pkgdata')
-bitbake('glibc busybox zlib bash')
+package_1 = cls.config.get(
+ 'OePkgdataUtilTests', 'setUpClass_package_1')
+package_2 = cls.config.get(
+ 'OePkgdataUtilTests', 'setUpClass_package_2')
+package_3 = cls.config.get(
+ 'OePkgdataUtilTests', 'setupClass_package_3')
+package_4 = cls.config.get(
+ 'OePkgdataUtilTests', 'setupClass_package_4')
+bitbake('%s %s %s %s' % (package_1, package_2, package_3, package_4))
@testcase(1203)
def test_lookup_pkg(self):
+package_1 = self.config.get(
+ 'OePkgdataUtilTests', 'lookup_pkg_package_1')
+package_2 = self.config.get(
+ 'OePkgdataUtilTests', 'lookup_pkg_package_2')
+package_3 = self.config.get(
+ 'OePkgdataUtilTests', 'lookup_pkg_package_3')
+package_4 = self.config.get(
+ 'OePkgdataUtilTests', 'lookup_pkg_package_4')
+package_5 = self.config.get(
+ 'OePkgdataUtilTests', 'lookup_pkg_package_5')
+package_6 = self.config.get(
+ 'OePkgdataUtilTests', 'lookup_pkg_package_6')
# Forward tests
-result = runCmd('oe-pkgdata-util lookup-pkg "glibc busybox"')
-self.assertEqual(result.output, 'libc6\nbusybox')
-result = runCmd('oe-pkgdata-util lookup-pkg zlib-dev')
-self.assertEqual(result.output, 'libz-dev')
-result = runCmd('oe-pkgdata-util lookup-pkg nonexistentpkg',
ignore_status=True)
+result = runCmd(
+ 'oe-pkgdata-util lookup-pkg "%s %s"' % (package_1, package_2))
+self.assertEqual(result.output, '%s\n%s' % (package_3, package_2))
+result = runCmd('oe-pkgdata-util lookup-pkg %s' % package_4)
+self.assertEqual(result.output, package_5)
+result = runCmd('oe-pkgdata-util lookup-pkg %s' % package_6,
+ignore_status=True)
self.assertEqual(result.status, 1, "Status different than 1. output:
%s" % result.output)
self.assertEqual(result.output, 'ERROR: The following packages could
not be found: nonexistentpkg')
# Reverse tests
-result = runCmd
[OE-core] [PATCH 09/20] oeqa.selftest.layerappend: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/conf/layerappend.conf | 40 +
meta/lib/oeqa/selftest/layerappend.py| 88 +---
2 files changed, 80 insertions(+), 48 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/layerappend.conf
diff --git a/meta/lib/oeqa/selftest/conf/layerappend.conf
b/meta/lib/oeqa/selftest/conf/layerappend.conf
new file mode 100644
index 000..11d4520
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/layerappend.conf
@@ -0,0 +1,40 @@
+[LayerAppendTests]
+layerconf = """
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*.bb
${LAYERDIR}/recipes*/*.bbappend"
+
+BBFILE_COLLECTIONS += "meta-layerINT"
+BBFILE_PATTERN_meta-layerINT := "^${LAYERDIR}/"
+BBFILE_PRIORITY_meta-layerINT = "6"
+"""
+recipe = """
+LICENSE="CLOSED"
+INHIBIT_DEFAULT_DEPS = "1"
+
+python do_build() {
+bb.plain('Building ...')
+}
+addtask build
+"""
+append = """
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append = " file://appendtest.txt"
+
+sysroot_stage_all_append() {
+install -m 644 ${WORKDIR}/appendtest.txt
${SYSROOT_DESTDIR}/
+}
+
+"""
+append2 = """
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append += "file://appendtest.txt"
+"""
+layerappend = ''
+
+layer_appends_layername = layertest
+layer_appends_dirname = recipes-test
diff --git a/meta/lib/oeqa/selftest/layerappend.py
b/meta/lib/oeqa/selftest/layerappend.py
index 4de5034..e005952 100644
--- a/meta/lib/oeqa/selftest/layerappend.py
+++ b/meta/lib/oeqa/selftest/layerappend.py
@@ -8,44 +8,22 @@ from oeqa.selftest.buildhistory import BuildhistoryBase
from oeqa.utils.commands import runCmd, bitbake, get_bb_var
import oeqa.utils.ftools as ftools
from oeqa.utils.decorators import testcase
+from oeqa.utils.readconfig import conffile
-class LayerAppendTests(oeSelfTest):
-layerconf = """
-# We have a conf and classes directory, append to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes*/*.bb ${LAYERDIR}/recipes*/*.bbappend"
-
-BBFILE_COLLECTIONS += "meta-layerINT"
-BBFILE_PATTERN_meta-layerINT := "^${LAYERDIR}/"
-BBFILE_PRIORITY_meta-layerINT = "6"
-"""
-recipe = """
-LICENSE="CLOSED"
-INHIBIT_DEFAULT_DEPS = "1"
-
-python do_build() {
-bb.plain('Building ...')
-}
-addtask build
-"""
-append = """
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI_append = " file://appendtest.txt"
-sysroot_stage_all_append() {
- install -m 644 ${WORKDIR}/appendtest.txt ${SYSROOT_DESTDIR}/
-}
-
-"""
+class LayerAppendTests(oeSelfTest):
-append2 = """
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+@classmethod
+def setUpClass(cls):
+# Get test configurations from configuration file
+cls.config = conffile(__file__)
+cls.layerconf = eval(cls.config.get('LayerAppendTests', 'layerconf'))
+cls.recipe = eval(cls.config.get('LayerAppendTests', 'recipe'))
+cls.append = eval(cls.config.get('LayerAppendTests', 'append'))
+cls.append2 = eval(cls.config.get('LayerAppendTests', 'append2'))
+cls.layerappend = eval(cls.config.get(
+'LayerAppendTests', 'layerappend'))
-SRC_URI_append += "file://appendtest.txt"
-"""
layerappend = ''
def tearDownLocal(self):
@@ -54,46 +32,60 @@ SRC_URI_append += "file://appendtest.txt"
@testcase(1196)
def test_layer_appends(self):
+layername = self.config.get(
+ 'LayerAppendTests', 'layer_appends_layername')
+dirname = self.config.get(
+'LayerAppendTests', 'layer_appends_dirname')
corebase = get_bb_var("COREBASE")
stagingdir = get_bb_var("STAGING_DIR_TARGET")
for l in ["0", "1", "2"]:
-layer = os.path.join(corebase, "meta-layertest" + l)
+
[OE-core] [PATCH 17/20] oeqa.selftest.signing: Split configuration from code
Improve oeqa-selftest capabilities and UX by placing
test configuration features and variables into a separate
configuration file.
[Yocto 9389]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/conf/signing.conf | 15
meta/lib/oeqa/selftest/signing.py| 119 +++
2 files changed, 90 insertions(+), 44 deletions(-)
create mode 100644 meta/lib/oeqa/selftest/conf/signing.conf
diff --git a/meta/lib/oeqa/selftest/conf/signing.conf
b/meta/lib/oeqa/selftest/conf/signing.conf
new file mode 100644
index 000..c95d247
--- /dev/null
+++ b/meta/lib/oeqa/selftest/conf/signing.conf
@@ -0,0 +1,15 @@
+[Signing]
+setUpClass_prefix = oeqa-signing-
+# key.secret and key.pub are located in gpg_dir
+setUpClass_pub_keyname = key.pub
+setUpClass_secret_keyname = key.secret
+setUpClass_test_recipe = ed
+setUpClass_passphrase = test123
+signing_packages_inherit = sign_rpm
+signing_packages_name = testuser
+[LockedSignatures]
+locked_signatures_locked_sigs_file = locked-sigs.inc
+locked_signatures_feature = require %(locked_signatures_locked_sigs_file)s
+SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"
+locked_signatures_recipe_dir = recipes-test
+locked_signatures_summary = test locked signature
diff --git a/meta/lib/oeqa/selftest/signing.py
b/meta/lib/oeqa/selftest/signing.py
index 4c12d6d..8ce45c3 100644
--- a/meta/lib/oeqa/selftest/signing.py
+++ b/meta/lib/oeqa/selftest/signing.py
@@ -7,13 +7,12 @@ import shutil
import tempfile
from oeqa.utils.decorators import testcase
from oeqa.utils.ftools import write_file
+from oeqa.utils.readconfig import conffile
class Signing(oeSelfTest):
gpg_dir = ""
-pub_key_path = ""
-secret_key_path = ""
@classmethod
def setUpClass(cls):
@@ -21,11 +20,19 @@ class Signing(oeSelfTest):
if not shutil.which("gpg"):
raise AssertionError("This test needs GnuPG")
-cls.gpg_home_dir = tempfile.TemporaryDirectory(prefix="oeqa-signing-")
+cls.config = conffile(__file__)
+prefix = cls.config.get('Signing', 'setUpClass_prefix')
+pub_keyname = cls.config.get('Signing', 'setUpClass_pub_keyname')
+secret_keyname = cls.config.get('Signing', 'setUpClass_secret_keyname')
+cls.test_recipe = cls.config.get('Signing', 'setUpClass_test_recipe')
+cls.passphrase = cls.config.get('Signing', 'setUpClass_passphrase')
+cls.gpg_home_dir = tempfile.TemporaryDirectory(prefix)
cls.gpg_dir = cls.gpg_home_dir.name
-cls.pub_key_path = os.path.join(cls.testlayer_path, 'files',
'signing', "key.pub")
-cls.secret_key_path = os.path.join(cls.testlayer_path, 'files',
'signing', "key.secret")
+cls.pub_key_path = os.path.join(cls.testlayer_path, 'files', 'signing',
+pub_keyname)
+cls.secret_key_path = os.path.join(cls.testlayer_path, 'files',
+ 'signing', secret_keyname)
runCmd('gpg --homedir %s --import %s %s' % (cls.gpg_dir,
cls.pub_key_path, cls.secret_key_path))
@@ -40,32 +47,36 @@ class Signing(oeSelfTest):
"""
import oe.packagedata
+# Test configuration is taken from conf file
+inherit = self.config.get('Signing', 'signing_packages_inherit')
+passphrase = self.config.get('Signing', 'setupClass_passphrase')
+name = self.config.get('Signing', 'signing_packages_name')
package_classes = get_bb_var('PACKAGE_CLASSES')
if 'package_rpm' not in package_classes:
self.skipTest('This test requires RPM Packaging.')
-test_recipe = 'ed'
-
-feature = 'INHERIT += "sign_rpm"\n'
-feature += 'RPM_GPG_PASSPHRASE = "test123"\n'
-feature += 'RPM_GPG_NAME = "testuser"\n'
+feature = 'INHERIT += "%s"\n' % inherit
+feature += 'RPM_GPG_PASSPHRASE = "%s"\n' % passphrase
+feature += 'RPM_GPG_NAME = "%s"\n' % name
feature += 'RPM_GPG_PUBKEY = "%s"\n' % self.pub_key_path
feature += 'GPG_PATH = "%s"\n' % self.gpg_dir
self.write_config(feature)
-bitbake('-c cleansstate %s' % test_recipe)
-bitbake(test_recipe)
-self.add_command_to_tearDown('bitbake -c clean %s' % test_recipe)
+bitbake('-c cleansstate %s' % self.test_recipe)
+bitbake(self.test_recipe)
+self.add_command_to_tearDown('bitbake -c clean %s' % self.test_recipe)
-pkgdatadir = get_bb_var('PKGDATA_DIR', test_recipe)
-pkgdata = oe.packagedata.read_pkgdatafile(pkgdatadir + "/runtime/ed")
+pkgdatadir = get_bb_var('PKGDATA_DIR', self.test_recipe)
+pkgdata = oe.packagedata.read_pkgdatafile(pkgdatadir + "
Re: [OE-core] [PATCH 19/20] oeqa.selftest.wic: Split configuration from code
Hi Ed, thanks for your quick response.
On 08/09/2016 02:26 AM, Ed Bartosh wrote:
> Hi Jose,
>
> On Mon, Aug 08, 2016 at 09:23:07AM -0700, Jose Lamego wrote:
>> Improve oeqa-selftest capabilities and UX by placing
>> test configuration features and variables into a separate
>> configuration file.
>>
>
> Frankly I have mixed feelings about these changes. From the first look
> splitting configuration and code is a good idea. However, looking at the
> result I must say I feel like the test became less readable and harder
> to understand and maintain.
>
> May be the changes make sense for other tests, but for this one they make
> my life as a maintainer of this one less easy I'd say.
I totally understand you point. But before we drop the idea of this
change for wic, would there be a way to keep the code understandable
while leveraging on the configuration file to be able to easily try
different input/output combinations without touching the test code
(which is the basic purpose of the change)? Maybe renaming the conf
variables (see below proposals)?
If you still believe there would be no benefits from this change, it
will be better to skip it for wic.
>
>> [Yocto 9389]
>>
>> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
>> ---
>> meta/lib/oeqa/selftest/conf/wic.conf | 10 +++
>> meta/lib/oeqa/selftest/wic.py| 150
>> ---
>> 2 files changed, 98 insertions(+), 62 deletions(-)
>> create mode 100644 meta/lib/oeqa/selftest/conf/wic.conf
>>
>> diff --git a/meta/lib/oeqa/selftest/conf/wic.conf
>> b/meta/lib/oeqa/selftest/conf/wic.conf
>> new file mode 100644
>> index 000..e2afb8d
>> --- /dev/null
>> +++ b/meta/lib/oeqa/selftest/conf/wic.conf
>> @@ -0,0 +1,10 @@
>> +[Wic]
>> +setUpClass_image1 = core-image-minimal
>> +setUpClass_image2 = minimal
> setUpClass_image2 is not used in the code.
>
>> +setUpClass_image3 = qemux86-directdisk
>> +setUpClass_image4 = directdisk
>> +setUpClass_image5 = wic-image-minimal
> setUpClass_image1 is an image produced by bitbake, but setUpClass_image3
> is a name of wic image. They're not the same. Bitbake image is an input
> for wic and wic image is an output. setUpClass_image5 is again the name
> of the bitbake target, but it differs from _image3. Naming doesn't reflect
> this fact.
setUpClass_image1 could be renamed to setUpClass_bitbakeImage1
setUpClass_image3 could be renamed to setClass_wicImage
setUpClass_image5 to setUpClass_bitbakeImage2
>
>
>> +setUpClass_features = IMAGE_FSTYPES += " hddimg"
>> + MACHINE_FEATURES_append = " efi"
>> +setUpClass_recipes = syslinux syslinux-native parted-native gptfdisk-native
>> dosfstools-native mtools-native bmap-tools-native
> This list is used only once in the test. Moving it to config file makes
> it longer to understand what's in the list.
>
>> diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
>> index e550785..dc81457 100644
>> --- a/meta/lib/oeqa/selftest/wic.py
>> +++ b/meta/lib/oeqa/selftest/wic.py
>> @@ -31,6 +31,7 @@ from shutil import rmtree
>> from oeqa.selftest.base import oeSelfTest
>> from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu
>> from oeqa.utils.decorators import testcase
>> +from oeqa.utils.readconfig import conffile
>>
>>
>> class Wic(oeSelfTest):
>> @@ -39,6 +40,18 @@ class Wic(oeSelfTest):
>> resultdir = "/var/tmp/wic/build/"
>> image_is_ready = False
>>
>> +@classmethod
>> +def setUpClass(cls):
>> +# Get test configurations from configuration file
>> +cls.config = conffile(__file__)
>> +cls.image1 = cls.config.get('Wic', 'setUpClass_image1')
>> +cls.image2 = cls.config.get('Wic', 'setUpClass_image2')
>> +cls.image3 = cls.config.get('Wic', 'setUpClass_image3')
>> +cls.image4 = cls.config.get('Wic', 'setUpClass_image4')
>> +cls.image5 = cls.config.get('Wic', 'setUpClass_image5')
>> +cls.features = cls.config.get('Wic', 'setUpClass_features')
>> +cls.recipes = cls.config.get('Wic', 'setUpClass_recipes')
> This looks like a duplication of code and configuration and also hides real
> image names and features making test much less readable.
>
>> +
>> def setUpLocal(self):
>> """This code is executed before each test method."""
>> self.write_config('IMAGE_FSTYPES += " hddimg"\n'
>> @@ -48,9 +61,8 @@ class Wic(oeSelfTest):
>>
Re: [OE-core] [PATCH 3/3] python3-setuptools: Remove pth file creation at recipe level
Ping.
On 01/17/2017 09:42 AM, Jose Lamego wrote:
> Handling of installed eggs is now performed at the distutils3 bbclass.
>
> This change removes the pth file creation at recipe level.
>
> [YOCTO #8673]
>
> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
> ---
> meta/recipes-devtools/python/python3-setuptools_31.0.0.bb | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
> b/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
> index 65af6f0..b37b381 100644
> --- a/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
> +++ b/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
> @@ -7,11 +7,8 @@ inherit distutils3
>
> DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR}"
>
> -# The installer puts the wrong path in the setuptools.pth file. Correct it.
> do_install_append() {
> -rm ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
> mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install
> -echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" >
> ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
> }
>
> RDEPENDS_${PN} = "\
>
--
Jose Lamego | OTC Embedded Platforms & Tools | GDC
signature.asc
Description: OpenPGP digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] python3-pip: Remove pth file creation at recipe level
Ping.
On 01/17/2017 09:42 AM, Jose Lamego wrote:
> Handling of installed eggs is now performed at the distutils3 bbclass.
>
> This change removes the pth file creation at recipe level.
>
> [YOCTO #8673]
>
> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
> ---
> meta/recipes-devtools/python/python3-pip_9.0.1.bb | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/meta/recipes-devtools/python/python3-pip_9.0.1.bb
> b/meta/recipes-devtools/python/python3-pip_9.0.1.bb
> index 6ac94bb..9dce107 100644
> --- a/meta/recipes-devtools/python/python3-pip_9.0.1.bb
> +++ b/meta/recipes-devtools/python/python3-pip_9.0.1.bb
> @@ -31,9 +31,6 @@ do_install_append() {
>
> # Install as pip3 and leave pip2 as default
> rm ${D}/${bindir}/pip
> -
> -# Installed eggs need to be passed directly to the interpreter via a pth
> file
> -echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" >
> ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}-${PV}.pth
> }
>
> RDEPENDS_${PN} = "\
>
--
Jose Lamego | OTC Embedded Platforms & Tools | GDC
signature.asc
Description: OpenPGP digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] distutils3.bbclass: add egg files/directories to python path
Ping.
On 01/17/2017 09:42 AM, Jose Lamego wrote:
> Packages that use .egg files or directories for installation may
> not be found when imported at the python3 interpreter.
> .egg files/directories path must be included in a .pth file to
> be appropriately included in python path.
>
> This change looks for .egg files/directories in sitepackages
> and adds its path to a .pth file during package installation.
> It ensures that any new package that uses .egg files/recipes
> will be appropriately added to path by performing the check from
> the distutils3 class.
>
> [YOCTO #8673]
>
> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
> ---
> meta/classes/distutils3.bbclass | 10 ++
> 1 file changed, 10 insertions(+)
>
> diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass
> index a6720c5..f8e2e2e 100644
> --- a/meta/classes/distutils3.bbclass
> +++ b/meta/classes/distutils3.bbclass
> @@ -68,6 +68,16 @@ distutils3_do_install() {
> mv -f ${D}${datadir}/share/* ${D}${datadir}/
> rmdir ${D}${datadir}/share
> fi
> +
> +# detect if .egg files/directories were created and add their
> +# path to a .pth file
> +SHORT_PN=$(echo "${PN}" | sed 's/${PYTHON_PN}-//g')
> +if test -e ${D}${PYTHON_SITEPACKAGES_DIR}/${SHORT_PN}*.egg; then
> +EGG_NAME=$(basename $(find ${D}${PYTHON_SITEPACKAGES_DIR}/ \
> +-name ${SHORT_PN}\*.egg))
> +echo "./${EGG_NAME}" > ${D}${PYTHON_SITEPACKAGES_DIR}/\
> +${SHORT_PN}.pth
> +fi
> }
> distutils3_do_install[vardepsexclude] = "MACHINE"
>
>
--
Jose Lamego | OTC Embedded Platforms & Tools | GDC
signature.asc
Description: OpenPGP digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Patchwork not picking changes from the ML Was: [oe] [meta-python][PATCH] python-paho-mqtt: update to version 1.2
On 02/22/2017 02:55 PM, Michael Halstead wrote:
> I've seen several issues with hooks. I was working on them yesterday and
> will continue today.
>
> These are currently managed by hand but we are moving them into
> configuration management which should help keep them working consistently.
Michael: one syntax error in patchwork code was pulled into production
yesterday. This is the cause for missing patches. The error is fixed in
the Yocto repo now, please perform a server code update ASAP.
Martin: I will look at the UI issue you are describing and file a bug if
needed.
>
> On Feb 22, 2017 12:47 PM, "Martin Jansa" <martin.ja...@gmail.com
> <mailto:martin.ja...@gmail.com>> wrote:
>
> On Wed, Feb 22, 2017 at 12:45:36PM -0500, Derek Straka wrote:
> > Signed-off-by: Derek Straka <de...@asterius.io
> <mailto:de...@asterius.io>>
>
> It's not your fault Derek, but most of the patches from today and based
> on the pings from today also some earlier patches didn't make it into
> patchwork. This one is the only exception.
>
> Michael, Jose: are you aware of some issues with patchwork? Could it be
> caused by the default Reply-to change from yesterday (or day before
> during OEDAM)?
>
> I know only about issues processing merged changes:
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=10967
> <https://bugzilla.yoctoproject.org/show_bug.cgi?id=10967>
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=10759
> <https://bugzilla.yoctoproject.org/show_bug.cgi?id=10759>
>
> And also UI issue in patchwork that paging doesn't work, e.g.:
>
> https://patchwork.openembedded.org/bundle/jama/master-next/?submitterboth
>
> <https://patchwork.openembedded.org/bundle/jama/master-next/?submitterboth>
> shows that there are 5 pages of changes (which should be in most cases
> marked as accepted by the hook above), but clicking on 2nd page produces
> link which drops the query parameters:
> https://patchwork.openembedded.org/bundle/jama/master-next/?page=2
> <https://patchwork.openembedded.org/bundle/jama/master-next/?page=2>
> so it says "No patches to display"
>
> Regards,
>
> > ---
> > .../python/{python-paho-mqtt_1.1.bb
> <http://python-paho-mqtt_1.1.bb> => python-paho-mqtt_1.2.bb
> <http://python-paho-mqtt_1.2.bb>} | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> > rename
> meta-python/recipes-devtools/python/{python-paho-mqtt_1.1.bb
> <http://python-paho-mqtt_1.1.bb> => python-paho-mqtt_1.2.bb
> <http://python-paho-mqtt_1.2.bb>} (68%)
> >
> > diff --git
> a/meta-python/recipes-devtools/python/python-paho-mqtt_1.1.bb
> <http://python-paho-mqtt_1.1.bb>
> b/meta-python/recipes-devtools/python/python-paho-mqtt_1.2.bb
> <http://python-paho-mqtt_1.2.bb>
> > similarity index 68%
> > rename from
> meta-python/recipes-devtools/python/python-paho-mqtt_1.1.bb
> <http://python-paho-mqtt_1.1.bb>
> > rename to
> meta-python/recipes-devtools/python/python-paho-mqtt_1.2.bb
> <http://python-paho-mqtt_1.2.bb>
> > index b8f5f3f..c8acfc5 100644
> > --- a/meta-python/recipes-devtools/python/python-paho-mqtt_1.1.bb
> <http://python-paho-mqtt_1.1.bb>
> > +++ b/meta-python/recipes-devtools/python/python-paho-mqtt_1.2.bb
> <http://python-paho-mqtt_1.2.bb>
> > @@ -11,5 +11,5 @@ RDEPENDS_${PN} = "\
> > python-threading \
> > "
> >
> > -SRC_URI[md5sum] = "a6407b74eb5e5411e157be1de5c11366"
> > -SRC_URI[sha256sum] =
> "0f7a629efe6e3a2c61b59d3550aa9f2c4529b5689a65fde45e6f1ac36b9a261e"
> > +SRC_URI[md5sum] = "241150b3fcb920ddca4d33181f3238b1"
> > +SRC_URI[sha256sum] =
> "9100a6aa706ab699d414ec02705a21eb66f436184691d0bf1f2a85a6213c6c1f"
> > --
> > 2.7.4
> >
> > --
> > ___
> > Openembedded-devel mailing list
> > openembedded-de...@lists.openembedded.org
> <mailto:openembedded-de...@lists.openembedded.org>
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
> <http://lists.openembedded.org/mailman/listinfo/openembedded-devel>
>
> --
> Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
> <mailto:martin.ja...@gmail.com>
>
> --
>
Re: [OE-core] Patchwork not picking changes from the ML
On 02/24/2017 10:27 AM, Patrick Ohly wrote: > On Fri, 2017-02-24 at 15:33 +0100, Gary Thomas wrote: >> On 2017-02-24 15:21, Patrick Ohly wrote: >>> On Wed, 2017-02-22 at 15:56 -0600, Jose Lamego wrote: >>>> >>>> On 02/22/2017 02:55 PM, Michael Halstead wrote: >>>>> I've seen several issues with hooks. I was working on them yesterday and >>>>> will continue today. >>>>> >>>>> These are currently managed by hand but we are moving them into >>>>> configuration management which should help keep them working consistently. >>>> >>>> Michael: one syntax error in patchwork code was pulled into production >>>> yesterday. This is the cause for missing patches. The error is fixed in >>>> the Yocto repo now, please perform a server code update ASAP. >>>> >>>> Martin: I will look at the UI issue you are describing and file a bug if >>>> needed. >>> >>> Would it perhaps make sense to reply to the original author with an >>> email confirming that his patch is now in Patchwork? It should include a >>> link to the patch series, too. >>> >>> This could have several advantages: >>> * submitters not aware of Patchwork or whether their target >>> currently uses it learn about it and then can follow the >>> progress of their patch >>> * everyone gets a confirmation that the submission made it through >>> the various mail servers and Patchwork itself >>> >>> It still relies on the original submitter to watch out for breakages in >>> the processes, but I guess that can't be avoided with an asynchronous, >>> mail-based process. >>> >> >> I would love to see this added to the process - +1 :-) > > Let me clarify that my original proposal was to reply only to the > original author. That was meant to keep noise down on the list. However, > perhaps it should also go to the list? > > Then others can help check that Patchwork works, as the original author > might not be aware that a response is missing. It also tells everyone > the relevant link in Patchwork. > There is a filed request to enable email notifications in patchwork: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7684 this notifications will let users (both submitter and CC'ed-users) know through an email about any patch status change (including "New"). Users will be able to opt-out of such notifications. However, this do not covers the case when submitter is not registered as a Patchwork user. So, there might be a one-time-only email notification to this kind of submitter, as Patrick suggests. If I don't get any objections for this, I'll file a request in bugzilla next week. -- Jose Lamego | OTC Embedded Platforms & Tools | GDC signature.asc Description: OpenPGP digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [yocto] [Openembedded-architecture] Patchwork and incoming patch testing
On 01/18/2017 08:52 AM, Leonardo Sandoval wrote: > + Jose Lamego > > > Jose is doing recent work on the patchwork UI, perhaps there are already > bugs for the items you are asking. > > > On 01/18/2017 02:40 AM, Jussi Kukkonen wrote: >> This looks great, thanks. >> >> On 17 January 2017 at 20:05, Paul Eggleton >> <paul.eggle...@linux.intel.com <mailto:paul.eggle...@linux.intel.com>> >> wrote: >> >> In any event we are now finally in the >> position where our patchwork instance can be relied upon to >> collect emails, >> and the UI is much improved. This should give us a bit more >> visibility into >> where patches are at in the process, although we are still working >> on a few >> places where patch series status needs to be updated (e.g. when a >> patch goes >> into testing). >> >> >> What's the plan for these status updates -- is the idea that you go to >> patchwork UI to see the state of a specific patch set? >> Or maybe a reply to either patch sender or even the ML? >> There is a request to enable email notifications to submitter for patch status changes in the future: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7684 The idea is that users should have the option to use what they prefer: either the email notifications, or the patchwork web interface. >> On top of patchwork we have built a simple smoke-testing framework >> called >> "patchtest" [5] along with a suite of corresponding tests for OE >> [6]. These >> tests are fairly simplistic at this point but check the basics >> such as whether >> a patch has been properly signed off, etc. We should soon start >> seeing replies >> sent to the mailing list and to submitters with results if there >> are any >> failures, saving us from noticing and pointing out some of the >> more obvious >> classes of mistakes. >> >> >> Is there a reason for patchwork only showing "success" or "failure" >> in the web ui, instead of linking to test results at least in in the >> failure case? > > Jussi, that is a good idea. Right now we need to click into the series, > then into the patches and then one can see the patch test results, > obviously, not the best way. > >> >> >> >> - Jussi >> >> -- Jose Lamego | OTC Embedded Platforms & Tools | GDC signature.asc Description: OpenPGP digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] python3-setuptools: Remove pth file creation at recipe level
Handling of installed eggs is now performed at the distutils3 bbclass.
This change removes the pth file creation at recipe level.
[YOCTO #8673]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/recipes-devtools/python/python3-setuptools_31.0.0.bb | 3 ---
1 file changed, 3 deletions(-)
diff --git a/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
b/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
index 65af6f0..b37b381 100644
--- a/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
@@ -7,11 +7,8 @@ inherit distutils3
DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR}"
-# The installer puts the wrong path in the setuptools.pth file. Correct it.
do_install_append() {
-rm ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install
-echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" >
${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
}
RDEPENDS_${PN} = "\
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] distutils3.bbclass: add egg files/directories to python path
Packages that use .egg files or directories for installation may
not be found when imported at the python3 interpreter.
.egg files/directories path must be included in a .pth file to
be appropriately included in python path.
This change looks for .egg files/directories in sitepackages
and adds its path to a .pth file during package installation.
It ensures that any new package that uses .egg files/recipes
will be appropriately added to path by performing the check from
the distutils3 class.
[YOCTO #8673]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/classes/distutils3.bbclass | 10 ++
1 file changed, 10 insertions(+)
diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass
index a6720c5..f8e2e2e 100644
--- a/meta/classes/distutils3.bbclass
+++ b/meta/classes/distutils3.bbclass
@@ -68,6 +68,16 @@ distutils3_do_install() {
mv -f ${D}${datadir}/share/* ${D}${datadir}/
rmdir ${D}${datadir}/share
fi
+
+# detect if .egg files/directories were created and add their
+# path to a .pth file
+SHORT_PN=$(echo "${PN}" | sed 's/${PYTHON_PN}-//g')
+if test -e ${D}${PYTHON_SITEPACKAGES_DIR}/${SHORT_PN}*.egg; then
+EGG_NAME=$(basename $(find ${D}${PYTHON_SITEPACKAGES_DIR}/ \
+-name ${SHORT_PN}\*.egg))
+echo "./${EGG_NAME}" > ${D}${PYTHON_SITEPACKAGES_DIR}/\
+${SHORT_PN}.pth
+fi
}
distutils3_do_install[vardepsexclude] = "MACHINE"
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] distutils3: add egg files to path
Packages that use egg files or directories for installation may not be found when imported at the python3 interpreter. egg files/directories path must be included in a pth file to be appropriately included in python path. These changes handle the egg files from the distutils3 class to avoid the need to perform it individually at each recipe. [YOCTO #8673] The following changes since commit 63f899a950daf1018999455bafa7a2be8b22f164: bitbake: toaster: bin/toaster whitelist TOASTER_DIR (2017-01-17 13:18:47 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib lamego/bug8673 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lamego/bug8673 Jose Lamego (3): distutils3.bbclass: add egg files/directories to python path python3-pip: Remove pth file creation at recipe level python3-setuptools: Remove pth file creation at recipe level meta/classes/distutils3.bbclass | 10 ++ meta/recipes-devtools/python/python3-pip_9.0.1.bb | 3 --- meta/recipes-devtools/python/python3-setuptools_31.0.0.bb | 3 --- 3 files changed, 10 insertions(+), 6 deletions(-) -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] python3-pip: Remove pth file creation at recipe level
Handling of installed eggs is now performed at the distutils3 bbclass.
This change removes the pth file creation at recipe level.
[YOCTO #8673]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/recipes-devtools/python/python3-pip_9.0.1.bb | 3 ---
1 file changed, 3 deletions(-)
diff --git a/meta/recipes-devtools/python/python3-pip_9.0.1.bb
b/meta/recipes-devtools/python/python3-pip_9.0.1.bb
index 6ac94bb..9dce107 100644
--- a/meta/recipes-devtools/python/python3-pip_9.0.1.bb
+++ b/meta/recipes-devtools/python/python3-pip_9.0.1.bb
@@ -31,9 +31,6 @@ do_install_append() {
# Install as pip3 and leave pip2 as default
rm ${D}/${bindir}/pip
-
-# Installed eggs need to be passed directly to the interpreter via a pth
file
-echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" >
${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}-${PV}.pth
}
RDEPENDS_${PN} = "\
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [yocto] [Openembedded-architecture] Patchwork and incoming patch testing
On 01/18/2017 08:52 AM, Leonardo Sandoval wrote: > + Jose Lamego > > > Jose is doing recent work on the patchwork UI, perhaps there are already > bugs for the items you are asking. > > > On 01/18/2017 02:40 AM, Jussi Kukkonen wrote: >> This looks great, thanks. >> >> On 17 January 2017 at 20:05, Paul Eggleton >> <paul.eggle...@linux.intel.com <mailto:paul.eggle...@linux.intel.com>> >> wrote: >> >> In any event we are now finally in the >> position where our patchwork instance can be relied upon to >> collect emails, >> and the UI is much improved. This should give us a bit more >> visibility into >> where patches are at in the process, although we are still working >> on a few >> places where patch series status needs to be updated (e.g. when a >> patch goes >> into testing). >> >> >> What's the plan for these status updates -- is the idea that you go to >> patchwork UI to see the state of a specific patch set? >> Or maybe a reply to either patch sender or even the ML? >> There is a request to enable email notifications to submitter for patch status changes in the future: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7684 The idea is that users should have the option to use what they prefer: either the email notifications, or the patchwork web interface. >> On top of patchwork we have built a simple smoke-testing framework >> called >> "patchtest" [5] along with a suite of corresponding tests for OE >> [6]. These >> tests are fairly simplistic at this point but check the basics >> such as whether >> a patch has been properly signed off, etc. We should soon start >> seeing replies >> sent to the mailing list and to submitters with results if there >> are any >> failures, saving us from noticing and pointing out some of the >> more obvious >> classes of mistakes. >> >> >> Is there a reason for patchwork only showing "success" or "failure" >> in the web ui, instead of linking to test results at least in in the >> failure case? > > Jussi, that is a good idea. Right now we need to click into the series, > then into the patches and then one can see the patch test results, > obviously, not the best way. > >> >> >> >> - Jussi >> >> -- Jose Lamego | OTC Embedded Platforms & Tools | GDC signature.asc Description: OpenPGP digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oeqa/selftest/base: backup and restore local configuration files
Selftests' cleanup method during test setup is not capable of
restoring local configuration files that remain modified after
aborting a test through a keyboard interruption.
This change creates backups for local.conf and bblayers.conf at
test setup, restore them when found, and deletes them at cleanup.
[YOCTO #9390]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/base.py | 32 +++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/base.py b/meta/lib/oeqa/selftest/base.py
index b5a52fe..b746aff 100644
--- a/meta/lib/oeqa/selftest/base.py
+++ b/meta/lib/oeqa/selftest/base.py
@@ -28,17 +28,47 @@ class oeSelfTest(unittest.TestCase):
def __init__(self, methodName="runTest"):
self.builddir = os.environ.get("BUILDDIR")
self.localconf_path = os.path.join(self.builddir, "conf/local.conf")
+self.localconf_backup = os.path.join(self.builddir, "conf/local.bk")
self.testinc_path = os.path.join(self.builddir, "conf/selftest.inc")
self.local_bblayers_path = os.path.join(self.builddir,
"conf/bblayers.conf")
+self.local_bblayers_backup = os.path.join(self.builddir,
+ "conf/bblayers.bk")
self.testinc_bblayers_path = os.path.join(self.builddir,
"conf/bblayers.inc")
self.machineinc_path = os.path.join(self.builddir, "conf/machine.inc")
self.testlayer_path = oeSelfTest.testlayer_path
self._extra_tear_down_commands = []
-self._track_for_cleanup = [self.testinc_path,
self.testinc_bblayers_path, self.machineinc_path]
+self._track_for_cleanup = [
+self.testinc_path, self.testinc_bblayers_path,
+self.machineinc_path, self.localconf_backup,
+self.local_bblayers_backup]
super(oeSelfTest, self).__init__(methodName)
def setUp(self):
os.chdir(self.builddir)
+# Check if local.conf or bblayers.conf files backup exists
+# from a previous failed test and restore them
+if os.path.isfile(self.localconf_backup) or os.path.isfile(
+self.local_bblayers_path):
+self.log.debug("Found a local.conf and/or bblayers.conf backup \
+from a previously aborted test. Restoring these files now, but tests should \
+be re-executed from a clean environment to ensure accurate results.")
+try:
+shutil.copyfile(self.localconf_backup, self.localconf_path)
+except OSError as e:
+if e.errno != errno.ENOENT:
+raise
+try:
+shutil.copyfile(self.local_bblayers_backup,
+self.local_bblayers_path)
+except OSError as e:
+if e.errno != errno.ENOENT:
+raise
+else:
+# backup local.conf and bblayers.conf
+shutil.copyfile(self.localconf_path, self.localconf_backup)
+shutil.copyfile(self.local_bblayers_path,
+self.local_bblayers_backup)
+self.log.debug("Creating local.conf and bblayers.conf backups.")
# we don't know what the previous test left around in config or inc
files
# if it failed so we need a fresh start
try:
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] oeqa/selftest/base: backup and restore local configuration files
Selftests' cleanup method during test setup is not capable of
restoring local configuration files that remain modified after
aborting a test through a keyboard interruption.
This change creates backups for local.conf and bblayers.conf at
test setup, restore them when found, and deletes them at cleanup.
[YOCTO #9390]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/lib/oeqa/selftest/base.py | 32 +++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/base.py b/meta/lib/oeqa/selftest/base.py
index b5a52fe..26c93f9 100644
--- a/meta/lib/oeqa/selftest/base.py
+++ b/meta/lib/oeqa/selftest/base.py
@@ -28,17 +28,47 @@ class oeSelfTest(unittest.TestCase):
def __init__(self, methodName="runTest"):
self.builddir = os.environ.get("BUILDDIR")
self.localconf_path = os.path.join(self.builddir, "conf/local.conf")
+self.localconf_backup = os.path.join(self.builddir, "conf/local.bk")
self.testinc_path = os.path.join(self.builddir, "conf/selftest.inc")
self.local_bblayers_path = os.path.join(self.builddir,
"conf/bblayers.conf")
+self.local_bblayers_backup = os.path.join(self.builddir,
+ "conf/bblayers.bk")
self.testinc_bblayers_path = os.path.join(self.builddir,
"conf/bblayers.inc")
self.machineinc_path = os.path.join(self.builddir, "conf/machine.inc")
self.testlayer_path = oeSelfTest.testlayer_path
self._extra_tear_down_commands = []
-self._track_for_cleanup = [self.testinc_path,
self.testinc_bblayers_path, self.machineinc_path]
+self._track_for_cleanup = [
+self.testinc_path, self.testinc_bblayers_path,
+self.machineinc_path, self.localconf_backup,
+self.local_bblayers_backup]
super(oeSelfTest, self).__init__(methodName)
def setUp(self):
os.chdir(self.builddir)
+# Check if local.conf or bblayers.conf files backup exists
+# from a previous failed test and restore them
+if os.path.isfile(self.localconf_backup) or os.path.isfile(
+self.local_bblayers_backup):
+self.log.debug("Found a local.conf and/or bblayers.conf backup \
+from a previously aborted test. Restoring these files now, but tests should \
+be re-executed from a clean environment to ensure accurate results.")
+try:
+shutil.copyfile(self.localconf_backup, self.localconf_path)
+except OSError as e:
+if e.errno != errno.ENOENT:
+raise
+try:
+shutil.copyfile(self.local_bblayers_backup,
+self.local_bblayers_path)
+except OSError as e:
+if e.errno != errno.ENOENT:
+raise
+else:
+# backup local.conf and bblayers.conf
+shutil.copyfile(self.localconf_path, self.localconf_backup)
+shutil.copyfile(self.local_bblayers_path,
+self.local_bblayers_backup)
+self.log.debug("Creating local.conf and bblayers.conf backups.")
# we don't know what the previous test left around in config or inc
files
# if it failed so we need a fresh start
try:
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] scripts.send-pull-request: Avoid multiple chain headers
When creating a patch set with cover letter using the send-pull-request script, both the "In-Reply-To" and "References" headers are appended twice in patch 2 and subsequent. This change appends only one header pointing to very first patch in series or to cover letter if available. [Yocto #10718] Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com> --- scripts/send-pull-request | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/send-pull-request b/scripts/send-pull-request index 575549d..a660c37 100755 --- a/scripts/send-pull-request +++ b/scripts/send-pull-request @@ -162,7 +162,7 @@ PATCHES=$(echo $PDIR/*.patch) if [ $AUTO_CL -eq 1 ]; then # Send the cover letter to every recipient, both specified as well as # harvested. Then remove it from the patches list. - eval "git send-email $GIT_TO $GIT_CC $GIT_EXTRA_CC --confirm=always --no-chain-reply-to --suppress-cc=all $CL" + eval "git send-email $GIT_TO $GIT_CC $GIT_EXTRA_CC --confirm=always --no-thread --suppress-cc=all $CL" if [ $? -eq 1 ]; then echo "ERROR: failed to send cover-letter with automatic recipients." exit 1 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] scripts.send-pull-request: Avoid multiple chain headers
When creating a patch set with cover letter using the send-pull-request script, both the "In-Reply-To" and "References" headers are appended twice in patch 2 and subsequent. This change appends only one header pointing to very first patch in series or to cover letter if available. [YOCTO #10718] Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com> --- scripts/send-pull-request | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/send-pull-request b/scripts/send-pull-request index 575549d..a660c37 100755 --- a/scripts/send-pull-request +++ b/scripts/send-pull-request @@ -162,7 +162,7 @@ PATCHES=$(echo $PDIR/*.patch) if [ $AUTO_CL -eq 1 ]; then # Send the cover letter to every recipient, both specified as well as # harvested. Then remove it from the patches list. - eval "git send-email $GIT_TO $GIT_CC $GIT_EXTRA_CC --confirm=always --no-chain-reply-to --suppress-cc=all $CL" + eval "git send-email $GIT_TO $GIT_CC $GIT_EXTRA_CC --confirm=always --no-thread --suppress-cc=all $CL" if [ $? -eq 1 ]; then echo "ERROR: failed to send cover-letter with automatic recipients." exit 1 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] scripts.send-pull-request: Avoid multiple chain headers
On 11/28/2016 03:34 PM, Patrick Ohly wrote: > On Mon, 2016-11-28 at 14:28 -0600, Jose Lamego wrote: >> Agree. Please provide feedback about below comments and I will submit a >> v3 patch. >> >> On 11/28/2016 01:47 PM, Patrick Ohly wrote: >>> On Mon, 2016-11-28 at 10:23 -0600, Jose Lamego wrote: >> More than 1 "In-Reply-To" and "References" message headers are in >> violation of rfc2822 [1] and may cause that some email-related >> applications do not point to the appropriate root message in a >> conversation/series. > > Fixing that makes sense. Just add it as reason and the "why" part is > covered. > >>> And I don't understand why this proposed change has the described >>> effect. Does changing the threading parameters change the output of "git >>> send-email" and thus indirectly the mail headers of the following >>> patches? > > The "how" part still isn't clear to me. Perhaps I'm just dumb, but would > you bear with me and explain a bit more how changing the sending of the > cover letter affects sending of the patches? > The script is duplicating the headers because it contains two individual calls to git-send-email, one for the cover letter (when available) and one for the rest of the series patches, both using the --no-chain-reply option that includes a reference to the first message. What I'm doing here is to include no reference to any root message at the first call, then including a reference at the second call to the very first message in the chain, which is either the cover letter or the patch #1. This change is currently implemented/tested at [2] and complements a change in patchwork [3] that handles messages including repeated headers (created before this change gets implemented). So the comment I would add to patch is: This change appends only one header pointing to very first patch in series or to cover letter if available by calling send-email with thread history option only once, instead of the original twice. [2] patchwork-staging.openembedded.org [3] https://lists.yoctoproject.org/pipermail/yocto/2016-November/033200.html > As it isn't obvious, perhaps even add a comment to the script explaining > it. > -- Jose Lamego | OTC Embedded Platforms & Tools | GDC signature.asc Description: OpenPGP digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] scripts.send-pull-request: Avoid multiple chain headers
Agree. Please provide feedback about below comments and I will submit a v3 patch. On 11/28/2016 01:47 PM, Patrick Ohly wrote: > On Mon, 2016-11-28 at 10:23 -0600, Jose Lamego wrote: More than 1 "In-Reply-To" and "References" message headers are in violation of rfc2822 [1] and may cause that some email-related applications do not point to the appropriate root message in a conversation/series. >> When creating a patch set with cover letter using the >> send-pull-request script, both the "In-Reply-To" and "References" >> headers are appended twice in patch 2 and subsequent. > > The "why" part is missing in the commit header. "Why" is appending those > twice a problem? Is it a bug in the script (because it violates some > RFC) or is it merely a workaround for a problem in other software (mail > programs or Patchwork)? > > I know that this change is related to the issues that Patchwork has with > identifying a patch series, but even with that background knowledge it > is not clear why this fix is the right solution. > This change appends only one header pointing to very first patch in series (patch #1) or to cover letter if available, which results in an appropriate message-chain. [1] https://tools.ietf.org/html/rfc2822#section-3.6 >> >> [YOCTO #10718] >> >> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com> >> --- >> scripts/send-pull-request | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/scripts/send-pull-request b/scripts/send-pull-request >> index 575549d..a660c37 100755 >> --- a/scripts/send-pull-request >> +++ b/scripts/send-pull-request >> @@ -162,7 +162,7 @@ PATCHES=$(echo $PDIR/*.patch) >> if [ $AUTO_CL -eq 1 ]; then >> # Send the cover letter to every recipient, both specified as well as >> # harvested. Then remove it from the patches list. >> -eval "git send-email $GIT_TO $GIT_CC $GIT_EXTRA_CC --confirm=always >> --no-chain-reply-to --suppress-cc=all $CL" >> +eval "git send-email $GIT_TO $GIT_CC $GIT_EXTRA_CC --confirm=always >> --no-thread --suppress-cc=all $CL" >> if [ $? -eq 1 ]; then >> echo "ERROR: failed to send cover-letter with automatic >> recipients." >> exit 1 > > > And I don't understand why this proposed change has the described > effect. Does changing the threading parameters change the output of "git > send-email" and thus indirectly the mail headers of the following > patches? > -- Jose Lamego | OTC Embedded Platforms & Tools | GDC signature.asc Description: OpenPGP digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] maintainers: Change maintainers for python(3) modules
Some packages with recipes for both python2 and python3 must be upgraded simultaneously to avoid version conflicts due to common dependencies. This change distributes responsibilities to provide a single maintainer for related recipes. Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com> --- meta-poky/conf/distro/include/maintainers.inc | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-poky/conf/distro/include/maintainers.inc b/meta-poky/conf/distro/include/maintainers.inc index 54410aa..cdf5c72 100644 --- a/meta-poky/conf/distro/include/maintainers.inc +++ b/meta-poky/conf/distro/include/maintainers.inc @@ -624,7 +624,7 @@ RECIPE_MAINTAINER_pn-python-imaging = "Jose Lamego <jose.a.lam...@linux.intel.co RECIPE_MAINTAINER_pn-python-mako = "Jose Lamego <jose.a.lam...@linux.intel.com>" RECIPE_MAINTAINER_pn-python-native = "Alejandro Hernandez <alejandro.hernan...@linux.intel.com>" RECIPE_MAINTAINER_pn-python-nose = "Jose Lamego <jose.a.lam...@linux.intel.com>" -RECIPE_MAINTAINER_pn-python-numpy = "Jose Lamego <jose.a.lam...@linux.intel.com>" +RECIPE_MAINTAINER_pn-python-numpy = "Edwin Plauchu <edwin.plauchu.cama...@linux.intel.com>" RECIPE_MAINTAINER_pn-python-pexpect = "Jose Lamego <jose.a.lam...@linux.intel.com>" RECIPE_MAINTAINER_pn-python-ptyprocess = "Jose Lamego <jose.a.lam...@linux.intel.com>" RECIPE_MAINTAINER_pn-python-pycairo = "Jose Lamego <jose.a.lam...@linux.intel.com>" @@ -633,7 +633,7 @@ RECIPE_MAINTAINER_pn-python-pygtk = "Jose Lamego <jose.a.lam...@linux.intel.com> RECIPE_MAINTAINER_pn-python-pyrex = "Jose Lamego <jose.a.lam...@linux.intel.com>" RECIPE_MAINTAINER_pn-python-scons = "Jose Lamego <jose.a.lam...@linux.intel.com>" RECIPE_MAINTAINER_pn-python-scons-native = "Jose Lamego <jose.a.lam...@linux.intel.com>" -RECIPE_MAINTAINER_pn-python-setuptools = "Jose Lamego <jose.a.lam...@linux.intel.com>" +RECIPE_MAINTAINER_pn-python-setuptools = "Edwin Plauchu <edwin.plauchu.cama...@linux.intel.com>" RECIPE_MAINTAINER_pn-python-six = "Jose Lamego <jose.a.lam...@linux.intel.com>" RECIPE_MAINTAINER_pn-python-smartpm = "Jose Lamego <jose.a.lam...@linux.intel.com>" RECIPE_MAINTAINER_pn-python-smmap = "Jose Lamego <jose.a.lam...@linux.intel.com>" @@ -642,9 +642,9 @@ RECIPE_MAINTAINER_pn-python3-async = "Edwin Plauchu <edwin.plauchu.camacho@linux RECIPE_MAINTAINER_pn-python3-dbus = "Edwin Plauchu <edwin.plauchu.cama...@linux.intel.com>" RECIPE_MAINTAINER_pn-python3-distribute = "Edwin Plauchu <edwin.plauchu.cama...@linux.intel.com>" RECIPE_MAINTAINER_pn-python3-docutils = "Edwin Plauchu <edwin.plauchu.cama...@linux.intel.com>" -RECIPE_MAINTAINER_pn-python3-git = "Edwin Plauchu <edwin.plauchu.cama...@linux.intel.com>" +RECIPE_MAINTAINER_pn-python3-git = "Jose Lamego <jose.a.lam...@linux.intel.com>" RECIPE_MAINTAINER_pn-python3-gitdb = "Edwin Plauchu <edwin.plauchu.cama...@linux.intel.com>" -RECIPE_MAINTAINER_pn-python3-mako = "Edwin Plauchu <edwin.plauchu.cama...@linux.intel.com>" +RECIPE_MAINTAINER_pn-python3-mako = "Jose Lamego <jose.a.lam...@linux.intel.com>" RECIPE_MAINTAINER_pn-python3-native = "Alejandro Hernandez <alejandro.hernan...@linux.intel.com>" RECIPE_MAINTAINER_pn-python3-nose = "Edwin Plauchu <edwin.plauchu.cama...@linux.intel.com>" RECIPE_MAINTAINER_pn-python3-numpy = "Edwin Plauchu <edwin.plauchu.cama...@linux.intel.com>" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] python*-mako: upgrade to 1.0.6
Both python-mako and python3-mako need to be upgraded to latest upstream
version.
This change was tested using qemux86 with core-image-sato.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/recipes-devtools/python/python-mako.inc | 4 ++--
.../python/{python-mako_1.0.4.bb => python-mako_1.0.6.bb} | 0
.../python/{python3-mako_1.0.4.bb => python3-mako_1.0.6.bb} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-mako_1.0.4.bb =>
python-mako_1.0.6.bb} (100%)
rename meta/recipes-devtools/python/{python3-mako_1.0.4.bb =>
python3-mako_1.0.6.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-mako.inc
b/meta/recipes-devtools/python/python-mako.inc
index 85ec217..10364db 100644
--- a/meta/recipes-devtools/python/python-mako.inc
+++ b/meta/recipes-devtools/python/python-mako.inc
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=1bb21fa2d2f7a534c884b990430a6863"
SRC_URI =
"https://files.pythonhosted.org/packages/source/M/Mako/Mako-${PV}.tar.gz;
-SRC_URI[md5sum] = "c5fc31a323dd4990683d2f2da02d4e20"
-SRC_URI[sha256sum] =
"fed99dbe4d0ddb27a33ee4910d8708aca9ef1fe854e668387a9ab9a90cbf9059"
+SRC_URI[md5sum] = "a28e22a339080316b2acc352b9ee631c"
+SRC_URI[sha256sum] =
"48559ebd872a8e77f92005884b3d88ffae552812cdf17db6768e5c3be5ebbe0d"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/mako/;
UPSTREAM_CHECK_REGEX = "/Mako/(?P(\d+[\.\-_]*)+)"
diff --git a/meta/recipes-devtools/python/python-mako_1.0.4.bb
b/meta/recipes-devtools/python/python-mako_1.0.6.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-mako_1.0.4.bb
rename to meta/recipes-devtools/python/python-mako_1.0.6.bb
diff --git a/meta/recipes-devtools/python/python3-mako_1.0.4.bb
b/meta/recipes-devtools/python/python3-mako_1.0.6.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-mako_1.0.4.bb
rename to meta/recipes-devtools/python/python3-mako_1.0.6.bb
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] python*-git: upgrade to 2.1.0
Both python-git and python3-git need to be upgraded to latest upstream
version.
This change was tested using qemux86 with core-image-sato.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/recipes-devtools/python/python-git.inc | 4 ++--
.../python/{python-git_2.0.7.bb => python-git_2.1.0.bb} | 0
.../python/{python3-git_2.0.7.bb => python3-git_2.1.0.bb} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-git_2.0.7.bb =>
python-git_2.1.0.bb} (100%)
rename meta/recipes-devtools/python/{python3-git_2.0.7.bb =>
python3-git_2.1.0.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-git.inc
b/meta/recipes-devtools/python/python-git.inc
index 13c097a..ad41561 100644
--- a/meta/recipes-devtools/python/python-git.inc
+++ b/meta/recipes-devtools/python/python-git.inc
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=8b8d26c37c1d5a04f9b0186edbebc183"
SRC_URI =
"https://files.pythonhosted.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz;
-SRC_URI[md5sum] = "aa0ba9df0abe4c8f35dd7bb9be85d56e"
-SRC_URI[sha256sum] =
"d8e7adaacceedd3d043e6cd2544f57dbe00c53fc26374880b7cea67f3188aa68"
+SRC_URI[md5sum] = "29b1fcf504d080dc7a5e630957e829d7"
+SRC_URI[sha256sum] =
"3ebda1e6ff1ef68597e41dcd1b99c2a5ae902f4dc2b22ad3533cc89c32b42aad"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/GitPython/;
UPSTREAM_CHECK_REGEX = "/GitPython/(?P(\d+[\.\-_]*)+)"
diff --git a/meta/recipes-devtools/python/python-git_2.0.7.bb
b/meta/recipes-devtools/python/python-git_2.1.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-git_2.0.7.bb
rename to meta/recipes-devtools/python/python-git_2.1.0.bb
diff --git a/meta/recipes-devtools/python/python3-git_2.0.7.bb
b/meta/recipes-devtools/python/python3-git_2.1.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-git_2.0.7.bb
rename to meta/recipes-devtools/python/python3-git_2.1.0.bb
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] python-scons*: upgrade to 2.5.1
Both python-scons and python-scons-native need to be upgraded to latest
upstream version.
This change was tested using qemux86 with core-image-sato.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
.../{python-scons-native_2.5.0.bb => python-scons-native_2.5.1.bb}| 0
.../python/{python-scons_2.5.0.bb => python-scons_2.5.1.bb} | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-scons-native_2.5.0.bb =>
python-scons-native_2.5.1.bb} (100%)
rename meta/recipes-devtools/python/{python-scons_2.5.0.bb =>
python-scons_2.5.1.bb} (78%)
diff --git a/meta/recipes-devtools/python/python-scons-native_2.5.0.bb
b/meta/recipes-devtools/python/python-scons-native_2.5.1.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-scons-native_2.5.0.bb
rename to meta/recipes-devtools/python/python-scons-native_2.5.1.bb
diff --git a/meta/recipes-devtools/python/python-scons_2.5.0.bb
b/meta/recipes-devtools/python/python-scons_2.5.1.bb
similarity index 78%
rename from meta/recipes-devtools/python/python-scons_2.5.0.bb
rename to meta/recipes-devtools/python/python-scons_2.5.1.bb
index 8543c41..3f43856 100644
--- a/meta/recipes-devtools/python/python-scons_2.5.0.bb
+++ b/meta/recipes-devtools/python/python-scons_2.5.1.bb
@@ -6,8 +6,8 @@ SRCNAME = "scons"
SRC_URI =
"https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz;
-SRC_URI[md5sum] = "bda5530a70a41a7831d83c8b191c021e"
-SRC_URI[sha256sum] =
"01f1b3d6023516a8e1b5e77799e5a82a23b32953b1102d339059ffeca8600493"
+SRC_URI[md5sum] = "3eac81e5e8206304a9b4683c57665aa4"
+SRC_URI[sha256sum] =
"c8de85fc02ed1a687b1f2ac791eaa0c1707b4382a204f17d782b5b111b9fdf07"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/SCons/;
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] python-pexpect: upgrade to 4.2.1
python-pexpect needs to be upgraded to latest upstream version.
This change was tested using qemux86 with core-image-sato
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
.../python/{python-pexpect_4.2.0.bb => python-pexpect_4.2.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-pexpect_4.2.0.bb =>
python-pexpect_4.2.1.bb} (81%)
diff --git a/meta/recipes-devtools/python/python-pexpect_4.2.0.bb
b/meta/recipes-devtools/python/python-pexpect_4.2.1.bb
similarity index 81%
rename from meta/recipes-devtools/python/python-pexpect_4.2.0.bb
rename to meta/recipes-devtools/python/python-pexpect_4.2.1.bb
index 82e0fa8..95a0790 100644
--- a/meta/recipes-devtools/python/python-pexpect_4.2.0.bb
+++ b/meta/recipes-devtools/python/python-pexpect_4.2.1.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=1c7a725251880af8c6a148181665385b"
SRCNAME = "pexpect"
SRC_URI =
"https://files.pythonhosted.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz;
-SRC_URI[md5sum] = "8071ec5df0f3d515daedafad672d1632"
-SRC_URI[sha256sum] =
"bf6816b8cc8d301a499e7adf338828b39bc7548eb64dbed4dd410ed93d95f853"
+SRC_URI[md5sum] = "3694410001a99dff83f0b500a1ca1c95"
+SRC_URI[sha256sum] =
"3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/pexpect;
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] python-git and 3 more upgrades
The following python recipes needed to be upgraded to latest upstream
version.
These changes were tested using qemux86 with core-image-sato.
Jose Lamego (4):
python*-git: upgrade to 2.1.0
python*-mako: upgrade to 1.0.6
python-pexpect: upgrade to 4.2.1
python-scons*: upgrade to 2.5.1
meta/recipes-devtools/python/python-git.inc | 4 ++--
.../python/{python-git_2.0.7.bb => python-git_2.1.0.bb} | 0
meta/recipes-devtools/python/python-mako.inc | 4 ++--
.../python/{python-mako_1.0.4.bb => python-mako_1.0.6.bb} | 0
.../python/{python-pexpect_4.2.0.bb => python-pexpect_4.2.1.bb} | 4 ++--
.../{python-scons-native_2.5.0.bb => python-scons-native_2.5.1.bb}| 0
.../python/{python-scons_2.5.0.bb => python-scons_2.5.1.bb} | 4 ++--
.../python/{python3-git_2.0.7.bb => python3-git_2.1.0.bb} | 0
.../python/{python3-mako_1.0.4.bb => python3-mako_1.0.6.bb} | 0
9 files changed, 8 insertions(+), 8 deletions(-)
rename meta/recipes-devtools/python/{python-git_2.0.7.bb =>
python-git_2.1.0.bb} (100%)
rename meta/recipes-devtools/python/{python-mako_1.0.4.bb =>
python-mako_1.0.6.bb} (100%)
rename meta/recipes-devtools/python/{python-pexpect_4.2.0.bb =>
python-pexpect_4.2.1.bb} (81%)
rename meta/recipes-devtools/python/{python-scons-native_2.5.0.bb =>
python-scons-native_2.5.1.bb} (100%)
rename meta/recipes-devtools/python/{python-scons_2.5.0.bb =>
python-scons_2.5.1.bb} (78%)
rename meta/recipes-devtools/python/{python3-git_2.0.7.bb =>
python3-git_2.1.0.bb} (100%)
rename meta/recipes-devtools/python/{python3-mako_1.0.4.bb =>
python3-mako_1.0.6.bb} (100%)
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python*-git: Upgrade to version 2.1.1
Both python-git and python3-git need to be upgraded to latest upstream
version.
This change was tested using qemux86 with core-image-sato.
For each recipe test, CORE_IMAGE_EXTRA_INSTALL included
python and python-git,
and python3, python3-modules and python3-git, respectively.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/recipes-devtools/python/python-git.inc | 4 ++--
.../python/{python-git_2.1.0.bb => python-git_2.1.1.bb} | 0
.../python/{python3-git_2.1.0.bb => python3-git_2.1.1.bb} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-git_2.1.0.bb =>
python-git_2.1.1.bb} (100%)
rename meta/recipes-devtools/python/{python3-git_2.1.0.bb =>
python3-git_2.1.1.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-git.inc
b/meta/recipes-devtools/python/python-git.inc
index ad41561..feddf27 100644
--- a/meta/recipes-devtools/python/python-git.inc
+++ b/meta/recipes-devtools/python/python-git.inc
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=8b8d26c37c1d5a04f9b0186edbebc183"
SRC_URI =
"https://files.pythonhosted.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz;
-SRC_URI[md5sum] = "29b1fcf504d080dc7a5e630957e829d7"
-SRC_URI[sha256sum] =
"3ebda1e6ff1ef68597e41dcd1b99c2a5ae902f4dc2b22ad3533cc89c32b42aad"
+SRC_URI[md5sum] = "77f8339e68dedb6d7c4e26371a588ed9"
+SRC_URI[sha256sum] =
"e96f8e953cf9fee0a7599fc587667591328760b6341a0081ef311a942fc96204"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/GitPython/;
UPSTREAM_CHECK_REGEX = "/GitPython/(?P(\d+[\.\-_]*)+)"
diff --git a/meta/recipes-devtools/python/python-git_2.1.0.bb
b/meta/recipes-devtools/python/python-git_2.1.1.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-git_2.1.0.bb
rename to meta/recipes-devtools/python/python-git_2.1.1.bb
diff --git a/meta/recipes-devtools/python/python3-git_2.1.0.bb
b/meta/recipes-devtools/python/python3-git_2.1.1.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-git_2.1.0.bb
rename to meta/recipes-devtools/python/python3-git_2.1.1.bb
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] python*-git: Upgrade to version 2.1.1
Both python-git and python3-git need to be upgraded to latest upstream
version.
This change includes python3 dependencies added and was tested
using qemux86 with core-image-sato.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
Notes:
Changes in patch v2: python3 dependencies added
meta/recipes-devtools/python/python-git.inc | 4 ++--
.../python/{python-git_2.1.0.bb => python-git_2.1.1.bb} | 0
.../python/{python3-git_2.1.0.bb => python3-git_2.1.1.bb} | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/python/{python-git_2.1.0.bb =>
python-git_2.1.1.bb} (100%)
rename meta/recipes-devtools/python/{python3-git_2.1.0.bb =>
python3-git_2.1.1.bb} (82%)
diff --git a/meta/recipes-devtools/python/python-git.inc
b/meta/recipes-devtools/python/python-git.inc
index ad41561..feddf27 100644
--- a/meta/recipes-devtools/python/python-git.inc
+++ b/meta/recipes-devtools/python/python-git.inc
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=8b8d26c37c1d5a04f9b0186edbebc183"
SRC_URI =
"https://files.pythonhosted.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz;
-SRC_URI[md5sum] = "29b1fcf504d080dc7a5e630957e829d7"
-SRC_URI[sha256sum] =
"3ebda1e6ff1ef68597e41dcd1b99c2a5ae902f4dc2b22ad3533cc89c32b42aad"
+SRC_URI[md5sum] = "77f8339e68dedb6d7c4e26371a588ed9"
+SRC_URI[sha256sum] =
"e96f8e953cf9fee0a7599fc587667591328760b6341a0081ef311a942fc96204"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/GitPython/;
UPSTREAM_CHECK_REGEX = "/GitPython/(?P(\d+[\.\-_]*)+)"
diff --git a/meta/recipes-devtools/python/python-git_2.1.0.bb
b/meta/recipes-devtools/python/python-git_2.1.1.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-git_2.1.0.bb
rename to meta/recipes-devtools/python/python-git_2.1.1.bb
diff --git a/meta/recipes-devtools/python/python3-git_2.1.0.bb
b/meta/recipes-devtools/python/python3-git_2.1.1.bb
similarity index 82%
rename from meta/recipes-devtools/python/python3-git_2.1.0.bb
rename to meta/recipes-devtools/python/python3-git_2.1.1.bb
index c9fe9ba..7a2d452 100644
--- a/meta/recipes-devtools/python/python3-git_2.1.0.bb
+++ b/meta/recipes-devtools/python/python3-git_2.1.1.bb
@@ -4,4 +4,4 @@ DEPENDS = "python3-gitdb"
inherit setuptools3
-RDEPENDS_${PN} += "python3-gitdb python3-lang python3-io python3-shell
python3-math python3-re python3-subprocess python3-stringold python3-unixadmin
python3-enum python3-logging python3-datetime python3-netclient"
+RDEPENDS_${PN} += "python3-gitdb python3-lang python3-io python3-shell
python3-math python3-re python3-subprocess python3-stringold python3-unixadmin
python3-enum python3-logging python3-datetime python3-netclient
python3-unittest python3-argparse"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] scripts.send-pull-request: Avoid multiple chain headers
On 11/29/2016 02:51 AM, Patrick Ohly wrote: > On Mon, 2016-11-28 at 16:35 -0600, Jose Lamego wrote: >> >> On 11/28/2016 03:34 PM, Patrick Ohly wrote: >>> On Mon, 2016-11-28 at 14:28 -0600, Jose Lamego wrote: >>>> Agree. Please provide feedback about below comments and I will submit a >>>> v3 patch. >>>> >>>> On 11/28/2016 01:47 PM, Patrick Ohly wrote: >>>>> On Mon, 2016-11-28 at 10:23 -0600, Jose Lamego wrote: >>>> More than 1 "In-Reply-To" and "References" message headers are in >>>> violation of rfc2822 [1] and may cause that some email-related >>>> applications do not point to the appropriate root message in a >>>> conversation/series. >>> >>> Fixing that makes sense. Just add it as reason and the "why" part is >>> covered. >>> >>>>> And I don't understand why this proposed change has the described >>>>> effect. Does changing the threading parameters change the output of "git >>>>> send-email" and thus indirectly the mail headers of the following >>>>> patches? >>> >>> The "how" part still isn't clear to me. Perhaps I'm just dumb, but would >>> you bear with me and explain a bit more how changing the sending of the >>> cover letter affects sending of the patches? > > I've tried out your proposed change with > bash -x ../poky/scripts/send-pull-request --to=patrick.o...@gmx.de -p > pull-11827 > where pull-11827 is my recent bitbake submission. > > The resulting emails are still broken because that one line that you > modify isn't event used. It's under "if [ $AUTO_CL -eq 1 ]" and I am not > using the -a option that enables that behavior. > > Even when I use -a, the result is still broken. > > The root cause of the problem is that both create-pull-request and > send-pull-request allow git to insert In-Reply-To headers. > > "git send-email --help" explicitly warns about that: > > It is up to the user to ensure that no In-Reply-To header already > exists when git send-email is asked > to add it (especially note that git format-patch can be configured to > do the threading itself). Failure > to do so may not produce the expected result in the recipient’s MUA. > >> What I'm doing >> here is to include no reference to any root message at the first call, >> then including a reference at the second call to the very first message >> in the chain, which is either the cover letter or the patch #1. > > No, that doesn't work. Whether the first call uses --no-thread or > --no-chain-reply-to has no effect whatsoever, because when "git > send-email" only sends a single email, it doesn't add headers, and the > second call was left unmodified in your patch. > You are right, I wrongly tested using patches created with git-format-patch command, and then send-pull-request which produced a correctly created chain with only the first change, but didn't tested creating a pull request in the first place, which is the appropriate. > The right fix (tested successfully here) is to use --no-thread in the > second call which sends the sequence of patches. I'll send my change > for review separately. > -- Jose Lamego | OTC Embedded Platforms & Tools | GDC signature.asc Description: OpenPGP digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python-3.3-multilib.patch: Fixes getpath on multilib configurations
When using multilib configurations either on arm/arm64 and x86/x86-64
python3 failed to execute due to a failure when looking for its
platform independent and dependent libraries.
This patch fixes this issue by assigning lib_python to the appropriate
macro.
[YOCTO #10812]
Signed-off-by: Alejandro Hernandez <alejandro.hernan...@linux.intel.com>
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
.../python/python3/python-3.3-multilib.patch| 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
index 056e8e7..8601903 100644
--- a/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
+++ b/meta/recipes-devtools/python/python3/python-3.3-multilib.patch
@@ -138,6 +138,15 @@ Index: Python-3.5.2/Modules/getpath.c
/* Get file status. Encode the path to the locale encoding. */
+@@ -494,7 +502,7 @@ calculate_path(void)
+ _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL);
+ _prefix = Py_DecodeLocale(PREFIX, NULL);
+ _exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL);
+-lib_python = Py_DecodeLocale("lib/python" VERSION, NULL);
++lib_python = Py_DecodeLocale(LIB_PYTHON, NULL);
+
+ if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
+ Py_FatalError(
Index: Python-3.5.2/Python/getplatform.c
===
--- Python-3.5.2.orig/Python/getplatform.c
@@ -185,7 +194,7 @@ Index: Python-3.5.2/setup.py
===
--- Python-3.5.2.orig/setup.py
+++ Python-3.5.2/setup.py
-@@ -492,7 +492,7 @@ class PyBuildExt(build_ext):
+@@ -495,7 +495,7 @@ class PyBuildExt(build_ext):
# directories (i.e. '.' and 'Include') must be first. See issue
# 10520.
if not cross_compiling:
@@ -194,7 +203,7 @@ Index: Python-3.5.2/setup.py
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
# only change this for cross builds for 3.3, issues on Mageia
if cross_compiling:
-@@ -550,8 +550,7 @@ class PyBuildExt(build_ext):
+@@ -553,8 +553,7 @@ class PyBuildExt(build_ext):
# be assumed that no additional -I,-L directives are needed.
if not cross_compiling:
lib_dirs = self.compiler.library_dirs + [
@@ -204,7 +213,7 @@ Index: Python-3.5.2/setup.py
]
inc_dirs = self.compiler.include_dirs + ['/usr/include']
else:
-@@ -743,11 +742,11 @@ class PyBuildExt(build_ext):
+@@ -746,11 +745,11 @@ class PyBuildExt(build_ext):
elif curses_library:
readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs +
@@ -268,7 +277,7 @@ Index: Python-3.5.2/configure.ac
===
--- Python-3.5.2.orig/configure.ac
+++ Python-3.5.2/configure.ac
-@@ -876,6 +876,41 @@ PLATDIR=plat-$MACHDEP
+@@ -883,6 +883,41 @@ PLATDIR=plat-$MACHDEP
AC_SUBST(PLATDIR)
AC_SUBST(PLATFORM_TRIPLET)
--
1.8.3.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] create-pull-request: add "-t in-reply-to" option
The create-patch-request script creates patches as replies to a cover
letter, in the form of an email thread. If further revisions are sent to
the mailing list without referencing to the first revision, these new
revisions are not identified at the mailing list as part of the original
thread, but as a new thread instead.
This change adds the "[-t in_reply_to]" option, where "in_reply_to" is
the original cover letter's Message-Id, so this reference is added
to the new cover letter to ensure the thread continuity.
[YOCTO #11294]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
scripts/create-pull-request | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index e82858b..46d6538 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -34,7 +34,7 @@ RFC=0
usage() {
CMD=$(basename $0)
cat <"
EOM
}
REMOTE="$CPR_CONTRIB_REMOTE"
# Parse and validate arguments
-while getopts "b:acd:hi:m:o:p:r:s:u:l:" OPT; do
+while getopts "b:acd:hi:m:o:p:r:s:u:l:t:" OPT; do
case $OPT in
b)
BRANCH="$OPTARG"
@@ -108,6 +110,8 @@ while getopts "b:acd:hi:m:o:p:r:s:u:l:" OPT; do
a)
CPR_CONTRIB_AUTO_PUSH="1"
;;
+t)
+IN_REPLY_TO="$OPTARG"
esac
done
@@ -205,7 +209,11 @@ if [ -n "$RELDIR" ]; then
fi
# Generate the patches and cover letter
-git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR
--thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
+if [ -z "$IN_REPLY_TO" ]; then
+git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR
--thread=shallow --in-reply-to="$IN_REPLY_TO" --cover-letter
$RELATIVE_TO..$COMMIT_ID > /dev/null
+else
+git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR
--thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
+fi
if [ -z "$(ls -A $ODIR 2> /dev/null)" ]; then
echo "ERROR: $ODIR is empty, no cover letter and patches was generated!"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] create-pull-request: add "-t in-reply-to" option
On 04/05/2017 09:00 AM, Leonardo Sandoval wrote:
> On Tue, 2017-04-04 at 16:45 -0500, Jose Lamego wrote:
>> The create-patch-request script creates patches as replies to a cover
>
> you mean create-pull-request, I believe
>
>> letter, in the form of an email thread. If further revisions are sent to
>> the mailing list without referencing to the first revision, these new
>> revisions are not identified at the mailing list as part of the original
>> thread, but as a new thread instead.
>>
>> This change adds the "[-t in_reply_to]" option, where "in_reply_to" is
>> the original cover letter's Message-Id, so this reference is added
>> to the new cover letter to ensure the thread continuity.
>>
>
>
> BTW, is there an easy way to get the in-reply-to email besides using
> git-pw or looking at the message source?
That's a good question, I actually don't know of an easier way of
knowing the Message-Id. Will further investigate.
>
> Some comments in patch:
>
Thanks Leo!
>
>
>
>> [YOCTO #11294]
>>
>> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
>> ---
>> scripts/create-pull-request | 14 +++---
>> 1 file changed, 11 insertions(+), 3 deletions(-)
>>
>> diff --git a/scripts/create-pull-request b/scripts/create-pull-request
>> index e82858b..46d6538 100755
>> --- a/scripts/create-pull-request
>> +++ b/scripts/create-pull-request
>> @@ -34,7 +34,7 @@ RFC=0
>> usage() {
>> CMD=$(basename $0)
>> cat <> -Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r
>> relative_to] [-i commit_id] [-d relative_dir] -u remote [-b branch]
>> +Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r
>> relative_to] [-i commit_id] [-d relative_dir] -u remote [-b branch] [-t
>> in_reply_to]
>>-b branch Branch name in the specified remote (default: current
>> branch)
>>-l local branch Local branch name (default: HEAD)
>>-c Create an RFC (Request for Comment) patch series
>> @@ -49,6 +49,7 @@ Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s
>> subject] [-r relative_to
>>-s subject The subject to be inserted into the summary email
>>-u remote The git remote where the branch is located, or set
>> CPR_CONTRIB_REMOTE in env
>>-d relative_dir Generate patches relative to directory
>> + -t in_reply_to Make mails appear as replies to the given Message-Id,
>> to continue patch/series threads
>>
>> Examples:
>> $CMD -u contrib -b nitin/basic
>> @@ -57,12 +58,13 @@ Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s
>> subject] [-r relative_to
>> $CMD -u contrib -r master -i misc -b nitin/misc -o pull-misc
>> $CMD -u contrib -p "RFC PATCH" -b nitin/experimental
>> $CMD -u contrib -i misc -b nitin/misc -d ./bitbake
>> + $CMD -u contrib -p "OE-core][PATCH v2" -t
>> "<cover.11146.git.john@example.com>"
>> EOM
>> }
>>
>> REMOTE="$CPR_CONTRIB_REMOTE"
>> # Parse and validate arguments
>> -while getopts "b:acd:hi:m:o:p:r:s:u:l:" OPT; do
>> +while getopts "b:acd:hi:m:o:p:r:s:u:l:t:" OPT; do
>> case $OPT in
>> b)
>> BRANCH="$OPTARG"
>> @@ -108,6 +110,8 @@ while getopts "b:acd:hi:m:o:p:r:s:u:l:" OPT; do
>> a)
>> CPR_CONTRIB_AUTO_PUSH="1"
>> ;;
>> +t)
>> +IN_REPLY_TO="$OPTARG"
>
> it would be nice to include also the double semi-colon, so future cases
> just start after it.
>
done in v2 patch.
>
>> esac
>> done
>>
>> @@ -205,7 +209,11 @@ if [ -n "$RELDIR" ]; then
>> fi
>>
>> # Generate the patches and cover letter
>> -git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR
>> --thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
>> +if [ -z "$IN_REPLY_TO" ]; then
>
> -n instead of -z?
>
also done in v2 patch
>> +git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR
>> --thread=shallow --in-reply-to="$IN_REPLY_TO" --cover-letter
>> $RELATIVE_TO..$COMMIT_ID > /dev/null
>> +else
>> +git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR
>> --thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
>> +fi
>>
>> if [ -z "$(ls -A $ODIR 2> /dev/null)" ]; then
>> echo "ERROR: $ODIR is empty, no cover letter and patches was generated!"
>> --
>> 2.7.4
>>
>
>
--
Jose Lamego | OTC Embedded Platforms & Tools | GDC
signature.asc
Description: OpenPGP digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [yocto][patchwork][PATCH v2] create-pull-request: add "-t in-reply-to" option
The create-pull-request script creates patches as replies to a cover
letter, in the form of an email thread. If further revisions are sent to
the mailing list without referencing to the first revision, these new
revisions are not identified at the mailing list as part of the original
thread, but as a new thread instead.
This change adds the "[-t in_reply_to]" option, where "in_reply_to" is
the original cover letter's Message-Id, so this reference is added
to the new cover letter to ensure the thread continuity.
[YOCTO #11294]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
scripts/create-pull-request | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index e82858b..8f0be99 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -34,7 +34,7 @@ RFC=0
usage() {
CMD=$(basename $0)
cat <"
EOM
}
REMOTE="$CPR_CONTRIB_REMOTE"
# Parse and validate arguments
-while getopts "b:acd:hi:m:o:p:r:s:u:l:" OPT; do
+while getopts "b:acd:hi:m:o:p:r:s:u:l:t:" OPT; do
case $OPT in
b)
BRANCH="$OPTARG"
@@ -108,7 +110,10 @@ while getopts "b:acd:hi:m:o:p:r:s:u:l:" OPT; do
a)
CPR_CONTRIB_AUTO_PUSH="1"
;;
- esac
+t)
+IN_REPLY_TO="$OPTARG"
+;;
+esac
done
if [ -z "$REMOTE" ]; then
@@ -205,7 +210,11 @@ if [ -n "$RELDIR" ]; then
fi
# Generate the patches and cover letter
-git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR
--thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
+if [ -n "$IN_REPLY_TO" ]; then
+git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR
--thread=shallow --in-reply-to="$IN_REPLY_TO" --cover-letter
$RELATIVE_TO..$COMMIT_ID > /dev/null
+else
+git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR
--thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
+fi
if [ -z "$(ls -A $ODIR 2> /dev/null)" ]; then
echo "ERROR: $ODIR is empty, no cover letter and patches was generated!"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] create-pull-request: add "-t in-reply-to" option
The create-pull-request script creates patches as replies to a cover
letter, in the form of an email thread. If further revisions are sent to
the mailing list without referencing to the first revision, these new
revisions are not identified at the mailing list as part of the original
thread, but as a new thread instead.
This change adds the "[-t in_reply_to]" option, where "in_reply_to" is
the original cover letter's Message-Id, so this reference is added
to the new cover letter to ensure the thread continuity.
[YOCTO #11294]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
scripts/create-pull-request | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index e82858b..8f0be99 100755
--- a/scripts/create-pull-request
+++ b/scripts/create-pull-request
@@ -34,7 +34,7 @@ RFC=0
usage() {
CMD=$(basename $0)
cat <"
EOM
}
REMOTE="$CPR_CONTRIB_REMOTE"
# Parse and validate arguments
-while getopts "b:acd:hi:m:o:p:r:s:u:l:" OPT; do
+while getopts "b:acd:hi:m:o:p:r:s:u:l:t:" OPT; do
case $OPT in
b)
BRANCH="$OPTARG"
@@ -108,7 +110,10 @@ while getopts "b:acd:hi:m:o:p:r:s:u:l:" OPT; do
a)
CPR_CONTRIB_AUTO_PUSH="1"
;;
- esac
+t)
+IN_REPLY_TO="$OPTARG"
+;;
+esac
done
if [ -z "$REMOTE" ]; then
@@ -205,7 +210,11 @@ if [ -n "$RELDIR" ]; then
fi
# Generate the patches and cover letter
-git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR
--thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
+if [ -n "$IN_REPLY_TO" ]; then
+git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR
--thread=shallow --in-reply-to="$IN_REPLY_TO" --cover-letter
$RELATIVE_TO..$COMMIT_ID > /dev/null
+else
+git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR
--thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
+fi
if [ -z "$(ls -A $ODIR 2> /dev/null)" ]; then
echo "ERROR: $ODIR is empty, no cover letter and patches was generated!"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python*-git: Upgrade to version 2.1.3
Both python-git and python3-git need to be upgraded to latest
upstream
version.
This change was tested using qemux86 with core-image-sato.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/recipes-devtools/python/python-git.inc | 4 ++--
.../python/{python-git_2.1.1.bb => python-git_2.1.3.bb} | 0
.../python/{python3-git_2.1.1.bb => python3-git_2.1.3.bb} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-git_2.1.1.bb =>
python-git_2.1.3.bb} (100%)
rename meta/recipes-devtools/python/{python3-git_2.1.1.bb =>
python3-git_2.1.3.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-git.inc
b/meta/recipes-devtools/python/python-git.inc
index feddf27..825e795d9 100644
--- a/meta/recipes-devtools/python/python-git.inc
+++ b/meta/recipes-devtools/python/python-git.inc
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=8b8d26c37c1d5a04f9b0186edbebc183"
SRC_URI =
"https://files.pythonhosted.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz;
-SRC_URI[md5sum] = "77f8339e68dedb6d7c4e26371a588ed9"
-SRC_URI[sha256sum] =
"e96f8e953cf9fee0a7599fc587667591328760b6341a0081ef311a942fc96204"
+SRC_URI[md5sum] = "6cd18008c03a767740f3bf6d89ef79bc"
+SRC_URI[sha256sum] =
"3826185b11e1fc372e7d31251e9b65e11ccb7c27f82c771d619048bdb5b66c81"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/GitPython/;
UPSTREAM_CHECK_REGEX = "/GitPython/(?P(\d+[\.\-_]*)+)"
diff --git a/meta/recipes-devtools/python/python-git_2.1.1.bb
b/meta/recipes-devtools/python/python-git_2.1.3.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-git_2.1.1.bb
rename to meta/recipes-devtools/python/python-git_2.1.3.bb
diff --git a/meta/recipes-devtools/python/python3-git_2.1.1.bb
b/meta/recipes-devtools/python/python3-git_2.1.3.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-git_2.1.1.bb
rename to meta/recipes-devtools/python/python3-git_2.1.3.bb
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] python3-setuptools: Remove pth file creation at recipe level
Ping.
On 02/08/2017 04:31 PM, Jose Lamego wrote:
> Ping.
>
> On 01/17/2017 09:42 AM, Jose Lamego wrote:
>> Handling of installed eggs is now performed at the distutils3 bbclass.
>>
>> This change removes the pth file creation at recipe level.
>>
>> [YOCTO #8673]
>>
>> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
>> ---
>> meta/recipes-devtools/python/python3-setuptools_31.0.0.bb | 3 ---
>> 1 file changed, 3 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
>> b/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
>> index 65af6f0..b37b381 100644
>> --- a/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
>> +++ b/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
>> @@ -7,11 +7,8 @@ inherit distutils3
>>
>> DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR}"
>>
>> -# The installer puts the wrong path in the setuptools.pth file. Correct it.
>> do_install_append() {
>> -rm ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
>> mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install
>> -echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" >
>> ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
>> }
>>
>> RDEPENDS_${PN} = "\
>>
>
>
>
--
Jose Lamego | OTC Embedded Platforms & Tools | GDC
signature.asc
Description: OpenPGP digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] python3-pip: Remove pth file creation at recipe level
Ping.
On 02/08/2017 04:31 PM, Jose Lamego wrote:
> Ping.
>
> On 01/17/2017 09:42 AM, Jose Lamego wrote:
>> Handling of installed eggs is now performed at the distutils3 bbclass.
>>
>> This change removes the pth file creation at recipe level.
>>
>> [YOCTO #8673]
>>
>> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
>> ---
>> meta/recipes-devtools/python/python3-pip_9.0.1.bb | 3 ---
>> 1 file changed, 3 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/python/python3-pip_9.0.1.bb
>> b/meta/recipes-devtools/python/python3-pip_9.0.1.bb
>> index 6ac94bb..9dce107 100644
>> --- a/meta/recipes-devtools/python/python3-pip_9.0.1.bb
>> +++ b/meta/recipes-devtools/python/python3-pip_9.0.1.bb
>> @@ -31,9 +31,6 @@ do_install_append() {
>>
>> # Install as pip3 and leave pip2 as default
>> rm ${D}/${bindir}/pip
>> -
>> -# Installed eggs need to be passed directly to the interpreter via a
>> pth file
>> -echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" >
>> ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}-${PV}.pth
>> }
>>
>> RDEPENDS_${PN} = "\
>>
>
>
>
--
Jose Lamego | OTC Embedded Platforms & Tools | GDC
signature.asc
Description: OpenPGP digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] distutils3.bbclass: add egg files/directories to python path
Ping
On 02/08/2017 04:30 PM, Jose Lamego wrote:
> Ping.
>
> On 01/17/2017 09:42 AM, Jose Lamego wrote:
>> Packages that use .egg files or directories for installation may
>> not be found when imported at the python3 interpreter.
>> .egg files/directories path must be included in a .pth file to
>> be appropriately included in python path.
>>
>> This change looks for .egg files/directories in sitepackages
>> and adds its path to a .pth file during package installation.
>> It ensures that any new package that uses .egg files/recipes
>> will be appropriately added to path by performing the check from
>> the distutils3 class.
>>
>> [YOCTO #8673]
>>
>> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
>> ---
>> meta/classes/distutils3.bbclass | 10 ++
>> 1 file changed, 10 insertions(+)
>>
>> diff --git a/meta/classes/distutils3.bbclass
>> b/meta/classes/distutils3.bbclass
>> index a6720c5..f8e2e2e 100644
>> --- a/meta/classes/distutils3.bbclass
>> +++ b/meta/classes/distutils3.bbclass
>> @@ -68,6 +68,16 @@ distutils3_do_install() {
>> mv -f ${D}${datadir}/share/* ${D}${datadir}/
>> rmdir ${D}${datadir}/share
>> fi
>> +
>> +# detect if .egg files/directories were created and add their
>> +# path to a .pth file
>> +SHORT_PN=$(echo "${PN}" | sed 's/${PYTHON_PN}-//g')
>> +if test -e ${D}${PYTHON_SITEPACKAGES_DIR}/${SHORT_PN}*.egg; then
>> +EGG_NAME=$(basename $(find ${D}${PYTHON_SITEPACKAGES_DIR}/ \
>> +-name ${SHORT_PN}\*.egg))
>> +echo "./${EGG_NAME}" > ${D}${PYTHON_SITEPACKAGES_DIR}/\
>> +${SHORT_PN}.pth
>> +fi
>> }
>> distutils3_do_install[vardepsexclude] = "MACHINE"
>>
>>
>
>
>
--
Jose Lamego | OTC Embedded Platforms & Tools | GDC
signature.asc
Description: OpenPGP digital signature
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] packagegroup-python3: add packagegroup
Many of the most usual python3 modules are missing when
trying to import them to python3 in images built with
python3-core installed.
This change creates the python3 packagegroup, containing
the most usual python3 packages to be installed for images
featuring complete python functionality by using the
FEATURES_PACKAGES variable to define python3 as a new feature
and then adding it to the image to build.
[YOCTO #10667]
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
.../packagegroups/packagegroup-python3.bb | 85 ++
1 file changed, 85 insertions(+)
create mode 100644 meta/recipes-devtools/packagegroups/packagegroup-python3.bb
diff --git a/meta/recipes-devtools/packagegroups/packagegroup-python3.bb
b/meta/recipes-devtools/packagegroups/packagegroup-python3.bb
new file mode 100644
index 000..ab83460
--- /dev/null
+++ b/meta/recipes-devtools/packagegroups/packagegroup-python3.bb
@@ -0,0 +1,85 @@
+SUMMARY = "Provides a basic set of python3 packages"
+
+DEPENDS = "python3-native"
+
+PR = "1"
+
+inherit packagegroup
+
+RPROVIDES_${PN} = "python3"
+
+RDEPENDS_${PN} = "\
+libpython3 \
+libpython3-staticdev \
+python3-pyvenv \
+python3-dbg \
+python3-2to3 \
+python3-argparse \
+python3-asyncio \
+python3-audio \
+python3-codecs \
+python3-compile \
+python3-compression \
+python3-core \
+python3-crypt \
+python3-ctypes \
+python3-curses \
+python3-datetime \
+python3-db \
+python3-debugger \
+python3-dev \
+python3-difflib \
+python3-distutils \
+python3-doctest \
+python3-email \
+python3-enum \
+python3-fcntl \
+python3-gdbm \
+python3-html \
+python3-idle \
+python3-image \
+python3-importlib \
+python3-io \
+python3-json \
+python3-lang \
+python3-logging \
+python3-mailbox \
+python3-math \
+python3-mime \
+python3-mmap \
+python3-multiprocessing \
+python3-netclient \
+python3-netserver \
+python3-numbers \
+python3-pickle \
+python3-pkgutil \
+python3-pprint \
+python3-profile \
+python3-pydoc \
+python3-re \
+python3-readline \
+python3-reprlib \
+python3-resource \
+python3-selectors \
+python3-shell \
+python3-signal \
+python3-smtpd \
+python3-sqlite3 \
+python3-sqlite3-tests \
+python3-stringold \
+python3-subprocess \
+python3-syslog \
+python3-terminal \
+python3-tests \
+python3-textutils \
+python3-threading \
+python3-tkinter \
+python3-typing \
+python3-unittest \
+python3-unixadmin \
+python3-xml \
+python3-xmlrpc \
+python3-modules \
+python3-misc \
+python3-man \
+"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] packagegroup-python3: add packagegroup
On 08/15/2017 04:56 PM, Christopher Larson wrote: > On Tue, Aug 15, 2017 at 2:05 PM, Jose Lamego <jose.a.lam...@linux.intel.com> > wrote: > >> Many of the most usual python3 modules are missing when >> trying to import them to python3 in images built with >> python3-core installed. >> >> This change creates the python3 packagegroup, containing >> the most usual python3 packages to be installed for images >> featuring complete python functionality by using the >> FEATURES_PACKAGES variable to define python3 as a new feature >> and then adding it to the image to build. >> >> [YOCTO #10667] >> >> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com> > > Out of curiosity, why not just install ‘python3-modules’? I had the same thought when reviewing the request for this change (at [1]); adding python3 to EXTRA_IMAGE_INSTALL do also provide most of the usual python modules. However, I created the packagegroup as a way to have a more or less complete python installation available as an image feature, and I expect to gather enough feedback from the community before rejecting/accepting it (so, comments are welcomed :) ) [1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=10667 -- Jose Lamego | OTC Embedded Platform & Tools | GDC -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for libgcrypt: fix CVE-2017-9526 (rev2)
On 07/14/2017 02:57 AM, Jussi Kukkonen wrote: > On 13 July 2017 at 21:38, Patchwork > <patchw...@patchwork.openembedded.org > <mailto:patchw...@patchwork.openembedded.org>> wrote: > > == Series Details == > > Series: libgcrypt: fix CVE-2017-9526 (rev2) > Revision: 2 > > > Not sure if this should be a patchwork bug or not? This patch is > showing up as a revision 2 of the other patch when in reality they are > patches for two separate branches. > > - Jussi There is a request to handle older release patch submissions in Patchwork (bug 10716) planned to be completed in 2.5, however, I may be able to implement the change in the following days. Jose > > > > URL : https://patchwork.openembedded.org/series/7732/ > <https://patchwork.openembedded.org/series/7732/> > State : failure > > == Summary == > > > Thank you for submitting this patch series to OpenEmbedded Core. > This is > an automated response. Several tests have been executed on the > proposed > series by patchtest resulting in the following failures: > > > > * Patch[pyro] libgcrypt: fix CVE-2017-9526 > Issue Missing or incorrectly formatted CVE tag in > commit message [test_cve_presence_in_commit_message] > Suggested fixInclude a "CVE--" tag in the commit message > > > > If you believe any of these test results are incorrect, please > reply to the > mailing list (openembedded-core@lists.openembedded.org > <mailto:openembedded-core@lists.openembedded.org>) raising your > concerns. > Otherwise we would appreciate you correcting the issues and > submitting a new > version of the patchset if applicable. Please ensure you > add/increment the > version number when sending the new version (i.e. [PATCH] -> > [PATCH v2] -> > [PATCH v3] -> ...). > > --- > Test framework: > http://git.yoctoproject.org/cgit/cgit.cgi/patchtest > <http://git.yoctoproject.org/cgit/cgit.cgi/patchtest> > Test suite: > http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe > <http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe> > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > <mailto:Openembedded-core@lists.openembedded.org> > http://lists.openembedded.org/mailman/listinfo/openembedded-core > <http://lists.openembedded.org/mailman/listinfo/openembedded-core> > > > > -- Jose Lamego | OTC Embedded Platform & Tools | GDC -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/6] git: 2.11.1 -> 2.13.2
On 07/12/2017 09:55 PM, Robert Yang wrote:
>
>
> On 07/12/2017 11:38 PM, Leonardo Sandoval wrote:
>> for some reason git did not detect (as other patches in this series)
>> the renaming (delete/create), make it easier to review.
>>
>
> By default, git format-patch handles similarity > 50% as rename,
> the git_2.13.2.bb changes a lot, so no renames.
FWIW, in cases like this I include option "-M30" to git format-patch to
detect similarities from 30%.
Jose
>
> // Robert
>
>>
>>
>> On Wed, 2017-07-12 at 03:15 -0700, Robert Yang wrote:
>>> * Remove git-relink from PERLTOOLS:
>>> git-2.13.2/Documentation/RelNotes/2.12.0.txt:
>>> * An ancient script "git relink" has been removed.
>>>
>>> Signed-off-by: Robert Yang <liezhi.y...@windriver.com>
>>> ---
>>> meta/recipes-devtools/git/git.inc | 1 -
>>> meta/recipes-devtools/git/git_2.11.1.bb | 11 ---
>>> meta/recipes-devtools/git/git_2.13.2.bb | 11 +++
>>> 3 files changed, 11 insertions(+), 12 deletions(-)
>>> delete mode 100644 meta/recipes-devtools/git/git_2.11.1.bb
>>> create mode 100644 meta/recipes-devtools/git/git_2.13.2.bb
>>>
>>> diff --git a/meta/recipes-devtools/git/git.inc
>>> b/meta/recipes-devtools/git/git.inc
>>> index 9b0d328..4390b8d 100644
>>> --- a/meta/recipes-devtools/git/git.inc
>>> +++ b/meta/recipes-devtools/git/git.inc
>>> @@ -86,7 +86,6 @@ PERLTOOLS = " \
>>> ${libexecdir}/git-core/git-cvsserver \
>>> ${bindir}/git-cvsserver \
>>> ${libexecdir}/git-core/git-difftool \
>>> -${libexecdir}/git-core/git-relink \
>>> ${libexecdir}/git-core/git-send-email \
>>> ${libexecdir}/git-core/git-svn \
>>> ${libexecdir}/git-core/git-instaweb \
>>> diff --git a/meta/recipes-devtools/git/git_2.11.1.bb
>>> b/meta/recipes-devtools/git/git_2.11.1.bb
>>> deleted file mode 100644
>>> index f2f072c..000
>>> --- a/meta/recipes-devtools/git/git_2.11.1.bb
>>> +++ /dev/null
>>> @@ -1,11 +0,0 @@
>>> -require git.inc
>>> -
>>> -EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
>>> -
>>> ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
>>> - "
>>> -EXTRA_OEMAKE += "NO_GETTEXT=1"
>>> -
>>> -SRC_URI[tarball.md5sum] = "6a7a73db076bb0514b602720669d685c"
>>> -SRC_URI[tarball.sha256sum] =
>>> "a1cdd7c820f92c44abb5003b36dc8cb7201ba38e8744802399f59c97285ca043"
>>> -SRC_URI[manpages.md5sum] = "e4268a6b514ccdb624b6450ff55881a3"
>>> -SRC_URI[manpages.sha256sum] =
>>> "ee567e7b0f95333816793714bb31c54e288cf8041f77a0092b85e62c9c2974f9"
>>> diff --git a/meta/recipes-devtools/git/git_2.13.2.bb
>>> b/meta/recipes-devtools/git/git_2.13.2.bb
>>> new file mode 100644
>>> index 000..e7cae40
>>> --- /dev/null
>>> +++ b/meta/recipes-devtools/git/git_2.13.2.bb
>>> @@ -0,0 +1,11 @@
>>> +require git.inc
>>> +
>>> +EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
>>> +
>>> ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
>>> + "
>>> +EXTRA_OEMAKE += "NO_GETTEXT=1"
>>> +
>>> +SRC_URI[tarball.md5sum] = "894583cddfb0ec3b0156484966f9db9c"
>>> +SRC_URI[tarball.sha256sum] =
>>> "e19d450648d6d100eb93abaa5d06ffbc778394fb502354b7026d73e9bcbc3160"
>>> +SRC_URI[manpages.md5sum] = "97384d23f2ee88d5ce51ffc75096bd3e"
>>> +SRC_URI[manpages.sha256sum] =
>>> "1c2bd0a2340b2ef118b7b167a8fec6cc05eb18cad9043e6e7a95fd8a70bb8c4c"
>>> --
>>> 2.10.2
>>>
>>
>>
>>
--
Jose Lamego | OTC Embedded Platform & Tools | GDC
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python*-setuptools: upgrade to 36.2.0
Both python-setuptools and python3-setuptools need to be
upgraded to latest upstream version.
license checksum is now targeted to be performed over the actual
license text at license file.
These changes were tested using qemux86 with core-image-minimal.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
Notes:
This patch replaces previous submission due to latest stable
version at upstream got upgraded to a newer version.
meta/recipes-devtools/python/python-setuptools.inc| 8
.../{python-setuptools_32.1.1.bb => python-setuptools_36.2.0.bb} | 0
...{python3-setuptools_32.1.1.bb => python3-setuptools_36.2.0.bb} | 0
3 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/python/{python-setuptools_32.1.1.bb =>
python-setuptools_36.2.0.bb} (100%)
rename meta/recipes-devtools/python/{python3-setuptools_32.1.1.bb =>
python3-setuptools_36.2.0.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-setuptools.inc
b/meta/recipes-devtools/python/python-setuptools.inc
index 40f47d4..cd84233 100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -3,14 +3,14 @@ HOMEPAGE = "https://pypi.python.org/pypi/setuptools;
SECTION = "devel/python"
LICENSE = "MIT"
-LIC_FILES_CHKSUM =
"file://setup.py;beginline=146;endline=146;md5=3e8df024d6c1442d18e84acf8fbbc475"
+LIC_FILES_CHKSUM =
"file://LICENSE;beginline=1;endline=19;md5=9a33897f1bca1160d7aad3835152e158"
SRCNAME = "setuptools"
-SRC_URI =
"https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz;
+SRC_URI =
"https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.zip;
-SRC_URI[md5sum] = "8b67868c3430e978833ebd0d1b766694"
-SRC_URI[sha256sum] =
"8303fb24306385f09bf8b0e5a385c1548e42e8efc08558d64049bc0d55ea012d"
+SRC_URI[md5sum] = "60df703040ad8024d24727dc95483740"
+SRC_URI[sha256sum] =
"4c2bda3829c9dbbe9c2b33d89c4b1cb6d45813615ab8e248ad352e3697a96d81"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools;
diff --git a/meta/recipes-devtools/python/python-setuptools_32.1.1.bb
b/meta/recipes-devtools/python/python-setuptools_36.2.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-setuptools_32.1.1.bb
rename to meta/recipes-devtools/python/python-setuptools_36.2.0.bb
diff --git a/meta/recipes-devtools/python/python3-setuptools_32.1.1.bb
b/meta/recipes-devtools/python/python3-setuptools_36.2.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-setuptools_32.1.1.bb
rename to meta/recipes-devtools/python/python3-setuptools_36.2.0.bb
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-git: upgrade to 2.1.5
python3-git needs to be upgraded to latest upstream version.
"git" is added as RDEPENDS.
These changes were tested using qemux86 with core-image-minimal.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
Notes:
This patch replaces previous submission for updating both
python-git and python3-git recipes, due to python-git being
removed in commit 1fc2c9315faf65ea05fecf81450dd40b9a330435
meta/recipes-devtools/python/python-git.inc | 4 ++--
.../python/{python3-git_2.1.3.bb => python3-git_2.1.5.bb} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/python/{python3-git_2.1.3.bb =>
python3-git_2.1.5.bb} (81%)
diff --git a/meta/recipes-devtools/python/python-git.inc
b/meta/recipes-devtools/python/python-git.inc
index 825e795d9..777608c 100644
--- a/meta/recipes-devtools/python/python-git.inc
+++ b/meta/recipes-devtools/python/python-git.inc
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=8b8d26c37c1d5a04f9b0186edbebc183"
SRC_URI =
"https://files.pythonhosted.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz;
-SRC_URI[md5sum] = "6cd18008c03a767740f3bf6d89ef79bc"
-SRC_URI[sha256sum] =
"3826185b11e1fc372e7d31251e9b65e11ccb7c27f82c771d619048bdb5b66c81"
+SRC_URI[md5sum] = "df94212b19d270a625b67b4c84ac9a41"
+SRC_URI[sha256sum] =
"5c00cbd256e2b1d039381d4f7d71fcb7ee5cc196ca10c101ff7191bd82ab5d9c"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/GitPython/;
UPSTREAM_CHECK_REGEX = "/GitPython/(?P(\d+[\.\-_]*)+)"
diff --git a/meta/recipes-devtools/python/python3-git_2.1.3.bb
b/meta/recipes-devtools/python/python3-git_2.1.5.bb
similarity index 81%
rename from meta/recipes-devtools/python/python3-git_2.1.3.bb
rename to meta/recipes-devtools/python/python3-git_2.1.5.bb
index 7a2d452..4ac2a0e 100644
--- a/meta/recipes-devtools/python/python3-git_2.1.3.bb
+++ b/meta/recipes-devtools/python/python3-git_2.1.5.bb
@@ -4,4 +4,4 @@ DEPENDS = "python3-gitdb"
inherit setuptools3
-RDEPENDS_${PN} += "python3-gitdb python3-lang python3-io python3-shell
python3-math python3-re python3-subprocess python3-stringold python3-unixadmin
python3-enum python3-logging python3-datetime python3-netclient
python3-unittest python3-argparse"
+RDEPENDS_${PN} += "python3-gitdb python3-lang python3-io python3-shell
python3-math python3-re python3-subprocess python3-stringold python3-unixadmin
python3-enum python3-logging python3-datetime python3-netclient
python3-unittest python3-argparse git"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-mako: update to 1.0.7
python3-mako need to be upgraded to latest upstream version.
This change was tested using qemux86 with core-image-minimal
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/recipes-devtools/python/python-mako.inc | 4 ++--
.../python/{python3-mako_1.0.6.bb => python3-mako_1.0.7.bb} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-mako_1.0.6.bb =>
python3-mako_1.0.7.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-mako.inc
b/meta/recipes-devtools/python/python-mako.inc
index 10364db..ba50675 100644
--- a/meta/recipes-devtools/python/python-mako.inc
+++ b/meta/recipes-devtools/python/python-mako.inc
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=1bb21fa2d2f7a534c884b990430a6863"
SRC_URI =
"https://files.pythonhosted.org/packages/source/M/Mako/Mako-${PV}.tar.gz;
-SRC_URI[md5sum] = "a28e22a339080316b2acc352b9ee631c"
-SRC_URI[sha256sum] =
"48559ebd872a8e77f92005884b3d88ffae552812cdf17db6768e5c3be5ebbe0d"
+SRC_URI[md5sum] = "5836cc997b1b773ef389bf6629c30e65"
+SRC_URI[sha256sum] =
"4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/mako/;
UPSTREAM_CHECK_REGEX = "/Mako/(?P(\d+[\.\-_]*)+)"
diff --git a/meta/recipes-devtools/python/python3-mako_1.0.6.bb
b/meta/recipes-devtools/python/python3-mako_1.0.7.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-mako_1.0.6.bb
rename to meta/recipes-devtools/python/python3-mako_1.0.7.bb
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] python*-git: Upgrade to version 2.1.5
ping. This may get in before the freeze.
On 06/27/2017 12:50 PM, Jose Lamego wrote:
> Both python-git and python3-git need to be upgraded to latest
> upstream version.
>
> Two RDEPENDS are added: "git" and "python-unittest" to python-git recipe
> and "git" to python3-git recipe.
>
> These changes were tested using qemux86 with core-image-minimal.
>
> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
> ---
> meta/recipes-devtools/python/python-git.inc | 4
> ++--
> .../python/{python-git_2.1.3.bb => python-git_2.1.5.bb} | 2 +-
> .../python/{python3-git_2.1.3.bb => python3-git_2.1.5.bb} | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
> rename meta/recipes-devtools/python/{python-git_2.1.3.bb =>
> python-git_2.1.5.bb} (85%)
> rename meta/recipes-devtools/python/{python3-git_2.1.3.bb =>
> python3-git_2.1.5.bb} (81%)
>
> diff --git a/meta/recipes-devtools/python/python-git.inc
> b/meta/recipes-devtools/python/python-git.inc
> index 825e795d9..777608c 100644
> --- a/meta/recipes-devtools/python/python-git.inc
> +++ b/meta/recipes-devtools/python/python-git.inc
> @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM =
> "file://LICENSE;md5=8b8d26c37c1d5a04f9b0186edbebc183"
>
> SRC_URI =
> "https://files.pythonhosted.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz;
>
> -SRC_URI[md5sum] = "6cd18008c03a767740f3bf6d89ef79bc"
> -SRC_URI[sha256sum] =
> "3826185b11e1fc372e7d31251e9b65e11ccb7c27f82c771d619048bdb5b66c81"
> +SRC_URI[md5sum] = "df94212b19d270a625b67b4c84ac9a41"
> +SRC_URI[sha256sum] =
> "5c00cbd256e2b1d039381d4f7d71fcb7ee5cc196ca10c101ff7191bd82ab5d9c"
>
> UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/GitPython/;
> UPSTREAM_CHECK_REGEX = "/GitPython/(?P(\d+[\.\-_]*)+)"
> diff --git a/meta/recipes-devtools/python/python-git_2.1.3.bb
> b/meta/recipes-devtools/python/python-git_2.1.5.bb
> similarity index 85%
> rename from meta/recipes-devtools/python/python-git_2.1.3.bb
> rename to meta/recipes-devtools/python/python-git_2.1.5.bb
> index e49dbea..779e606 100644
> --- a/meta/recipes-devtools/python/python-git_2.1.3.bb
> +++ b/meta/recipes-devtools/python/python-git_2.1.5.bb
> @@ -4,4 +4,4 @@ DEPENDS = "python-gitdb"
>
> inherit setuptools
>
> -RDEPENDS_${PN} += "python-gitdb python-lang python-io python-shell
> python-math python-re python-subprocess python-stringold python-unixadmin"
> +RDEPENDS_${PN} += "python-gitdb python-lang python-io python-shell
> python-math python-re python-subprocess python-stringold python-unixadmin
> python-unittest git"
> diff --git a/meta/recipes-devtools/python/python3-git_2.1.3.bb
> b/meta/recipes-devtools/python/python3-git_2.1.5.bb
> similarity index 81%
> rename from meta/recipes-devtools/python/python3-git_2.1.3.bb
> rename to meta/recipes-devtools/python/python3-git_2.1.5.bb
> index 7a2d452..4ac2a0e 100644
> --- a/meta/recipes-devtools/python/python3-git_2.1.3.bb
> +++ b/meta/recipes-devtools/python/python3-git_2.1.5.bb
> @@ -4,4 +4,4 @@ DEPENDS = "python3-gitdb"
>
> inherit setuptools3
>
> -RDEPENDS_${PN} += "python3-gitdb python3-lang python3-io python3-shell
> python3-math python3-re python3-subprocess python3-stringold
> python3-unixadmin python3-enum python3-logging python3-datetime
> python3-netclient python3-unittest python3-argparse"
> +RDEPENDS_${PN} += "python3-gitdb python3-lang python3-io python3-shell
> python3-math python3-re python3-subprocess python3-stringold
> python3-unixadmin python3-enum python3-logging python3-datetime
> python3-netclient python3-unittest python3-argparse git"
--
Jose Lamego | OTC Embedded Platform & Tools | GDC
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] bc: upgrade 1.06 to 1.07.1
On 05/19/2017 02:17 PM, Jose Lamego wrote: > > On 05/19/2017 10:25 AM, Burton, Ross wrote: >> On 18 May 2017 at 23:28, Jose Lamego <jose.a.lam...@linux.intel.com >> <mailto:jose.a.lam...@linux.intel.com>> wrote: >> >> bc recipe must be upgraded to latest version in upstream. >> >> bc license changed from "GPLv2+ & LGPLv2.1" to "GPLv3+ & LGPLv3" >> The new version exhibits a Parallel Make Race that required >> unsetting PARALLEL_MAKE variable. >> This change was tested with core-image-minimal in qemux86. >> >> >> It would be appreciated if you could spend a few minutes looking at what >> the build race is and pushing a fix upstream. Or at least include a >> comment showing the failure. >> >> I chased the sed thing as previous releases didn't need it: my build >> machine doesn't even have ed installed so HOSTTOOLS won't help. This >> appears to be a regression as 1.06 shipped the file that needs ed to >> build. The makefile now always builds a binary to generate a file that >> it then runs through ed, and it doesn't build this tool correctly in a >> cross environment either: >> >> | /bin/bash: ./fbc: cannot execute binary file: Exec format error >> >> (it's trying to run an arm binary on x86) >> >> I'd suggest that we approach the upstream maintainer and discuss: >> 1) should the tarballs ship libmath.h instead of requiring it to be >> generated >> 2) using CC_FOR_BUILD etc from autoconf-archive to build fbc with the >> host compiler in cross-compile environments >> 3) can sed be used instead of ed to reduce the host requirements >> >> Ross > Agree. I will contact the bc maintainer and work on the build race. I'll > get back to you with the findings. Thanks for the suggestions! > Update: bc maintainer is working on version 1.07.2, which includes fixes for the ed and fbc errors and the Parallel Make race. This upgrade will be released soon, so we may skip 1.07.1 upgrade and wait for the new stable release. -- Jose Lamego | OTC Embedded Platform & Tools | GDC -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python*-setuptools: upgrade to 36.0.1
Both python-setuptools and python3-setuptools need to be
upgraded to latest upstream version.
license checksum is now targeted to be performed over the actual
license text at license file.
These changes were tested using qemux86 with core-image-minimal.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/recipes-devtools/python/python-setuptools.inc| 8
.../{python-setuptools_32.1.1.bb => python-setuptools_36.0.1.bb} | 0
...{python3-setuptools_32.1.1.bb => python3-setuptools_36.0.1.bb} | 0
3 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/python/{python-setuptools_32.1.1.bb =>
python-setuptools_36.0.1.bb} (100%)
rename meta/recipes-devtools/python/{python3-setuptools_32.1.1.bb =>
python3-setuptools_36.0.1.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-setuptools.inc
b/meta/recipes-devtools/python/python-setuptools.inc
index 40f47d4..c441035 100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -3,14 +3,14 @@ HOMEPAGE = "https://pypi.python.org/pypi/setuptools;
SECTION = "devel/python"
LICENSE = "MIT"
-LIC_FILES_CHKSUM =
"file://setup.py;beginline=146;endline=146;md5=3e8df024d6c1442d18e84acf8fbbc475"
+LIC_FILES_CHKSUM =
"file://LICENSE;beginline=1;endline=19;md5=9a33897f1bca1160d7aad3835152e158"
SRCNAME = "setuptools"
-SRC_URI =
"https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz;
+SRC_URI =
"https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.zip;
-SRC_URI[md5sum] = "8b67868c3430e978833ebd0d1b766694"
-SRC_URI[sha256sum] =
"8303fb24306385f09bf8b0e5a385c1548e42e8efc08558d64049bc0d55ea012d"
+SRC_URI[md5sum] = "430eb106788183eefe9f444a37f0"
+SRC_URI[sha256sum] =
"e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools;
diff --git a/meta/recipes-devtools/python/python-setuptools_32.1.1.bb
b/meta/recipes-devtools/python/python-setuptools_36.0.1.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-setuptools_32.1.1.bb
rename to meta/recipes-devtools/python/python-setuptools_36.0.1.bb
diff --git a/meta/recipes-devtools/python/python3-setuptools_32.1.1.bb
b/meta/recipes-devtools/python/python3-setuptools_36.0.1.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-setuptools_32.1.1.bb
rename to meta/recipes-devtools/python/python3-setuptools_36.0.1.bb
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-docutils: update to 0.14
python3-docutils recipe must be upgraded to latest stable release.
LIC_FILES_CHKSUM changed due to a typo fix from previous version,
but license type and information remained the same.
This change was tested on qemu with core-image-minimal.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
.../python/{python3-docutils_0.13.1.bb => python3-docutils_0.14.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/python/{python3-docutils_0.13.1.bb =>
python3-docutils_0.14.bb} (60%)
diff --git a/meta/recipes-devtools/python/python3-docutils_0.13.1.bb
b/meta/recipes-devtools/python/python3-docutils_0.14.bb
similarity index 60%
rename from meta/recipes-devtools/python/python3-docutils_0.13.1.bb
rename to meta/recipes-devtools/python/python3-docutils_0.14.bb
index e36388c..81a449d 100644
--- a/meta/recipes-devtools/python/python3-docutils_0.13.1.bb
+++ b/meta/recipes-devtools/python/python3-docutils_0.14.bb
@@ -2,13 +2,13 @@ SUMMARY = "Text processing system for documentation"
HOMEPAGE = "http://docutils.sourceforge.net;
SECTION = "devel/python"
LICENSE = "PSF & BSD-2-Clause & GPLv3"
-LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7a4646907ab9083c826280b19e103106"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=35a23d42b615470583563132872c97d6"
DEPENDS = "python3"
SRC_URI = "${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz"
-SRC_URI[md5sum] = "ea4a893c633c788be9b8078b6b305d53"
-SRC_URI[sha256sum] =
"718c0f5fb677be0f34b781e04241c4067cbd9327b66bdd8e763201130f5175be"
+SRC_URI[md5sum] = "c53768d63db3873b7d452833553469de"
+SRC_URI[sha256sum] =
"51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274"
S = "${WORKDIR}/docutils-${PV}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python*-setuptools: update to 36.2.7
Both python-setuptools and python3-setuptools must be updated
to latest stable release.
These changes were tested on qemu with core-image-minimal
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/recipes-devtools/python/python-setuptools.inc| 4 ++--
.../{python-setuptools_36.2.0.bb => python-setuptools_36.2.7.bb} | 0
.../{python3-setuptools_36.2.0.bb => python3-setuptools_36.2.7.bb}| 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-setuptools_36.2.0.bb =>
python-setuptools_36.2.7.bb} (100%)
rename meta/recipes-devtools/python/{python3-setuptools_36.2.0.bb =>
python3-setuptools_36.2.7.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-setuptools.inc
b/meta/recipes-devtools/python/python-setuptools.inc
index cd84233..ca521a9 100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -9,8 +9,8 @@ SRCNAME = "setuptools"
SRC_URI =
"https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.zip;
-SRC_URI[md5sum] = "60df703040ad8024d24727dc95483740"
-SRC_URI[sha256sum] =
"4c2bda3829c9dbbe9c2b33d89c4b1cb6d45813615ab8e248ad352e3697a96d81"
+SRC_URI[md5sum] = "b9e6c049617bac0f9e908a41ab4a29ac"
+SRC_URI[sha256sum] =
"b0fe5d432d922df595e918577c51458d63f245115d141b309ac32ecfca329df5"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools;
diff --git a/meta/recipes-devtools/python/python-setuptools_36.2.0.bb
b/meta/recipes-devtools/python/python-setuptools_36.2.7.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-setuptools_36.2.0.bb
rename to meta/recipes-devtools/python/python-setuptools_36.2.7.bb
diff --git a/meta/recipes-devtools/python/python3-setuptools_36.2.0.bb
b/meta/recipes-devtools/python/python3-setuptools_36.2.7.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-setuptools_36.2.0.bb
rename to meta/recipes-devtools/python/python3-setuptools_36.2.7.bb
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] packagegroup-python3: add packagegroup
Please disregard this patch. The python3 recipe provides python-modules,
which includes all of the listed packages, making a new packagegroup
unnecessary.
On 08/15/2017 04:05 PM, Jose Lamego wrote:
> Many of the most usual python3 modules are missing when
> trying to import them to python3 in images built with
> python3-core installed.
>
> This change creates the python3 packagegroup, containing
> the most usual python3 packages to be installed for images
> featuring complete python functionality by using the
> FEATURES_PACKAGES variable to define python3 as a new feature
> and then adding it to the image to build.
>
> [YOCTO #10667]
>
> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
> ---
> .../packagegroups/packagegroup-python3.bb | 85
> ++
> 1 file changed, 85 insertions(+)
> create mode 100644
> meta/recipes-devtools/packagegroups/packagegroup-python3.bb
>
> diff --git a/meta/recipes-devtools/packagegroups/packagegroup-python3.bb
> b/meta/recipes-devtools/packagegroups/packagegroup-python3.bb
> new file mode 100644
> index 000..ab83460
> --- /dev/null
> +++ b/meta/recipes-devtools/packagegroups/packagegroup-python3.bb
> @@ -0,0 +1,85 @@
> +SUMMARY = "Provides a basic set of python3 packages"
> +
> +DEPENDS = "python3-native"
> +
> +PR = "1"
> +
> +inherit packagegroup
> +
> +RPROVIDES_${PN} = "python3"
> +
> +RDEPENDS_${PN} = "\
> +libpython3 \
> +libpython3-staticdev \
> +python3-pyvenv \
> +python3-dbg \
> +python3-2to3 \
> +python3-argparse \
> +python3-asyncio \
> +python3-audio \
> +python3-codecs \
> +python3-compile \
> +python3-compression \
> +python3-core \
> +python3-crypt \
> +python3-ctypes \
> +python3-curses \
> +python3-datetime \
> +python3-db \
> +python3-debugger \
> +python3-dev \
> +python3-difflib \
> +python3-distutils \
> +python3-doctest \
> +python3-email \
> +python3-enum \
> +python3-fcntl \
> +python3-gdbm \
> +python3-html \
> +python3-idle \
> +python3-image \
> +python3-importlib \
> +python3-io \
> +python3-json \
> +python3-lang \
> +python3-logging \
> +python3-mailbox \
> +python3-math \
> +python3-mime \
> +python3-mmap \
> +python3-multiprocessing \
> +python3-netclient \
> +python3-netserver \
> +python3-numbers \
> +python3-pickle \
> +python3-pkgutil \
> +python3-pprint \
> +python3-profile \
> +python3-pydoc \
> +python3-re \
> +python3-readline \
> +python3-reprlib \
> +python3-resource \
> +python3-selectors \
> +python3-shell \
> +python3-signal \
> +python3-smtpd \
> +python3-sqlite3 \
> +python3-sqlite3-tests \
> +python3-stringold \
> +python3-subprocess \
> +python3-syslog \
> +python3-terminal \
> +python3-tests \
> +python3-textutils \
> +python3-threading \
> +python3-tkinter \
> +python3-typing \
> +python3-unittest \
> +python3-unixadmin \
> +python3-xml \
> +python3-xmlrpc \
> +python3-modules \
> +python3-misc \
> +python3-man \
> +"
--
Jose Lamego | OTC Embedded Platform & Tools | GDC
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] create-pull-request: add "-t in-reply-to" option
On 05/12/2017 04:18 PM, Christopher Larson wrote:
> Looks like the earlier version of this with the wrong -z vs -n got
> merged, please submit a follow-up patch to fix it.
>
Markus Lehtonen already sent a fix for the -n validation in
http://lists.openembedded.org/pipermail/openembedded-core/2017-May/136648.html
however, I've sent an additional patch that fixes the alternatives case
construct syntax in
http://lists.openembedded.org/pipermail/openembedded-core/2017-May/136699.html
Thanks for the heads up.
> On Wed, Apr 5, 2017 at 12:38 PM, Jose Lamego
> <jose.a.lam...@linux.intel.com <mailto:jose.a.lam...@linux.intel.com>>
> wrote:
>
> The create-pull-request script creates patches as replies to a cover
> letter, in the form of an email thread. If further revisions are sent to
> the mailing list without referencing to the first revision, these new
> revisions are not identified at the mailing list as part of the original
> thread, but as a new thread instead.
>
> This change adds the "[-t in_reply_to]" option, where "in_reply_to" is
> the original cover letter's Message-Id, so this reference is added
> to the new cover letter to ensure the thread continuity.
>
> [YOCTO #11294]
>
> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com
> <mailto:jose.a.lam...@linux.intel.com>>
> ---
> scripts/create-pull-request | 17 +
> 1 file changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/create-pull-request b/scripts/create-pull-request
> index e82858b..8f0be99 100755
> --- a/scripts/create-pull-request
> +++ b/scripts/create-pull-request
> @@ -34,7 +34,7 @@ RFC=0
> usage() {
> CMD=$(basename $0)
> cat < -Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject]
> [-r relative_to] [-i commit_id] [-d relative_dir] -u remote [-b branch]
> +Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject]
> [-r relative_to] [-i commit_id] [-d relative_dir] -u remote [-b
> branch] [-t in_reply_to]
>-b branch Branch name in the specified remote (default:
> current branch)
>-l local branch Local branch name (default: HEAD)
>-c Create an RFC (Request for Comment) patch series
> @@ -49,6 +49,7 @@ Usage: $CMD [-h] [-o output_dir] [-m
> msg_body_file] [-s subject] [-r relative_to
>-s subject The subject to be inserted into the summary email
>-u remote The git remote where the branch is located,
> or set CPR_CONTRIB_REMOTE in env
>-d relative_dir Generate patches relative to directory
> + -t in_reply_to Make mails appear as replies to the given
> Message-Id, to continue patch/series threads
>
> Examples:
> $CMD -u contrib -b nitin/basic
> @@ -57,12 +58,13 @@ Usage: $CMD [-h] [-o output_dir] [-m
> msg_body_file] [-s subject] [-r relative_to
> $CMD -u contrib -r master -i misc -b nitin/misc -o pull-misc
> $CMD -u contrib -p "RFC PATCH" -b nitin/experimental
> $CMD -u contrib -i misc -b nitin/misc -d ./bitbake
> + $CMD -u contrib -p "OE-core][PATCH v2" -t
> "<cover.11146.git.john@example.com
> <mailto:cover.11146.git.john@example.com>>"
> EOM
> }
>
> REMOTE="$CPR_CONTRIB_REMOTE"
> # Parse and validate arguments
> -while getopts "b:acd:hi:m:o:p:r:s:u:l:" OPT; do
> +while getopts "b:acd:hi:m:o:p:r:s:u:l:t:" OPT; do
> case $OPT in
> b)
> BRANCH="$OPTARG"
> @@ -108,7 +110,10 @@ while getopts "b:acd:hi:m:o:p:r:s:u:l:" OPT; do
> a)
> CPR_CONTRIB_AUTO_PUSH="1"
> ;;
> - esac
> +t)
> +IN_REPLY_TO="$OPTARG"
> +;;
> +esac
> done
>
> if [ -z "$REMOTE" ]; then
> @@ -205,7 +210,11 @@ if [ -n "$RELDIR" ]; then
> fi
>
> # Generate the patches and cover letter
> -git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o
> $ODIR --thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID >
> /dev/null
> +if [ -n "$IN_REPLY_TO" ]; then
> +git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n
> -o $ODIR --thread=shallow --in-reply-to="$IN_REPLY_TO"
> --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
> +else
> +
[OE-core] [PATCH] create-pull-request: Fix alternatives case construct syntax
Each alternative in options case construct must be sepparated by a double semicolon. This change adds the double semicolon for the "t)" option. Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com> --- scripts/create-pull-request | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/create-pull-request b/scripts/create-pull-request index 46d6538..aa21612 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -112,6 +112,7 @@ while getopts "b:acd:hi:m:o:p:r:s:u:l:t:" OPT; do ;; t) IN_REPLY_TO="$OPTARG" +;; esac done -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-pygobject: upgrade to 3.24.1
From: Upgrade Helper <a...@auh.yoctoproject.org>
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
.../{python3-pygobject_3.22.0.bb => python3-pygobject_3.24.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-pygobject_3.22.0.bb =>
python3-pygobject_3.24.1.bb} (87%)
diff --git a/meta/recipes-devtools/python/python3-pygobject_3.22.0.bb
b/meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
similarity index 87%
rename from meta/recipes-devtools/python/python3-pygobject_3.22.0.bb
rename to meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
index 143048d..5795ae3 100644
--- a/meta/recipes-devtools/python/python3-pygobject_3.22.0.bb
+++ b/meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
@@ -13,8 +13,8 @@ SRC_URI = " \
file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \
"
-SRC_URI[md5sum] = "ed4117ed5d554d25fd7718807fbf819f"
-SRC_URI[sha256sum] =
"08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7"
+SRC_URI[md5sum] = "69a843311d0f0385dff376e11a2d83d2"
+SRC_URI[sha256sum] =
"a628a95aa0909e13fb08230b1b98fc48adef10b220932f76d62f6821b3fdbffd"
S = "${WORKDIR}/${SRCNAME}-${PV}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] python3-pygobject: upgrade to 3.24.1
Upgrade to latest upstream version
tested on qemux86 with core-image-sato
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
Notes:
Changes in V2:
Removed AUH reference and added test information
.../{python3-pygobject_3.22.0.bb => python3-pygobject_3.24.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-pygobject_3.22.0.bb =>
python3-pygobject_3.24.1.bb} (87%)
diff --git a/meta/recipes-devtools/python/python3-pygobject_3.22.0.bb
b/meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
similarity index 87%
rename from meta/recipes-devtools/python/python3-pygobject_3.22.0.bb
rename to meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
index 143048d..5795ae3 100644
--- a/meta/recipes-devtools/python/python3-pygobject_3.22.0.bb
+++ b/meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
@@ -13,8 +13,8 @@ SRC_URI = " \
file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \
"
-SRC_URI[md5sum] = "ed4117ed5d554d25fd7718807fbf819f"
-SRC_URI[sha256sum] =
"08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7"
+SRC_URI[md5sum] = "69a843311d0f0385dff376e11a2d83d2"
+SRC_URI[sha256sum] =
"a628a95aa0909e13fb08230b1b98fc48adef10b220932f76d62f6821b3fdbffd"
S = "${WORKDIR}/${SRCNAME}-${PV}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python*-git: Upgrade to version 2.1.5
Both python-git and python3-git need to be upgraded to latest
upstream version.
Two RDEPENDS are added: "git" and "python-unittest" to python-git recipe
and "git" to python3-git recipe.
These changes were tested using qemux86 with core-image-minimal.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/recipes-devtools/python/python-git.inc | 4 ++--
.../python/{python-git_2.1.3.bb => python-git_2.1.5.bb} | 2 +-
.../python/{python3-git_2.1.3.bb => python3-git_2.1.5.bb} | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/python/{python-git_2.1.3.bb =>
python-git_2.1.5.bb} (85%)
rename meta/recipes-devtools/python/{python3-git_2.1.3.bb =>
python3-git_2.1.5.bb} (81%)
diff --git a/meta/recipes-devtools/python/python-git.inc
b/meta/recipes-devtools/python/python-git.inc
index 825e795d9..777608c 100644
--- a/meta/recipes-devtools/python/python-git.inc
+++ b/meta/recipes-devtools/python/python-git.inc
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=8b8d26c37c1d5a04f9b0186edbebc183"
SRC_URI =
"https://files.pythonhosted.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz;
-SRC_URI[md5sum] = "6cd18008c03a767740f3bf6d89ef79bc"
-SRC_URI[sha256sum] =
"3826185b11e1fc372e7d31251e9b65e11ccb7c27f82c771d619048bdb5b66c81"
+SRC_URI[md5sum] = "df94212b19d270a625b67b4c84ac9a41"
+SRC_URI[sha256sum] =
"5c00cbd256e2b1d039381d4f7d71fcb7ee5cc196ca10c101ff7191bd82ab5d9c"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/GitPython/;
UPSTREAM_CHECK_REGEX = "/GitPython/(?P(\d+[\.\-_]*)+)"
diff --git a/meta/recipes-devtools/python/python-git_2.1.3.bb
b/meta/recipes-devtools/python/python-git_2.1.5.bb
similarity index 85%
rename from meta/recipes-devtools/python/python-git_2.1.3.bb
rename to meta/recipes-devtools/python/python-git_2.1.5.bb
index e49dbea..779e606 100644
--- a/meta/recipes-devtools/python/python-git_2.1.3.bb
+++ b/meta/recipes-devtools/python/python-git_2.1.5.bb
@@ -4,4 +4,4 @@ DEPENDS = "python-gitdb"
inherit setuptools
-RDEPENDS_${PN} += "python-gitdb python-lang python-io python-shell python-math
python-re python-subprocess python-stringold python-unixadmin"
+RDEPENDS_${PN} += "python-gitdb python-lang python-io python-shell python-math
python-re python-subprocess python-stringold python-unixadmin python-unittest
git"
diff --git a/meta/recipes-devtools/python/python3-git_2.1.3.bb
b/meta/recipes-devtools/python/python3-git_2.1.5.bb
similarity index 81%
rename from meta/recipes-devtools/python/python3-git_2.1.3.bb
rename to meta/recipes-devtools/python/python3-git_2.1.5.bb
index 7a2d452..4ac2a0e 100644
--- a/meta/recipes-devtools/python/python3-git_2.1.3.bb
+++ b/meta/recipes-devtools/python/python3-git_2.1.5.bb
@@ -4,4 +4,4 @@ DEPENDS = "python3-gitdb"
inherit setuptools3
-RDEPENDS_${PN} += "python3-gitdb python3-lang python3-io python3-shell
python3-math python3-re python3-subprocess python3-stringold python3-unixadmin
python3-enum python3-logging python3-datetime python3-netclient
python3-unittest python3-argparse"
+RDEPENDS_${PN} += "python3-gitdb python3-lang python3-io python3-shell
python3-math python3-re python3-subprocess python3-stringold python3-unixadmin
python3-enum python3-logging python3-datetime python3-netclient
python3-unittest python3-argparse git"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] conf/bitbake.conf: include ed in hosttools
On 05/19/2017 04:02 AM, Anders Darander wrote: > * Khem Raj <raj.k...@gmail.com> [170519 01:17]: > >> On Thu, May 18, 2017 at 4:12 PM, Richard Purdie >> <richard.pur...@linuxfoundation.org> wrote: >>> On Thu, 2017-05-18 at 17:28 -0500, Jose Lamego wrote: >>>> Some recipes build fail due to missing ed command. > >>>> This change includes ed to the hosttools required to >>>> run builds with oe-core. > >>>> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com> >>>> Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonza...@linux.in >>>> tel.com> > >>> We really don't want to add ed here. Which recipes are failing and why >>> do we need ed to build them? This patch is a requisite for the bc recipe update from 1.06 to 1.07.1, which fails due to ed command not found during building. > >> we also need whoami which kernel uses to identify the build user id > > > No, we don't want to add whoami... > > As fas as I can (in a recent kernel), whoami is only used in > scripts/mkcompile_h. And there, it's only used if $KBUILD_BUILD_USER is > empty. I'd rather see that we set $KBUILD_BUILD_USER to something > deterministic in our kernel.bbclass. > > Cheers, > Anders > -- Jose Lamego | OTC Embedded Platforms & Tools | GDC signature.asc Description: OpenPGP digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] manpages.bbclass: avoid QA warning when "manpages" feature not supported
On 05/25/2017 03:06 AM, Alexander Kanavin wrote: > On 05/24/2017 11:54 PM, Jose Lamego wrote: >> Sorry is miss this message. >> >> The command line is missing the squared brackets (the following should >> do the work since I may have permissions): >> >> [Patchwork-Status: Rejected] >> >> Guys: Do you believe we should drop the brackets requirement? > > You can support both brackets and no-brackets. > > The problem is that this feature is not documented, nobody knows about > it, and we lack established practices around it. Who should be using it? > I'd say only the author of the patch or people with commit rights to > master (RP, Ross). I've added an entry to the OE-Patchwork wiki: https://www.openembedded.org/wiki/Patchwork#Update_the_state_of_patches > > Alex > -- Jose Lamego | OTC Embedded Platforms & Tools | GDC signature.asc Description: OpenPGP digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] bc: upgrade 1.06 to 1.07.1
bc recipe must be upgraded to latest version in upstream.
bc license changed from "GPLv2+ & LGPLv2.1" to "GPLv3+ & LGPLv3"
The new version exhibits a Parallel Make Race that required
unsetting PARALLEL_MAKE variable.
This change was tested with core-image-minimal in qemux86.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonza...@linux.intel.com>
Signed-off-by: Alejandro Hernandez <alejandro.hernan...@linux.intel.com>
---
.../bc/{bc_1.06.bb => bc_1.07.1.bb}| 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
rename meta/recipes-extended/bc/{bc_1.06.bb => bc_1.07.1.bb} (28%)
diff --git a/meta/recipes-extended/bc/bc_1.06.bb
b/meta/recipes-extended/bc/bc_1.07.1.bb
similarity index 28%
rename from meta/recipes-extended/bc/bc_1.06.bb
rename to meta/recipes-extended/bc/bc_1.07.1.bb
index d8c8a86..55b4422 100644
--- a/meta/recipes-extended/bc/bc_1.06.bb
+++ b/meta/recipes-extended/bc/bc_1.07.1.bb
@@ -1,25 +1,25 @@
SUMMARY = "Arbitrary precision calculator language"
HOMEPAGE = "http://www.gnu.org/software/bc/bc.html;
-LICENSE = "GPLv2+ & LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
-
file://bc/bcdefs.h;endline=31;md5=46dffdaf10a99728dd8ce358e45d46d8 \
-
file://dc/dc.h;endline=25;md5=2f9c558cdd80e31b4d904e48c2374328 \
-
file://lib/number.c;endline=31;md5=99434a0898abca7784acfd36b8191199"
+LICENSE = "GPLv3+ & LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
+
file://bc/bcdefs.h;endline=27;md5=1bf4215734d4b9002ffda7b90b14e8e9 \
+
file://dc/dc.h;endline=20;md5=be0fc95c3503cb8116eea6acb63a5922 \
+
file://lib/number.c;endline=31;md5=5c437fc63f83a46d4d769d4dd1e74525"
SECTION = "base"
DEPENDS = "flex"
-PR = "r3"
-SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz \
- file://fix-segment-fault.patch "
+SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz"
-SRC_URI[md5sum] = "d44b5dddebd8a7a7309aea6c36fda117"
-SRC_URI[sha256sum] =
"4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33"
+SRC_URI[md5sum] = "cda93857418655ea43590736fc3ca9fc"
+SRC_URI[sha256sum] =
"62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a"
inherit autotools texinfo update-alternatives
+PARALLEL_MAKE = ""
+
ALTERNATIVE_${PN} = "dc"
ALTERNATIVE_PRIORITY = "100"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] conf/bitbake.conf: include ed in hosttools
Some recipes build fail due to missing ed command.
This change includes ed to the hosttools required to
run builds with oe-core.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonza...@linux.intel.com>
---
meta/conf/bitbake.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 8e4f4bb..64f1a54 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -459,7 +459,7 @@ HOSTTOOLS_DIR = "${TMPDIR}/hosttools"
# Tools needed to run builds with OE-Core
HOSTTOOLS += " \
[ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp cp cpio \
-cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \
+cpp cut date dd diff diffstat dirname du echo ed egrep env expand expr
false \
fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \
head hostname install ld ldd ln ls make makeinfo md5sum mkdir mknod \
mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd python
python2 \
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] bc: upgrade 1.06 to 1.07.1
bc recipe must be upgraded to latest version in upstream.
Changes in this series:
include ed to the hosttools required to run builds with oe-core,
since the new bc version requires the ed command during build
upgrade bc version from 1.06 to 1.07.1
update bc license from "GPLv2+ & LGPLv2.1" to "GPLv3+ & LGPLv3"
unset PARALLEL_MAKE variable in bc recipe to prevent a
Parallel Make Race during build
Jose Lamego (2):
conf/bitbake.conf: include ed in hosttools
bc: upgrade 1.06 to 1.07.1
meta/conf/bitbake.conf | 2 +-
.../bc/{bc_1.06.bb => bc_1.07.1.bb}| 22 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
rename meta/recipes-extended/bc/{bc_1.06.bb => bc_1.07.1.bb} (28%)
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] bc: upgrade 1.06 to 1.07.1
On 05/19/2017 10:25 AM, Burton, Ross wrote: > > On 18 May 2017 at 23:28, Jose Lamego <jose.a.lam...@linux.intel.com > <mailto:jose.a.lam...@linux.intel.com>> wrote: > > bc recipe must be upgraded to latest version in upstream. > > bc license changed from "GPLv2+ & LGPLv2.1" to "GPLv3+ & LGPLv3" > The new version exhibits a Parallel Make Race that required > unsetting PARALLEL_MAKE variable. > This change was tested with core-image-minimal in qemux86. > > > It would be appreciated if you could spend a few minutes looking at what > the build race is and pushing a fix upstream. Or at least include a > comment showing the failure. > > I chased the sed thing as previous releases didn't need it: my build > machine doesn't even have ed installed so HOSTTOOLS won't help. This > appears to be a regression as 1.06 shipped the file that needs ed to > build. The makefile now always builds a binary to generate a file that > it then runs through ed, and it doesn't build this tool correctly in a > cross environment either: > > | /bin/bash: ./fbc: cannot execute binary file: Exec format error > > (it's trying to run an arm binary on x86) > > I'd suggest that we approach the upstream maintainer and discuss: > 1) should the tarballs ship libmath.h instead of requiring it to be > generated > 2) using CC_FOR_BUILD etc from autoconf-archive to build fbc with the > host compiler in cross-compile environments > 3) can sed be used instead of ed to reduce the host requirements > > Ross Agree. I will contact the bc maintainer and work on the build race. I'll get back to you with the findings. Thanks for the suggestions! -- Jose Lamego | OTC Embedded Platforms & Tools | GDC signature.asc Description: OpenPGP digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Patchwork git hooks for meta-oe repository
On 06/14/2017 07:57 AM, Martin Jansa wrote: > I don't know if they are supposed to work now, but the output from git > remote indicates that they probably don't work: > Yes, we found this issue when enabling the hook for automated updates for all the Patchwork projects. I've disabled the hook while finding a fix. Thanks for the heads up and sorry for any inconvenience. Jose Lamego > remote: /usr/local/patchwork/tools/post-receive_standalone.hook: line > 65: $4: unbound variable > > remote: ++ git -C Next rev-parse > remote: ++ git -C Next rev-list --stdin --no-merges --reverse > cd021470e9055422992a1adeae3f1f1ec59deab6..3e6defe4735b9a0 > c5757bd25eea6158c7e9d567f > remote: fatal: Cannot change to 'Next': No such file or directory > remote: fatal: Cannot change to 'Next': No such file or directory > > > Whole output from 2 pushes today: > > OE @~/meta-openembedded $git push origin master > Counting objects: 170, done. > Delta compression using up to 8 threads. > Compressing objects: 100% (161/161), done. > Writing objects: 100% (170/170), 34.85 KiB | 0 bytes/s, done. > Total 170 (delta 89), reused 1 (delta 0) > remote: + > STATE_MAP='refs/heads/master:Accepted;refs/heads/master-next:Master > Next;refs/heads/ross/mut:Master U > nder Test' > remote: + EXCLUDE= > remote: + PWDIR=/usr/local/patchwork/patchwork > remote: + '[' -d /usr/local/patchwork/patchwork ']' > remote: + '[' '!' -w /usr/local/patchwork/patchwork/post-receive_logs ']' > remote: + do_exit=0 > remote: + trap do_exit=1 INT > remote: + > ERR_LOG_FILE=/usr/local/patchwork/patchwork/post-receive_logs/post_receive_standalone.log > > remote: + '[' '!' -f > /usr/local/patchwork/patchwork/post-receive_logs/post_receive_standalone.log > ']' > remote: + read oldrev newrev refname workdir > remote: + found=0 > remote: + IFS=';' > remote: + for i in '$STATE_MAP' > remote: + key=refs/heads/master > remote: + IFS=' ' > remote: + '[' refs/heads/master = refs/heads/master ']' > remote: ++ date > remote: + echo -e 'Wed Jun 14 12:51:55 UTC 2017 I: Started patch-update > attempt using commit d3dd8bc3721f3958eb7ddeb026 > f7221d48daa986.\n' > remote: + update_patches 0abf5af3ffd3d13c009a8ffcd5a6f045c36be837 > d3dd8bc3721f3958eb7ddeb026f7221d48daa986 Accepted > remote: + local cnt > remote: + cnt=0 > remote: + local workdir > remote: /usr/local/patchwork/tools/post-receive_standalone.hook: line > 65: $4: unbound variable > remote: Sending notification emails to: > openembedded-comm...@lists.openembedded.org > <mailto:openembedded-comm...@lists.openembedded.org> > To git.openembedded.org:meta-openembedded > 0abf5af3f..d3dd8bc37 master -> master > > OE @~/meta-openembedded $git push -f origin master-next > Counting objects: 183, done. > Delta compression using up to 8 threads. > Compressing objects: 100% (144/144), done. > Writing objects: 100% (183/183), 60.26 KiB | 0 bytes/s, done. > Total 183 (delta 89), reused 85 (delta 31) > remote: + > STATE_MAP='refs/heads/master:Accepted;refs/heads/master-next:Master > Next;refs/heads/ross/mut:Master Under Tes > t' > remote: + EXCLUDE= > remote: + PWDIR=/usr/local/patchwork/patchwork > remote: + '[' -d /usr/local/patchwork/patchwork ']' > remote: + '[' '!' -w /usr/local/patchwork/patchwork/post-receive_logs ']' > remote: + do_exit=0 > remote: + trap do_exit=1 INT > remote: + > ERR_LOG_FILE=/usr/local/patchwork/patchwork/post-receive_logs/post_receive_standalone.log > > remote: + '[' '!' -f > /usr/local/patchwork/patchwork/post-receive_logs/post_receive_standalone.log > ']' > remote: + read oldrev newrev refname workdir > remote: + found=0 > remote: + IFS=';' > remote: + for i in '$STATE_MAP' > remote: + key=refs/heads/master > remote: + IFS=' ' > remote: + '[' refs/heads/master = refs/heads/master-next ']' > remote: + for i in '$STATE_MAP' > remote: + key=refs/heads/master-next > remote: + IFS=' ' > remote: + '[' refs/heads/master-next = refs/heads/master-next ']' > remote: ++ date > remote: + echo -e 'Wed Jun 14 12:52:04 UTC 2017 I: Started patch-update > attempt using commit 3e6defe4735b9a0c5757bd25ee > a6158c7e9d567f.\n' > remote: + update_patches cd021470e9055422992a1adeae3f1f1ec59deab6 > 3e6defe4735b9a0c5757bd25eea6158c7e9d567f Master Next > remote: + local cnt > remote: + cnt=0 > remote: + local workdir > remote: + workdir=Next > remote: + local revparse > remote: + local revs > remote: + '[' -z '' ']' > remote: + revparse=rev-parse > remote: ++ git -C Next rev-parse > remote: ++ git -C Next rev-list --stdin --no-merges --reverse > cd021470e9055422992a1adeae3f1f1ec59deab6..3e6defe4735b9a0 > c5757bd25eea6158c7e9d567f > remote: fatal: Cannot cha
Re: [OE-core] [PATCH] manpages.bbclass: avoid QA warning when "manpages" feature not supported
On 05/15/2017 08:06 AM, Burton, Ross wrote: > Hi Jose, > > On 15 May 2017 at 13:24, Patrick Ohly <patrick.o...@intel.com > <mailto:patrick.o...@intel.com>> wrote: > > Patchwork-Status: Rejected > > > The patch in patchworks hasn't been updated > (https://patchwork.openembedded.org/series/6723/), I thought patchworks > was listening for these commands now? Sorry is miss this message. The command line is missing the squared brackets (the following should do the work since I may have permissions): [Patchwork-Status: Rejected] Guys: Do you believe we should drop the brackets requirement? > > Ross > > -- Jose Lamego | OTC Embedded Platforms & Tools | GDC signature.asc Description: OpenPGP digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] manpages.bbclass: avoid QA warning when "manpages" feature not supported
Evidently, I don't have the required permissions (you can see the previous system-generated comment). -- Jose Lamego | OTC Embedded Platforms & Tools | GDC signature.asc Description: OpenPGP digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] python3-numpy: upgrade to 1.13.3
On 10/16/2017 04:45 PM, Burton, Ross wrote: > On 11 October 2017 at 22:15, Jose Lamego <jose.a.lam...@linux.intel.com> > wrote: > >> -SRC_URI[md5sum] = "6d459e4a24f5035f720dda3c57716a92" >> -SRC_URI[sha256sum] = "de020ec06f1e9ce1115a50161a38bf >> 8d4c2525379900f9cb478cc613a1e7cd93" >> +SRC_URI[md5sum] = "c1d433e5973e548809e80c9118474b73" >> +SRC_URI[sha256sum] = "4c6b4eef790528bebb7ec9590d74cc >> 193868940fe68e4109a91c196df" >> > ERROR: python3-numpy-1.13.3-r0 do_fetch: Fetcher failure for URL: ' > https://github.com/numpy/numpy/releases/download/v1.13.3/numpy-1.13.3.tar.gz'. > Checksum mismatch! > File: '/home/ross/Yocto/downloads/numpy-1.13.3.tar.gz' has sha256 checksum > 4c6b4eef790528bebb7ec9590d74cc193868940fe68e4109a91c196df72d8094 when > 4c6b4eef790528bebb7ec9590d74cc193868940fe68e4109a91c196df was expected > If this change is expected (e.g. you have upgraded to a new version without > updating the checksums) then you can use these lines within the recipe: > SRC_URI[md5sum] = "c1d433e5973e548809e80c9118474b73" > SRC_URI[sha256sum] = > "4c6b4eef790528bebb7ec9590d74cc193868940fe68e4109a91c196df72d8094" > > Looks like the copy/paste for the checksum was truncated, no idea how this > built! > > I've fixed locally and am build testing now. I'm pretty sure this was my mistake. Thanks > > Ross > -- Jose Lamego | OTC Embedded Platform & Tools | GDC -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] python3-pycairo: update to 1.15.3
python3-pycairo needs to be updated to latest stable release.
Changes in this update:
SRC_URI updated to new GitHub repository.
LICENSE updated to LGPLv2.1 & MPLv1.1.
LICENSE_FILES_CHkSUM updated accordingly to new License.
inherit distutils3 replaced with setuptools3.
waf-related instructions dropped due to use of setuptools3.
py3cairo header file copied to "includedir" where it is assumed
to be located by some dependencies.
This change was tested in qemux86 running core-image-minimal
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
.../python/python3-pycairo_1.10.0.bb | 42 --
.../python/python3-pycairo_1.15.3.bb | 30
2 files changed, 30 insertions(+), 42 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3-pycairo_1.10.0.bb
create mode 100644 meta/recipes-devtools/python/python3-pycairo_1.15.3.bb
diff --git a/meta/recipes-devtools/python/python3-pycairo_1.10.0.bb
b/meta/recipes-devtools/python/python3-pycairo_1.10.0.bb
deleted file mode 100644
index 9258ba1..000
--- a/meta/recipes-devtools/python/python3-pycairo_1.10.0.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-SUMMARY = "Python bindings for the Cairo canvas library"
-HOMEPAGE = "http://cairographics.org/pycairo;
-BUGTRACKER = "http://bugs.freedesktop.org;
-SECTION = "python-devel"
-LICENSE = "LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-file://COPYING.LESSER;md5=e6a600fd5e1d9cbde2d983680233ad02"
-
-# cairo >= 1.8.8
-DEPENDS = "cairo"
-PR = "r2"
-
-SRC_URI = "http://cairographics.org/releases/pycairo-${PV}.tar.bz2;
-
-SRC_URI[md5sum] = "e6fd3f2f1e6a72e0db0868c4985669c5"
-SRC_URI[sha256sum] =
"9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be"
-
-S = "${WORKDIR}/pycairo-${PV}"
-
-inherit distutils3 pkgconfig
-
-CFLAGS += "-fPIC"
-
-BBCLASSEXTEND = "native"
-
-do_configure() {
- PYTHON=${PYTHON} ./waf configure --prefix=${D}${prefix}
--libdir=${D}${libdir}
-}
-
-do_compile() {
- ./waf build ${PARALLEL_MAKE}
-}
-
-do_install() {
- ./waf install
- sed \
- -e 's:@prefix@:${prefix}:' \
- -e 's:@VERSION@:${PV}:' \
- -e 's:@includedir@:${includedir}:' \
- py3cairo.pc.in > py3cairo.pc
- install -m 0644 py3cairo.pc ${D}${libdir}/pkgconfig/
-}
diff --git a/meta/recipes-devtools/python/python3-pycairo_1.15.3.bb
b/meta/recipes-devtools/python/python3-pycairo_1.15.3.bb
new file mode 100644
index 000..7863ad2
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pycairo_1.15.3.bb
@@ -0,0 +1,30 @@
+SUMMARY = "Python bindings for the Cairo canvas library"
+HOMEPAGE = "http://cairographics.org/pycairo;
+BUGTRACKER = "http://bugs.freedesktop.org;
+SECTION = "python-devel"
+LICENSE = "LGPLv2.1 & MPLv1.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f2e071ab72978431b294a0d696327421 \
+
file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29 \
+
file://COPYING-MPL-1.1;md5=bfe1f75d606912a4111c90743d6c7325"
+
+# cairo >= 1.14
+DEPENDS = "cairo"
+
+SRC_URI =
"https://github.com/pygobject/pycairo/releases/download/v${PV}/pycairo-${PV}.tar.gz;
+
+SRC_URI[md5sum] = "7390cd413271fe5569f6eef73d72bf7a"
+SRC_URI[sha256sum] =
"8642e36cef66acbfc02760d2b40c716f5f183d073fb063ba28fd29a14044719d"
+
+S = "${WORKDIR}/pycairo-${PV}"
+
+inherit setuptools3 pkgconfig
+
+CFLAGS += "-fPIC"
+
+BBCLASSEXTEND = "native"
+
+do_install_append() {
+install -d ${D}${includedir}/pycairo/
+install -m 0644 ${D}${datadir}/include/pycairo/py3cairo.h
${D}${includedir}/pycairo/
+}
+FILES_${PN} += "${datadir}/include/pycairo/py3cairo.h"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] pycairo & pygobject updates
python3-pycairo and python3-pygobject recipes must be updated to latest
stable release.
Being python3-cairo a dependency for python3-pygobject, the former must
be updated before the latter, due to version requirements.
Changes are detailed in each commit message.
Jose Lamego (2):
python3-pycairo: update to 1.15.3
python3-pygobject: update to 3.26.0
.../python/python3-pycairo_1.10.0.bb | 42 --
.../python/python3-pycairo_1.15.3.bb | 30
...bject_3.24.1.bb => python3-pygobject_3.26.0.bb} | 6 ++--
3 files changed, 32 insertions(+), 46 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3-pycairo_1.10.0.bb
create mode 100644 meta/recipes-devtools/python/python3-pycairo_1.15.3.bb
rename meta/recipes-devtools/python/{python3-pygobject_3.24.1.bb =>
python3-pygobject_3.26.0.bb} (76%)
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] python3-pygobject: update to 3.26.0
python3-pygobject needs to be updated to latest stable branch.
This change was tested in qemux86 running core-image-minimal.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
.../{python3-pygobject_3.24.1.bb => python3-pygobject_3.26.0.bb}| 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/python/{python3-pygobject_3.24.1.bb =>
python3-pygobject_3.26.0.bb} (76%)
diff --git a/meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
b/meta/recipes-devtools/python/python3-pygobject_3.26.0.bb
similarity index 76%
rename from meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
rename to meta/recipes-devtools/python/python3-pygobject_3.26.0.bb
index 9d10af2..f368e6c 100644
--- a/meta/recipes-devtools/python/python3-pygobject_3.24.1.bb
+++ b/meta/recipes-devtools/python/python3-pygobject_3.26.0.bb
@@ -10,12 +10,10 @@ DEPENDS += "python3 glib-2.0"
SRCNAME="pygobject"
SRC_URI = " \
http://ftp.gnome.org/pub/GNOME/sources/${SRCNAME}/${@gnome_verdir("${PV}")}/${SRCNAME}-${PV}.tar.xz
\
-file://0001-configure.ac-add-sysroot-path-to-GI_DATADIR-don-t-se.patch \
-file://0001-configure.ac-Don-t-use-gnome-common-macros.patch \
"
-SRC_URI[md5sum] = "69a843311d0f0385dff376e11a2d83d2"
-SRC_URI[sha256sum] =
"a628a95aa0909e13fb08230b1b98fc48adef10b220932f76d62f6821b3fdbffd"
+SRC_URI[md5sum] = "1c1719b1798cc8bf1cb9c41c83d1"
+SRC_URI[sha256sum] =
"7411acd600c8cb6f00d2125afa23303f2104e59b83e0a4963288dbecc3b029fa"
S = "${WORKDIR}/${SRCNAME}-${PV}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python*-setuptools: update to 36.5.0
Both python-setuptools and python3-setuptools must be updated
to latest stable release.
These changes were tested on qemu with core-image-minimal
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/recipes-devtools/python/python-setuptools.inc| 4 ++--
.../{python-setuptools_36.2.7.bb => python-setuptools_36.5.0.bb} | 0
.../{python3-setuptools_36.2.7.bb => python3-setuptools_36.5.0.bb}| 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-setuptools_36.2.7.bb =>
python-setuptools_36.5.0.bb} (100%)
rename meta/recipes-devtools/python/{python3-setuptools_36.2.7.bb =>
python3-setuptools_36.5.0.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-setuptools.inc
b/meta/recipes-devtools/python/python-setuptools.inc
index ca521a9..1eae0b6 100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -9,8 +9,8 @@ SRCNAME = "setuptools"
SRC_URI =
"https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.zip;
-SRC_URI[md5sum] = "b9e6c049617bac0f9e908a41ab4a29ac"
-SRC_URI[sha256sum] =
"b0fe5d432d922df595e918577c51458d63f245115d141b309ac32ecfca329df5"
+SRC_URI[md5sum] = "704f500dd55f4bd0be905444f3ba892c"
+SRC_URI[sha256sum] =
"ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/setuptools;
diff --git a/meta/recipes-devtools/python/python-setuptools_36.2.7.bb
b/meta/recipes-devtools/python/python-setuptools_36.5.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-setuptools_36.2.7.bb
rename to meta/recipes-devtools/python/python-setuptools_36.5.0.bb
diff --git a/meta/recipes-devtools/python/python3-setuptools_36.2.7.bb
b/meta/recipes-devtools/python/python3-setuptools_36.5.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-setuptools_36.2.7.bb
rename to meta/recipes-devtools/python/python3-setuptools_36.5.0.bb
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-numpy: upgrade to 1.13.3
python3-numpy needs to be upgraded to latest stable version.
This change was tested on qemux86 running core-image-minimal.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
.../python-numpy/{python3-numpy_1.13.1.bb => python3-numpy_1.13.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python-numpy/{python3-numpy_1.13.1.bb =>
python3-numpy_1.13.3.bb} (95%)
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.13.1.bb
b/meta/recipes-devtools/python-numpy/python3-numpy_1.13.3.bb
similarity index 95%
rename from meta/recipes-devtools/python-numpy/python3-numpy_1.13.1.bb
rename to meta/recipes-devtools/python-numpy/python3-numpy_1.13.3.bb
index 29874b8..2083772 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.13.1.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.13.3.bb
@@ -11,8 +11,8 @@ SRC_URI =
"https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S
file://fix_shebang_f2py.patch \
file://0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch \
${CONFIGFILESURI} "
-SRC_URI[md5sum] = "6d459e4a24f5035f720dda3c57716a92"
-SRC_URI[sha256sum] =
"de020ec06f1e9ce1115a50161a38bf8d4c2525379900f9cb478cc613a1e7cd93"
+SRC_URI[md5sum] = "c1d433e5973e548809e80c9118474b73"
+SRC_URI[sha256sum] =
"4c6b4eef790528bebb7ec9590d74cc193868940fe68e4109a91c196df"
UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases;
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-git: update to 2.1.7
python3-git needs to be updated to latest stable version.
This change was tested on qemux86 running core-image-minimal.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/recipes-devtools/python/python-git.inc | 4 ++--
.../python/{python3-git_2.1.5.bb => python3-git_2.1.7.bb} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python3-git_2.1.5.bb =>
python3-git_2.1.7.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-git.inc
b/meta/recipes-devtools/python/python-git.inc
index 777608c..0b7e44a 100644
--- a/meta/recipes-devtools/python/python-git.inc
+++ b/meta/recipes-devtools/python/python-git.inc
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=8b8d26c37c1d5a04f9b0186edbebc183"
SRC_URI =
"https://files.pythonhosted.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz;
-SRC_URI[md5sum] = "df94212b19d270a625b67b4c84ac9a41"
-SRC_URI[sha256sum] =
"5c00cbd256e2b1d039381d4f7d71fcb7ee5cc196ca10c101ff7191bd82ab5d9c"
+SRC_URI[md5sum] = "a63fdd2a650694ea23e268fd0c952034"
+SRC_URI[sha256sum] =
"13c7cd99c2bf277fc99accfc25148752fa90e7cc6c6d08a3f01d229dacb461d9"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/GitPython/;
UPSTREAM_CHECK_REGEX = "/GitPython/(?P(\d+[\.\-_]*)+)"
diff --git a/meta/recipes-devtools/python/python3-git_2.1.5.bb
b/meta/recipes-devtools/python/python3-git_2.1.7.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-git_2.1.5.bb
rename to meta/recipes-devtools/python/python3-git_2.1.7.bb
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python-scons*: upgrade to 3.0.0
Both python-scons and python-scons-native need to be upgraded to latest
upstream version.
LIC_FILES_CHKSUM changed due to updated year in date, but rest of file
remain the same.
Following dependencies were added to enable appropriate package usage:
python-shell, python-pprint and python-importlib.
These changes were tested in qemux86 with core-image-minimal.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
...python-scons-native_2.5.1.bb => python-scons-native_3.0.0.bb} | 0
.../python/{python-scons_2.5.1.bb => python-scons_3.0.0.bb} | 9 ++---
2 files changed, 6 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/python/{python-scons-native_2.5.1.bb =>
python-scons-native_3.0.0.bb} (100%)
rename meta/recipes-devtools/python/{python-scons_2.5.1.bb =>
python-scons_3.0.0.bb} (61%)
diff --git a/meta/recipes-devtools/python/python-scons-native_2.5.1.bb
b/meta/recipes-devtools/python/python-scons-native_3.0.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-scons-native_2.5.1.bb
rename to meta/recipes-devtools/python/python-scons-native_3.0.0.bb
diff --git a/meta/recipes-devtools/python/python-scons_2.5.1.bb
b/meta/recipes-devtools/python/python-scons_3.0.0.bb
similarity index 61%
rename from meta/recipes-devtools/python/python-scons_2.5.1.bb
rename to meta/recipes-devtools/python/python-scons_3.0.0.bb
index 3f43856..be33dfa 100644
--- a/meta/recipes-devtools/python/python-scons_2.5.1.bb
+++ b/meta/recipes-devtools/python/python-scons_3.0.0.bb
@@ -1,13 +1,13 @@
SUMMARY = "Software Construction tool (make/autotools replacement)"
SECTION = "devel/python"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3a885dff6d14e4cd876d9008a09a42de"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=46ddf66004e5be5566367cb525a66fc6"
SRCNAME = "scons"
SRC_URI =
"https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz;
-SRC_URI[md5sum] = "3eac81e5e8206304a9b4683c57665aa4"
-SRC_URI[sha256sum] =
"c8de85fc02ed1a687b1f2ac791eaa0c1707b4382a204f17d782b5b111b9fdf07"
+SRC_URI[md5sum] = "7ca558edaaa1942fe38f3105ca2400fb"
+SRC_URI[sha256sum] =
"aa5afb33c2bbd33c311e47e912412195739e9ffb2e933534a31f85fba8f3470e"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/SCons/;
@@ -20,4 +20,7 @@ RDEPENDS_${PN} = "\
python-io \
python-json \
python-subprocess \
+ python-shell \
+ python-pprint \
+ python-importlib \
"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python3-six: update to 1.11.0
python3-six needs to be updated to latest stable version.
Change in LIC_FILES_CHKSUM due to updated Copyright year,
rest of file remains the same.
This update was tested in qemux86 running core-image-minimal.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
meta/recipes-devtools/python/python-six.inc | 6 +++---
.../python/{python3-six_1.10.0.bb => python3-six_1.11.0.bb} | 0
2 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/python/{python3-six_1.10.0.bb =>
python3-six_1.11.0.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-six.inc
b/meta/recipes-devtools/python/python-six.inc
index bd12fa9..f9e7d64 100644
--- a/meta/recipes-devtools/python/python-six.inc
+++ b/meta/recipes-devtools/python/python-six.inc
@@ -2,11 +2,11 @@ SUMMARY = "Python 2 and 3 compatibility library"
HOMEPAGE = "https://pypi.python.org/pypi/six/;
SECTION = "devel/python"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=6f00d4a50713fa859858dd9abaa35b21"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=35cec5bf04dd0820d0a18533ea7c774a"
SRC_URI =
"https://files.pythonhosted.org/packages/source/s/six/six-${PV}.tar.gz;
-SRC_URI[md5sum] = "34eed507548117b2ab523ab14b2f8b55"
-SRC_URI[sha256sum] =
"105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a"
+SRC_URI[md5sum] = "d12789f9baf7e9fb2524c0c64f1773f8"
+SRC_URI[sha256sum] =
"70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/six/;
UPSTREAM_CHECK_REGEX = "/six/(?P(\d+[\.\-_]*)+)"
diff --git a/meta/recipes-devtools/python/python3-six_1.10.0.bb
b/meta/recipes-devtools/python/python3-six_1.11.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-six_1.10.0.bb
rename to meta/recipes-devtools/python/python3-six_1.11.0.bb
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] python-scons*: upgrade to 3.0.0
Please disregard this update.
Scons 3.0.0 introduced a regression where SConscripts containing py2
print statements would cause syntax errors even when executing scons
with python 2.7.
This issue is already being fixed in
upstream:https://github.com/SConsProject/scons/commit/2e0de3c55f22b3eaa7767b69740b898f3d2f46bf
and other projects are aware also, serf for example:
http://svn.apache.org/viewvc?view=revision=1811083
I will submit a new update commit when a fixed SCons is available.
[Patchwork-Status: Rejected]
On 10/11/2017 04:17 PM, Jose Lamego wrote:
> Both python-scons and python-scons-native need to be upgraded to latest
> upstream version.
>
> LIC_FILES_CHKSUM changed due to updated year in date, but rest of file
> remain the same.
> Following dependencies were added to enable appropriate package usage:
> python-shell, python-pprint and python-importlib.
>
> These changes were tested in qemux86 with core-image-minimal.
>
> Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
> ---
> ...python-scons-native_2.5.1.bb => python-scons-native_3.0.0.bb} | 0
> .../python/{python-scons_2.5.1.bb => python-scons_3.0.0.bb} | 9
> ++---
> 2 files changed, 6 insertions(+), 3 deletions(-)
> rename meta/recipes-devtools/python/{python-scons-native_2.5.1.bb =>
> python-scons-native_3.0.0.bb} (100%)
> rename meta/recipes-devtools/python/{python-scons_2.5.1.bb =>
> python-scons_3.0.0.bb} (61%)
>
> diff --git a/meta/recipes-devtools/python/python-scons-native_2.5.1.bb
> b/meta/recipes-devtools/python/python-scons-native_3.0.0.bb
> similarity index 100%
> rename from meta/recipes-devtools/python/python-scons-native_2.5.1.bb
> rename to meta/recipes-devtools/python/python-scons-native_3.0.0.bb
> diff --git a/meta/recipes-devtools/python/python-scons_2.5.1.bb
> b/meta/recipes-devtools/python/python-scons_3.0.0.bb
> similarity index 61%
> rename from meta/recipes-devtools/python/python-scons_2.5.1.bb
> rename to meta/recipes-devtools/python/python-scons_3.0.0.bb
> index 3f43856..be33dfa 100644
> --- a/meta/recipes-devtools/python/python-scons_2.5.1.bb
> +++ b/meta/recipes-devtools/python/python-scons_3.0.0.bb
> @@ -1,13 +1,13 @@
> SUMMARY = "Software Construction tool (make/autotools replacement)"
> SECTION = "devel/python"
> LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3a885dff6d14e4cd876d9008a09a42de"
> +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=46ddf66004e5be5566367cb525a66fc6"
> SRCNAME = "scons"
>
> SRC_URI =
> "https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz;
>
> -SRC_URI[md5sum] = "3eac81e5e8206304a9b4683c57665aa4"
> -SRC_URI[sha256sum] =
> "c8de85fc02ed1a687b1f2ac791eaa0c1707b4382a204f17d782b5b111b9fdf07"
> +SRC_URI[md5sum] = "7ca558edaaa1942fe38f3105ca2400fb"
> +SRC_URI[sha256sum] =
> "aa5afb33c2bbd33c311e47e912412195739e9ffb2e933534a31f85fba8f3470e"
>
> UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/SCons/;
>
> @@ -20,4 +20,7 @@ RDEPENDS_${PN} = "\
>python-io \
>python-json \
>python-subprocess \
> + python-shell \
> + python-pprint \
> + python-importlib \
>"
--
Jose Lamego | OTC Embedded Platform & Tools | GDC
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] python-scons*: upgrade to 3.0.0
Both python-scons and python-scons-native need to be upgraded to latest
upstream version.
LIC_FILES_CHKSUM changed due to updated year in date, but rest of file
remain the same.
Following dependencies were added to enable appropriate package usage:
python-shell, python-pprint and python-importlib.
A patch was taken from upstream to support python2 print statements
in SConscripts. This should be included in next version.
These changes were tested in qemux86 with core-image-minimal.
Signed-off-by: Jose Lamego <jose.a.lam...@linux.intel.com>
---
...ative_2.5.1.bb => python-scons-native_3.0.0.bb} | 0
...onscript-Support-python2-print-statements.patch | 38 ++
...python-scons_2.5.1.bb => python-scons_3.0.0.bb} | 12 ---
3 files changed, 46 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/python/{python-scons-native_2.5.1.bb =>
python-scons-native_3.0.0.bb} (100%)
create mode 100644
meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch
rename meta/recipes-devtools/python/{python-scons_2.5.1.bb =>
python-scons_3.0.0.bb} (51%)
diff --git a/meta/recipes-devtools/python/python-scons-native_2.5.1.bb
b/meta/recipes-devtools/python/python-scons-native_3.0.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-scons-native_2.5.1.bb
rename to meta/recipes-devtools/python/python-scons-native_3.0.0.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
new file mode 100644
index 000..b1a7902
--- /dev/null
+++
b/meta/recipes-devtools/python/python-scons/SConscript-Support-python2-print-statements.patch
@@ -0,0 +1,38 @@
+From 885aabdb313685405737112dcb7d7774eee6d879 Mon Sep 17 00:00:00 2001
+From: Thomas Berg <merlin...@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.lam...@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_2.5.1.bb
b/meta/recipes-devtools/python/python-scons_3.0.0.bb
similarity index 51%
rename from meta/recipes-devtools/python/python-scons_2.5.1.bb
rename to meta/recipes-devtools/python/python-scons_3.0.0.bb
index 3f43856..33bfb45 100644
--- a/meta/recipes-devtools/python/python-scons_2.5.1.bb
+++ b/meta/recipes-devtools/python/python-scons_3.0.0.bb
@@ -1,13 +1,14 @@
SUMMARY = "Software Construction tool (make/autotools replacement)"
SECTION = "devel/python"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3a885dff6d14e4cd876d9008a09a42de"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=46ddf66004e5be5566367cb525a66fc6"
SRCNAME = "scons"
-SRC_URI =
"https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz;
+SRC_URI =
"https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz
\
+ file://SConscript-Support-python2-print-statements.patch"
-SRC_URI[md5sum] = "3eac81e5e8206304a9b4683c57665aa4"
-SRC_URI[sha256sum] =
"c8de85fc02ed1a687b1f2ac791eaa0c1707b4382a204f17d782b5b111b9fdf07"
+SRC_URI[md5sum] = "7ca558edaaa1942fe38f3105ca2400fb"
+SRC_URI[sha256sum] =
"aa5afb33c2bbd33c311e47e912412195739e9ffb2e933534a31f85fba8f3470e"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/SCons/;
@@ -20,4 +21,7 @@ RDEPENDS_${PN} = "\
python-io \
python-json \
python-subprocess \
+ python-shell \
+ python-pprint \
+ python-importlib \
"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2] version bump bc to 1.07.1
Josef, A previous upgrade attempt [1] showed that bc version 1.07.1 not only needs ed in the host (a regression from 1.06) but also shows a Parallel Make Race that requires unsetting PARALLEL_MAKE variable. I contacted the upstream maintainer and he is aware of this situation and has developed and tested a version 1.07.2, (however is not available for download yet). The upgrade was delayed for this reason (more details in the patch comments thread). That said, Is there any urgent need for the upgrade to 1.07.1? On a side note, I believe bc 1.07.1 license should be GPLv3+ & LGPLv3 only, unless I'm missing something. Regards Jose References: [1] https://patchwork.openembedded.org/series/6796/ [2] https://patchwork.openembedded.org/patch/140001/ On 25/10/17 07:34, Josef Holzmayr wrote: This series bumps bc to version 1.07.1. The changes include the needed: - change of license to GPLv3 & LGPLv3 & GPLv2+ - removal of patch which has been upstreamed - add native class to ed as it is now a build time dependency Josef Holzmayr (2): ed: add native class bc: bump version to 1.07.1 meta/recipes-extended/bc/bc_1.06.bb| 26 meta/recipes-extended/bc/bc_1.07.1.bb | 25 +++ .../bc/files/fix-segment-fault.patch | 28 -- meta/recipes-extended/ed/ed_1.14.2.bb | 3 +++ 4 files changed, 28 insertions(+), 54 deletions(-) delete mode 100644 meta/recipes-extended/bc/bc_1.06.bb create mode 100644 meta/recipes-extended/bc/bc_1.07.1.bb delete mode 100644 meta/recipes-extended/bc/files/fix-segment-fault.patch -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
