[PATCH 0/4] Recipes upgrade

[PATCH 0/4] Recipes upgrade

[Robert Yang]

The following changes since commit 51a09ba2729a840a9f2f87b68c7f50a3e6ac0d04:

  gcc-7.3: Backport fixes for std::pair high memory usage (2018-07-31 22:55:31 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/pu
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/pu

Robert Yang (4):
  python-pbr: 3.1.1 -> 4.2.0
  python3-subunit: 1.1.0 -> 1.3.0
  python3-testtools: 2.2.0 -> 2.3.0
  e2fsprogs: 1.44.2 -> 1.44.3

 .../e2fsprogs/e2fsprogs/ptest.patch                | 49 ++++++++++++----------
 .../{e2fsprogs_1.44.2.bb => e2fsprogs_1.44.3.bb}   |  2 +-
 meta/recipes-devtools/python/python-pbr.inc        |  4 +-
 meta/recipes-devtools/python/python-subunit.inc    |  6 +--
 meta/recipes-devtools/python/python-testtools.inc  |  4 +-
 .../{python3-pbr_3.1.1.bb => python3-pbr_4.2.0.bb} |  0
 ...3-subunit_1.1.0.bb => python3-subunit_1.3.0.bb} |  0
 ...sttools_2.2.0.bb => python3-testtools_2.3.0.bb} |  0
 8 files changed, 36 insertions(+), 29 deletions(-)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.44.2.bb => e2fsprogs_1.44.3.bb} (98%)
 rename meta/recipes-devtools/python/{python3-pbr_3.1.1.bb => python3-pbr_4.2.0.bb} (100%)
 rename meta/recipes-devtools/python/{python3-subunit_1.1.0.bb => python3-subunit_1.3.0.bb} (100%)
 rename meta/recipes-devtools/python/{python3-testtools_2.2.0.bb => python3-testtools_2.3.0.bb} (100%)

-- 
2.7.4

[PATCH 1/4] python-pbr: 3.1.1 -> 4.2.0

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/python/python-pbr.inc                           | 4 ++--
 .../python/{python3-pbr_3.1.1.bb => python3-pbr_4.2.0.bb}             | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-pbr_3.1.1.bb => python3-pbr_4.2.0.bb} (100%)

diff --git a/meta/recipes-devtools/python/python-pbr.inc b/meta/recipes-devtools/python/python-pbr.inc
index 0b70883..5a295c5 100644
--- a/meta/recipes-devtools/python/python-pbr.inc
+++ b/meta/recipes-devtools/python/python-pbr.inc
@@ -5,8 +5,8 @@ SECTION = "devel/python"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1dece7821bf3fd70fe1309eaa37d52a2"
 
-SRC_URI[md5sum] = "4e82c2e07af544c56a5b71c801525b00"
-SRC_URI[sha256sum] = "05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1"
+SRC_URI[md5sum] = "6619780896ca81c7cd19c6e2f439b6c9"
+SRC_URI[sha256sum] = "1b8be50d938c9bb75d0eaf7eda111eec1bf6dc88a62a6412e33bf077457e0f45"
 
 inherit pypi
 
diff --git a/meta/recipes-devtools/python/python3-pbr_3.1.1.bb b/meta/recipes-devtools/python/python3-pbr_4.2.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-pbr_3.1.1.bb
rename to meta/recipes-devtools/python/python3-pbr_4.2.0.bb
-- 
2.7.4

[PATCH 2/4] python3-subunit: 1.1.0 -> 1.3.0

[Robert Yang]

The license file changes from README to README.rst, and the lines which
contains license info is from 1 to 20. The license is still Apache-2.0.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/python/python-subunit.inc                     | 6 +++---
 .../python/{python3-subunit_1.1.0.bb => python3-subunit_1.3.0.bb}   | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/python/{python3-subunit_1.1.0.bb => python3-subunit_1.3.0.bb} (100%)

diff --git a/meta/recipes-devtools/python/python-subunit.inc b/meta/recipes-devtools/python/python-subunit.inc
index f893e7a..afaaa51 100644
--- a/meta/recipes-devtools/python/python-subunit.inc
+++ b/meta/recipes-devtools/python/python-subunit.inc
@@ -2,12 +2,12 @@ SUMMARY = "Python implementation of subunit test streaming protocol"
 HOMEPAGE = "https://pypi.python.org/pypi/python-subunit/"
 SECTION = "devel/python"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://README;md5=e5b524e1b2c67c88fc64439ee4a850aa"
+LIC_FILES_CHKSUM = "file://README.rst;beginline=1;endline=20;md5=909c08e291647fd985fbe5d9836d51b6"
 
 PYPI_PACKAGE = "python-subunit"
 
-SRC_URI[md5sum] = "d2c09c93346077ced675c9f718e6a0f1"
-SRC_URI[sha256sum] = "d9a7606e9610828d68c1d2f0f5abbb421e34e518b8f4882c8b2e08176281bf88"
+SRC_URI[md5sum] = "16d468a3aeafe6c60a0c3b2b9132d65b"
+SRC_URI[sha256sum] = "9607edbee4c1e5a30ff88549ce8d9feb0b9bcbcb5e55033a9d76e86075465cbb"
 
 inherit pypi
 
diff --git a/meta/recipes-devtools/python/python3-subunit_1.1.0.bb b/meta/recipes-devtools/python/python3-subunit_1.3.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-subunit_1.1.0.bb
rename to meta/recipes-devtools/python/python3-subunit_1.3.0.bb
-- 
2.7.4

[PATCH 3/4] python3-testtools: 2.2.0 -> 2.3.0

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/python/python-testtools.inc                     | 4 ++--
 .../python/{python3-testtools_2.2.0.bb => python3-testtools_2.3.0.bb} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-testtools_2.2.0.bb => python3-testtools_2.3.0.bb} (100%)

diff --git a/meta/recipes-devtools/python/python-testtools.inc b/meta/recipes-devtools/python/python-testtools.inc
index fe1d49a..1011c98 100644
--- a/meta/recipes-devtools/python/python-testtools.inc
+++ b/meta/recipes-devtools/python/python-testtools.inc
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c9d3e8ba7141c83bfef190e0b9379a"
 
 inherit pypi
 
-SRC_URI[md5sum] = "adef817b07ba24fd6d807fd41a4f1ef4"
-SRC_URI[sha256sum] = "80f606607a6e4ce4d0e24e5b786562aa42c581906f3c070607a4265f3da65810"
+SRC_URI[md5sum] = "0f0feb915497816cb99e39437494217e"
+SRC_URI[sha256sum] = "5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559"
 
 DEPENDS += " \
     ${PYTHON_PN}-pbr \
diff --git a/meta/recipes-devtools/python/python3-testtools_2.2.0.bb b/meta/recipes-devtools/python/python3-testtools_2.3.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-testtools_2.2.0.bb
rename to meta/recipes-devtools/python/python3-testtools_2.3.0.bb
-- 
2.7.4

[PATCH 4/4] e2fsprogs: 1.44.2 -> 1.44.3

[Robert Yang]

Rebased ptest.patch.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../e2fsprogs/e2fsprogs/ptest.patch                | 49 ++++++++++++----------
 .../{e2fsprogs_1.44.2.bb => e2fsprogs_1.44.3.bb}   |  2 +-
 2 files changed, 29 insertions(+), 22 deletions(-)
 rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.44.2.bb => e2fsprogs_1.44.3.bb} (98%)

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
index 7c4bb39..64a791d 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
@@ -1,10 +1,10 @@
 Upstream-Status: Inappropriate
 
-Index: git/tests/Makefile.in
-===================================================================
---- git.orig/tests/Makefile.in
-+++ git/tests/Makefile.in
-@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 8c4d204..e021af3 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -19,7 +19,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf
  	@echo "#!/bin/sh" > test_one
  	@echo "HTREE=y" >> test_one
  	@echo "QUOTA=y" >> test_one
@@ -13,20 +13,20 @@ Index: git/tests/Makefile.in
  	@echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one
  	@echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one
  	@echo "DD=@DD@" >>test_one
-@@ -28,7 +28,7 @@ test_one: $(srcdir)/test_one.in Makefile
- test_script: test_one test_script.in Makefile mke2fs.conf
+@@ -30,7 +30,7 @@ test_script: test_one test_script.in Makefile mke2fs.conf
  	@echo "Creating test_script..."
+ 	@[ -f test_script ] && chmod u+w test_script || true
  	@echo "#!/bin/sh" > test_script
 -	@echo "SRCDIR=@srcdir@" >> test_script
 +	@echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_script
  	@cat $(srcdir)/test_script.in >> test_script
- 	@chmod +x test_script
+ 	@chmod +x-w test_script
  
-Index: git/tests/test_config
-===================================================================
---- git.orig/tests/test_config
-+++ git/tests/test_config
-@@ -3,24 +3,24 @@
+diff --git a/tests/test_config b/tests/test_config
+index 1f146ca..52c453f 100644
+--- a/tests/test_config
++++ b/tests/test_config
+@@ -3,16 +3,16 @@
  #
  
  unset LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME PAGER
@@ -40,8 +40,6 @@ Index: git/tests/test_config
 -E2IMAGE_EXE="../misc/e2image"
 -DEBUGFS="$USE_VALGRIND ../debugfs/debugfs"
 -DEBUGFS_EXE="../debugfs/debugfs"
--TEST_BITS="../debugfs/debugfs"
--RESIZE2FS_EXE="../resize/resize2fs"
 +FSCK="$USE_VALGRIND e2fsck"
 +MKE2FS="$USE_VALGRIND mke2fs"
 +DUMPE2FS="$USE_VALGRIND dumpe2fs"
@@ -49,28 +47,37 @@ Index: git/tests/test_config
 +CHATTR="$USE_VALGRIND chattr"
 +LSATTR="$USE_VALGRIND lsattr"
 +E2IMAGE="$USE_VALGRIND e2image"
-+E2IMAGE_EXE="/sbin/e2image"
++E2IMAGE_EXE=/sbin/e2image"
 +DEBUGFS="$USE_VALGRIND debugfs"
 +DEBUGFS_EXE="/sbin/debugfs"
-+TEST_BITS="/sbin/debugfs"
+ TEST_BITS="test_data.tmp"
+ if [ ! -s $TEST_BITS ]; then
+ 	# create a non-sparse test file if possible, since debugfs may be
+@@ -21,14 +21,14 @@ if [ ! -s $TEST_BITS ]; then
+ 	dd if=/dev/urandom of=$TEST_BITS bs=128k count=1 > /dev/null 2>&1 ||
+ 		TEST_BITS="$DEFBUGFS_EXE"
+ fi
+-RESIZE2FS_EXE="../resize/resize2fs"
 +RESIZE2FS_EXE="/sbin/resize2fs"
  RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE"
 -E2UNDO_EXE="../misc/e2undo"
 +E2UNDO_EXE="/sbin/e2undo"
  E2UNDO="$USE_VALGRIND $E2UNDO_EXE"
+-E2MMPSTATUS="$USE_VALGRIND ../misc/dumpe2fs -m"
 -TEST_REL=../tests/progs/test_rel
 -TEST_ICOUNT=../tests/progs/test_icount
 -CRCSUM=../tests/progs/crcsum
++E2MMPSTATUS="$USE_VALGRIND dumpe2fs -m"
 +TEST_REL=./progs/test_rel
 +TEST_ICOUNT=./progs/test_icount
 +CRCSUM=./progs/crcsum
  CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed"
  LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH}
  DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH}
-Index: git/tests/test_script.in
-===================================================================
---- git.orig/tests/test_script.in
-+++ git/tests/test_script.in
+diff --git a/tests/test_script.in b/tests/test_script.in
+index 9959e30..442999d 100644
+--- a/tests/test_script.in
++++ b/tests/test_script.in
 @@ -39,7 +39,7 @@ for i; do
  done
  
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.2.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb
similarity index 98%
rename from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.2.bb
rename to meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb
index f2537a5..d7391ee 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.2.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb
@@ -12,7 +12,7 @@ SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permissio
                                 file://quiet-debugfs.patch \
 "
 
-SRCREV = "7b9ea51db3be8972c7a17de25be179b18fc9fcde"
+SRCREV = "85e53f42f98d5334914de01e972e9ed44bccd0a5"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
 
 EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
-- 
2.7.4